From 1be7a13e72d1b52f112d28f15b82c46fd4978d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Mon, 27 May 2024 16:43:51 +0200 Subject: [PATCH 1/2] fix: bootstrapper gitignore explusion fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../javaoperatorsdk/boostrapper/Bootstrapper.java | 15 ++++++++------- .../resources/static/{.gitignore => _.gitignore} | 0 2 files changed, 8 insertions(+), 7 deletions(-) rename bootstrapper-maven-plugin/src/main/resources/static/{.gitignore => _.gitignore} (100%) diff --git a/bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java b/bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java index b0dba64c17..47b5e49983 100644 --- a/bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java +++ b/bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java @@ -23,8 +23,8 @@ public class Bootstrapper { private MustacheFactory mustacheFactory = new DefaultMustacheFactory(); - private static final List TOP_LEVEL_STATIC_FILES = - List.of(".gitignore", "README.md"); + private static final Map TOP_LEVEL_STATIC_FILES = + Map.of("_.gitignore", ".gitignore", "README.md", "README.md"); private static final List JAVA_FILES = List.of("CustomResource.java", "Reconciler.java", "Spec.java", "Status.java"); @@ -106,14 +106,15 @@ private void addTemplatedFile(File projectDir, String fileName, String groupId, } private void addStaticFiles(File projectDir) { - TOP_LEVEL_STATIC_FILES.forEach(f -> addStaticFile(projectDir, f)); + TOP_LEVEL_STATIC_FILES.forEach((key, value) -> addStaticFile(projectDir, key, value)); } - private void addStaticFile(File targetDir, String fileName) { - addStaticFile(targetDir, fileName, null); + private void addStaticFile(File targetDir, String fileName, String targetFileName) { + addStaticFile(targetDir, fileName, targetFileName, null); } - private void addStaticFile(File targetDir, String fileName, String subDir) { + private void addStaticFile(File targetDir, String fileName, String targetFilename, + String subDir) { String sourcePath = subDir == null ? "/static/" : "/static/" + subDir; String path = sourcePath + fileName; try (var is = Bootstrapper.class.getResourceAsStream(path)) { @@ -121,7 +122,7 @@ private void addStaticFile(File targetDir, String fileName, String subDir) { if (subDir != null) { FileUtils.forceMkdir(targetDir); } - FileUtils.copyInputStreamToFile(is, new File(targetDir, fileName)); + FileUtils.copyInputStreamToFile(is, new File(targetDir, targetFilename)); } catch (IOException e) { throw new RuntimeException("File path: " + path, e); } diff --git a/bootstrapper-maven-plugin/src/main/resources/static/.gitignore b/bootstrapper-maven-plugin/src/main/resources/static/_.gitignore similarity index 100% rename from bootstrapper-maven-plugin/src/main/resources/static/.gitignore rename to bootstrapper-maven-plugin/src/main/resources/static/_.gitignore From 0f25665bccd15445ccc23e912a3a3f82ff928edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Mon, 27 May 2024 16:47:21 +0200 Subject: [PATCH 2/2] comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java b/bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java index 47b5e49983..ad7bc3cc79 100644 --- a/bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java +++ b/bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java @@ -23,6 +23,7 @@ public class Bootstrapper { private MustacheFactory mustacheFactory = new DefaultMustacheFactory(); + // .gitignore gets excluded from resource, using here a prefixed version private static final Map TOP_LEVEL_STATIC_FILES = Map.of("_.gitignore", ".gitignore", "README.md", "README.md"); private static final List JAVA_FILES =