Codestart support merging application profile yaml files

quarkusio · Aug 15, 2024 · ee79fce · ee79fce
1 parent 1466fcc
commit ee79fce
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/...tools/base-codestarts/src/main/resources/codestarts/quarkus/project/quarkus/codestart.yml b/...tools/base-codestarts/src/main/resources/codestarts/quarkus/project/quarkus/codestart.yml
@@ -10,8 +10,10 @@ output-strategy:
   ".gitignore": append
   "src/main/resources/META-INF/resources/index.html": content-merge
   "src/main/resources/application.yml": smart-config-merge
+  "src/main/resources/application-*.yml": smart-config-merge
   "src/main/resources/application.properties": forbidden
   "src/test/resources/application.yml": smart-config-merge
+  "src/test/resources/application-*.yml": smart-config-merge
   "src/test/resources/application.properties": forbidden
   "*.java": smart-package
   "*.kt": smart-package

diff --git a/...rts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategy.java b/...rts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategy.java
@@ -33,6 +33,14 @@ public boolean test(String t) {
                 return true;
             }
         }
+        int index = filter.indexOf("*");
+        if (index != -1 && filter.length() > 1) {
+            String part1 = filter.substring(0, index);
+            String part2 = filter.substring(index + 1);
+            if (t.startsWith(part1) && t.endsWith(part2)) {
+                return true;
+            }
+        }
         return filter.equals(t);
     }
 

diff --git a/...src/test/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategyTest.java b/...src/test/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategyTest.java
@@ -30,6 +30,18 @@ void testFilterEnd() {
         assertThat(strategy.test("")).isFalse();
     }
 
+    @Test
+    void testFilterMiddle() {
+        final CodestartFileStrategy strategy = new CodestartFileStrategy("/foo/bar/my*.txt",
+                mock(CodestartFileStrategyHandler.class));
+        assertThat(strategy.test("/foo/bar/myfile.txt")).isTrue();
+        assertThat(strategy.test("/foo/bar/baz/anoter_file")).isFalse();
+        assertThat(strategy.test(null)).isFalse();
+        assertThat(strategy.test("foo/bar/myfile.txt")).isFalse();
+        assertThat(strategy.test("something")).isFalse();
+        assertThat(strategy.test("")).isFalse();
+    }
+
     @Test
     void testFilter() {
         final CodestartFileStrategy strategy = new CodestartFileStrategy("/foo/bar/myfile.txt",