From dcc4a652324f2fbabee0ffb7cca381498c40fe29 Mon Sep 17 00:00:00 2001 From: Appu Goundan Date: Thu, 5 Dec 2019 18:30:25 -0500 Subject: [PATCH 1/2] Use a different marker so we don't clash with other jib json outputs --- .../google/cloud/tools/jib/gradle/skaffold/SyncMapTask.java | 2 +- .../cloud/tools/jib/gradle/skaffold/SyncMapTaskTest.java | 2 +- .../com/google/cloud/tools/jib/maven/skaffold/SyncMapMojo.java | 2 +- .../google/cloud/tools/jib/maven/skaffold/SyncMapMojoTest.java | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTask.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTask.java index c580b15c53..77468638c1 100644 --- a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTask.java +++ b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTask.java @@ -80,7 +80,7 @@ public void listFilesAndTargets() { PluginConfigurationProcessor.getSkaffoldSyncMap(configuration, projectProperties); System.out.println(); - System.out.println("BEGIN JIB JSON"); + System.out.println("BEGIN JIB SYNCMAP JSON"); System.out.println(syncMapJson); } catch (Exception ex) { diff --git a/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTaskTest.java b/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTaskTest.java index 8fd5329712..b25ba79260 100644 --- a/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTaskTest.java +++ b/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTaskTest.java @@ -72,7 +72,7 @@ private static SkaffoldSyncMapTemplate generateTemplate( List outputLines = Splitter.on(System.lineSeparator()).omitEmptyStrings().splitToList(buildResult.getOutput()); Assert.assertEquals(2, outputLines.size()); - Assert.assertEquals("BEGIN JIB JSON", outputLines.get(0)); + Assert.assertEquals("BEGIN JIB SYNCMAP JSON", outputLines.get(0)); return SkaffoldSyncMapTemplate.from(outputLines.get(1)); } diff --git a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojo.java b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojo.java index 908c8a04fc..2c15343adb 100644 --- a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojo.java +++ b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojo.java @@ -79,7 +79,7 @@ public void execute() throws MojoExecutionException { PluginConfigurationProcessor.getSkaffoldSyncMap(configuration, projectProperties); System.out.println(); - System.out.println("BEGIN JIB JSON"); + System.out.println("BEGIN JIB SYNCMAP JSON"); System.out.println(syncMapJson); } catch (Exception ex) { diff --git a/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojoTest.java b/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojoTest.java index d76412731a..661dc1f222 100644 --- a/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojoTest.java +++ b/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojoTest.java @@ -65,7 +65,8 @@ private static String getSyncMapJson(Path projectRoot, String module) throws VerificationException, IOException { Path logFile = runBuild(projectRoot, module, null); List outputLines = Files.readAllLines(logFile, StandardCharsets.UTF_8); - Assert.assertEquals(3, outputLines.size()); // we expect ["\n", "BEGIN JIB JSON", ""] + Assert.assertEquals(3, outputLines.size()); // we expect ["\n", "", ""] + Assert.assertEquals("BEGIN JIB SYNCMAP JSON", outputLines.get(1)); return outputLines.get(2); // this is the JSON output } From 0625ba317f4fcfd4f519e08eea33560323fe45ef Mon Sep 17 00:00:00 2001 From: Appu Goundan Date: Thu, 12 Dec 2019 16:10:59 -0500 Subject: [PATCH 2/2] use feature/version style formatting --- .../com/google/cloud/tools/jib/gradle/skaffold/SyncMapTask.java | 2 +- .../google/cloud/tools/jib/gradle/skaffold/SyncMapTaskTest.java | 2 +- .../com/google/cloud/tools/jib/maven/skaffold/SyncMapMojo.java | 2 +- .../google/cloud/tools/jib/maven/skaffold/SyncMapMojoTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTask.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTask.java index 77468638c1..1cb38bb82b 100644 --- a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTask.java +++ b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTask.java @@ -80,7 +80,7 @@ public void listFilesAndTargets() { PluginConfigurationProcessor.getSkaffoldSyncMap(configuration, projectProperties); System.out.println(); - System.out.println("BEGIN JIB SYNCMAP JSON"); + System.out.println("BEGIN JIB JSON: SYNCMAP/1"); System.out.println(syncMapJson); } catch (Exception ex) { diff --git a/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTaskTest.java b/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTaskTest.java index b25ba79260..e0c683c290 100644 --- a/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTaskTest.java +++ b/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/SyncMapTaskTest.java @@ -72,7 +72,7 @@ private static SkaffoldSyncMapTemplate generateTemplate( List outputLines = Splitter.on(System.lineSeparator()).omitEmptyStrings().splitToList(buildResult.getOutput()); Assert.assertEquals(2, outputLines.size()); - Assert.assertEquals("BEGIN JIB SYNCMAP JSON", outputLines.get(0)); + Assert.assertEquals("BEGIN JIB JSON: SYNCMAP/1", outputLines.get(0)); return SkaffoldSyncMapTemplate.from(outputLines.get(1)); } diff --git a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojo.java b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojo.java index 2c15343adb..930ea8dd30 100644 --- a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojo.java +++ b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojo.java @@ -79,7 +79,7 @@ public void execute() throws MojoExecutionException { PluginConfigurationProcessor.getSkaffoldSyncMap(configuration, projectProperties); System.out.println(); - System.out.println("BEGIN JIB SYNCMAP JSON"); + System.out.println("BEGIN JIB JSON: SYNCMAP/1"); System.out.println(syncMapJson); } catch (Exception ex) { diff --git a/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojoTest.java b/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojoTest.java index 661dc1f222..68e9b545ad 100644 --- a/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojoTest.java +++ b/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/skaffold/SyncMapMojoTest.java @@ -66,7 +66,7 @@ private static String getSyncMapJson(Path projectRoot, String module) Path logFile = runBuild(projectRoot, module, null); List outputLines = Files.readAllLines(logFile, StandardCharsets.UTF_8); Assert.assertEquals(3, outputLines.size()); // we expect ["\n", "", ""] - Assert.assertEquals("BEGIN JIB SYNCMAP JSON", outputLines.get(1)); + Assert.assertEquals("BEGIN JIB JSON: SYNCMAP/1", outputLines.get(1)); return outputLines.get(2); // this is the JSON output }