Add kubernetes-file test

openrewrite · Dec 24, 2024 · dae3c0e · dae3c0e
1 parent 5681c09
commit dae3c0e
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 5 deletions.
diff --git a/src/main/java/org/openrewrite/docker/search/FindDockerImageUses.java b/src/main/java/org/openrewrite/docker/search/FindDockerImageUses.java
@@ -76,7 +76,7 @@ private static class ReferenceFindSearchResultVisitor extends TreeVisitor<Tree,
         Map<Tree, List<Reference>> matches;
 
         @Override
-        public Tree postVisit(Tree tree, ExecutionContext ctx) {
+        public @Nullable Tree postVisit(Tree tree, ExecutionContext ctx) {
             List<Reference> references = matches.get(tree);
             if (references != null) {
                 if (tree instanceof PlainText) {

diff --git a/src/main/java/org/openrewrite/docker/trait/YamlImageReference.java b/src/main/java/org/openrewrite/docker/trait/YamlImageReference.java
@@ -27,18 +27,17 @@ public static class Provider extends YamlProvider {
         @Override
         public SimpleTraitMatcher<YamlReference> getMatcher() {
             return new SimpleTraitMatcher<YamlReference>() {
-                private final Predicate<String> image = Pattern.compile("image").asPredicate();
                 private final AtomicBoolean found = new AtomicBoolean(false);
 
                 @Override
                 protected @Nullable YamlReference test(Cursor cursor) {
                     Object value = cursor.getValue();
                     if (value instanceof Yaml.Scalar) {
-                        if (image.test(((Yaml.Scalar) value).getValue())) {
-                            found.set(true);
-                        } else if (found.get()) {
+                        if (found.get()) {
                             found.set(false);
                             return new YamlImageReference(cursor);
+                        } else if ("image".equals(((Yaml.Scalar) value).getValue())) {
+                            found.set(true);
                         }
                     }
                     return null;

diff --git a/src/test/java/org/openrewrite/docker/FindDockerImagesUsedTest.java b/src/test/java/org/openrewrite/docker/FindDockerImagesUsedTest.java
@@ -340,6 +340,59 @@ void gitlabCIFile() {
         );
     }
 
+    @Test
+    void kubernetesFile() {
+        rewriteRun(
+          assertImages("image", "app:v1.2.3", "account/image:latest", "repo.id/account/bucket/image:v1.2.3@digest"),
+          //language=yaml
+          yaml(
+            """
+              apiVersion: v1
+              kind: Pod
+              spec:
+                containers:
+                  - image: image
+              ---
+              apiVersion: v1
+              kind: Pod
+              spec:
+                containers:
+                  - image: app:v1.2.3
+                initContainers:
+                  - image: account/image:latest
+              ---
+              apiVersion: v1
+              kind: Pod
+              spec:
+                containers:
+                  - image: repo.id/account/bucket/image:v1.2.3@digest
+              """,
+            """
+              apiVersion: v1
+              kind: Pod
+              spec:
+                containers:
+                  - image: ~~(image)~~>image
+              ---
+              apiVersion: v1
+              kind: Pod
+              spec:
+                containers:
+                  - image: ~~(app:v1.2.3)~~>app:v1.2.3
+                initContainers:
+                  - image: ~~(account/image:latest)~~>account/image:latest
+              ---
+              apiVersion: v1
+              kind: Pod
+              spec:
+                containers:
+                  - image: ~~(repo.id/account/bucket/image:v1.2.3@digest)~~>repo.id/account/bucket/image:v1.2.3@digest
+              """,
+            spec -> spec.path(".gitlab-ci")
+          )
+        );
+    }
+
     private static Consumer<RecipeSpec> assertImages(String... expected) {
         return spec -> spec.recipe(new FindDockerImageUses())
           .dataTable(DockerBaseImages.Row.class,rows ->