Markers shown on Spring application.yml

src/main/java/org/openrewrite/kubernetes/KubernetesParser.java

@@ -25,11 +25,12 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
+/**
+ * @deprecated Unused; likely better served by {@link org.openrewrite.kubernetes.trait.Traits}.
+ */
+@Deprecated
 public final class KubernetesParser extends YamlParser {
 
-    private static final Pattern METADATA_LABEL = Pattern.compile("/metadata/labels/(.+)");
-    private static final Pattern METADATA_ANNOTATION = Pattern.compile("/metadata/annotations/(.+)");
-
     public static Builder builder() {
         return new Builder();
     }

src/main/java/org/openrewrite/kubernetes/KubernetesVisitor.java

@@ -21,6 +21,10 @@
 import org.openrewrite.yaml.YamlVisitor;
 import org.openrewrite.yaml.tree.Yaml;
 
+/**
+ * @deprecated Likely better served by {@link org.openrewrite.kubernetes.trait.Traits}.
+ */
+@Deprecated
 public class KubernetesVisitor<P> extends YamlVisitor<P> {
 
     @Override

src/main/java/org/openrewrite/kubernetes/search/FindResourceMissingConfiguration.java

@@ -19,6 +19,8 @@
 import lombok.Value;
 import org.openrewrite.*;
 import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.kubernetes.trait.KubernetesResource;
+import org.openrewrite.kubernetes.trait.Traits;
 import org.openrewrite.kubernetes.tree.K8S;
 import org.openrewrite.marker.SearchResult;
 import org.openrewrite.yaml.YamlIsoVisitor;
@@ -57,15 +59,13 @@ public String getDescription() {
         return "Find Kubernetes resources with missing configuration.";
     }
 
-
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
-        YamlIsoVisitor<ExecutionContext> visitor = new YamlIsoVisitor<ExecutionContext>() {
+        YamlIsoVisitor<ExecutionContext> yamlVisitor = new YamlIsoVisitor<ExecutionContext>() {
             @Override
             public Yaml.Document visitDocument(Yaml.Document document, ExecutionContext ctx) {
                 Yaml.Block b = (Yaml.Block) visit(document.getBlock(), ctx, getCursor());
-                boolean inKind = resourceKind == null || K8S.inKind(resourceKind, getCursor());
-                if (inKind && !"true".equals(getCursor().getMessage(FindResourceMissingConfiguration.class.getSimpleName()))) {
+                if (!"true".equals(getCursor().getMessage(FindResourceMissingConfiguration.class.getSimpleName()))) {
                     return SearchResult.found(document.withBlock(b));
                 }
                 return document;
@@ -80,6 +80,14 @@ public Yaml.Mapping.Entry visitMappingEntry(Yaml.Mapping.Entry entry, ExecutionC
                 return super.visitMappingEntry(entry, ctx);
             }
         };
-        return fileMatcher != null ? Preconditions.check(new FindSourceFiles(fileMatcher), visitor) : visitor;
+
+        TreeVisitor<? extends Tree, ExecutionContext> kubernetesResourceVisitor = Traits.kubernetesResource(resourceKind)
+                .asVisitor((KubernetesResource resource, ExecutionContext ctx) ->
+                        yamlVisitor.visitNonNull(resource.getTree(), ctx, resource.getCursor().getParent()));
+
+        if (fileMatcher != null) {
+            return Preconditions.check(new FindSourceFiles(fileMatcher), kubernetesResourceVisitor);
+        }
+        return kubernetesResourceVisitor;
     }
 }

src/main/java/org/openrewrite/kubernetes/trait/KubernetesResource.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2024 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.kubernetes.trait;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.Cursor;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.kubernetes.UpdateKubernetesModel;
+import org.openrewrite.kubernetes.tree.KubernetesModel;
+import org.openrewrite.trait.SimpleTraitMatcher;
+import org.openrewrite.trait.Trait;
+import org.openrewrite.yaml.tree.Yaml;
+
+@Value
+public class KubernetesResource implements Trait<Yaml.Document> {
+
+    Cursor cursor;
+    KubernetesModel model;
+
+    @Value
+    @EqualsAndHashCode(callSuper = false)
+    public static class Matcher extends SimpleTraitMatcher<KubernetesResource> {
+
+        @Nullable
+        String kind;
+
+        @Override
+        protected @Nullable KubernetesResource test(Cursor cursor) {
+            Object value = cursor.getValue();
+            if (value instanceof Yaml.Document) {
+                return new UpdateKubernetesModel<ExecutionContext>()
+                        .visitNonNull((Yaml.Document) value, new InMemoryExecutionContext(), cursor.getParent())
+                        .getMarkers()
+                        .findFirst(KubernetesModel.class)
+                        .map(kubernetesModel -> new KubernetesResource(cursor, kubernetesModel))
+                        .filter(kubernetesResource -> kind == null || kubernetesResource.getModel().getKind().equals(kind))
+                        .orElse(null);
+            }
+            return null;
+        }
+    }
+}

src/main/java/org/openrewrite/kubernetes/trait/Traits.java

@@ -0,0 +1,13 @@
+package org.openrewrite.kubernetes.trait;
+
+import org.openrewrite.internal.lang.Nullable;
+
+public class Traits {
+
+    private Traits() {
+    }
+
+    public static KubernetesResource.Matcher kubernetesResource(@Nullable String kind) {
+        return new KubernetesResource.Matcher(kind);
+    }
+}

src/main/java/org/openrewrite/kubernetes/tree/K8S.java

@@ -22,10 +22,8 @@
 import lombok.With;
 import lombok.experimental.FieldDefaults;
 import org.openrewrite.Cursor;
-import org.openrewrite.Tree;
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.kubernetes.resource.ResourceLimit;
-import org.openrewrite.marker.Marker;
 import org.openrewrite.yaml.JsonPathMatcher;
 import org.openrewrite.yaml.tree.Yaml;
 
@@ -35,8 +33,11 @@
 import static java.util.Collections.emptySet;
 import static org.openrewrite.Tree.randomId;
 
-public interface K8S extends Marker {
-
+/**
+ * @deprecated Likely better served by {@link org.openrewrite.kubernetes.trait.Traits}.
+ */
+@Deprecated
+public interface K8S {
 
     static boolean inKind(String kind, Cursor cursor) {
         Yaml.Document doc = cursor.firstEnclosing(Yaml.Document.class);
@@ -210,7 +211,7 @@ static Optional<Cursor> firstEnclosingEntryMatching(JsonPathMatcher jsonPath, @N
     }
 
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = false)
     @Data
     class Resource implements K8S {
         @EqualsAndHashCode.Include
@@ -222,7 +223,7 @@ class Resource implements K8S {
     }
 
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = false)
     @Data
     class Metadata implements K8S {
         @EqualsAndHashCode.Include
@@ -248,7 +249,7 @@ public static boolean isMetadata(Cursor cursor) {
     }
 
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = false)
     @Data
     class Annotations implements K8S {
         @EqualsAndHashCode.Include
@@ -282,7 +283,7 @@ public boolean valueMatches(String name, Pattern regex, Cursor cursor) {
     }
 
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = false)
     @Data
     class Labels implements K8S {
         @EqualsAndHashCode.Include
@@ -312,7 +313,7 @@ public boolean valueMatches(String name, Pattern regex, Cursor cursor) {
     }
 
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = false)
     @Data
     class Pod implements K8S {
         @EqualsAndHashCode.Include
@@ -326,7 +327,7 @@ public static boolean inSpec(Cursor cursor) {
     }
 
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = false)
     @Data
     class Containers implements K8S {
         @EqualsAndHashCode.Include
@@ -343,7 +344,7 @@ public static boolean isImageName(Cursor cursor) {
     }
 
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = false)
     @Data
     class InitContainers implements K8S {
         @EqualsAndHashCode.Include
@@ -356,7 +357,7 @@ public static boolean inInitContainerSpec(Cursor cursor) {
     }
 
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = false)
     @Data
     class ResourceLimits implements K8S {
         @EqualsAndHashCode.Include
@@ -380,7 +381,7 @@ public static boolean inRequests(String type, Cursor cursor) {
     }
 
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = false)
     @Data
     class Service implements K8S {
         @EqualsAndHashCode.Include
@@ -406,7 +407,7 @@ public static boolean inExternalIPs(Cursor cursor) {
     }
 
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = false)
     @Data
     class Ingress implements K8S {
         @EqualsAndHashCode.Include
@@ -434,7 +435,7 @@ public static boolean isDisallowHttpConfigured(Cursor cursor) {
     }
 
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = false)
+    @EqualsAndHashCode(callSuper = false)
     @Data
     class RBAC implements K8S {
         @EqualsAndHashCode.Include