Small improvements

openrewrite · Dec 24, 2024 · 8766668 · 8766668
1 parent 27ffeb5
commit 8766668
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/src/main/java/org/openrewrite/docker/trait/YamlImageReference.java b/src/main/java/org/openrewrite/docker/trait/YamlImageReference.java
@@ -22,25 +22,27 @@ public Reference.Kind getKind() {
     }
 
     public static class Provider extends YamlProvider {
-        @Override
-        public SimpleTraitMatcher<YamlReference> getMatcher() {
-            return new SimpleTraitMatcher<YamlReference>() {
-                private final AtomicBoolean found = new AtomicBoolean(false);
+        private static final SimpleTraitMatcher<YamlReference> matcher = new SimpleTraitMatcher<YamlReference>() {
+            private final AtomicBoolean found = new AtomicBoolean(false);
 
-                @Override
-                protected @Nullable YamlReference test(Cursor cursor) {
-                    Object value = cursor.getValue();
-                    if (value instanceof Yaml.Scalar) {
-                        if (found.get()) {
-                            found.set(false);
-                            return new YamlImageReference(cursor);
-                        } else if ("image".equals(((Yaml.Scalar) value).getValue())) {
-                            found.set(true);
-                        }
+            @Override
+            protected @Nullable YamlReference test(Cursor cursor) {
+                Object value = cursor.getValue();
+                if (value instanceof Yaml.Scalar) {
+                    if (found.get()) {
+                        found.set(false);
+                        return new YamlImageReference(cursor);
+                    } else if ("image".equals(((Yaml.Scalar) value).getValue())) {
+                        found.set(true);
                     }
-                    return null;
                 }
-            };
+                return null;
+            }
+        };
+
+        @Override
+        public SimpleTraitMatcher<YamlReference> getMatcher() {
+            return matcher;
         }
     }
 }
diff --git a/src/test/java/org/openrewrite/docker/FindDockerImagesUsedTest.java b/src/test/java/org/openrewrite/docker/FindDockerImagesUsedTest.java
@@ -352,41 +352,49 @@ void kubernetesFile() {
               spec:
                 containers:
                   - image: image
+                    name: image-container
               ---
               apiVersion: v1
               kind: Pod
               spec:
                 containers:
-                  - image: app:v1.2.3
+                  - name: my-container
+                    image: app:v1.2.3
                 initContainers:
                   - image: account/image:latest
+                    name: my-init-container
               ---
               apiVersion: v1
               kind: Pod
               spec:
                 containers:
                   - image: repo.id/account/bucket/image:v1.2.3@digest
+                    name: my-container
               """,
             """
               apiVersion: v1
               kind: Pod
               spec:
                 containers:
                   - image: ~~(image)~~>image
+                    name: image-container
               ---
               apiVersion: v1
               kind: Pod
               spec:
                 containers:
-                  - image: ~~(app:v1.2.3)~~>app:v1.2.3
+                  - name: my-container
+                    image: ~~(app:v1.2.3)~~>app:v1.2.3
                 initContainers:
                   - image: ~~(account/image:latest)~~>account/image:latest
+                    name: my-init-container
               ---
               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
+                    name: my-container
               """,
             spec -> spec.path(".gitlab-ci")
           )