GoogleContainerTools · TadCordle · Aug 9, 2019 · Aug 1, 2019 · Aug 2, 2019 · Aug 2, 2019
diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildDockerTask.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildDockerTask.java
@@ -26,6 +26,7 @@
 import com.google.cloud.tools.jib.plugins.common.InvalidAppRootException;
 import com.google.cloud.tools.jib.plugins.common.InvalidContainerVolumeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidContainerizingModeException;
+import com.google.cloud.tools.jib.plugins.common.InvalidCreationTimeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidFilesModificationTimeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidWorkingDirectoryException;
 import com.google.cloud.tools.jib.plugins.common.JibBuildRunner;
@@ -172,6 +173,14 @@ public void buildDocker()
               + ex.getInvalidFilesModificationTime(),
           ex);
 
+    } catch (InvalidCreationTimeException ex) {
+      throw new GradleException(
+          "container.creationTime should be an ISO 8601 date-time (see "
+              + "DateTimeFormatter.ISO_DATE_TIME) or a special keyword (\"EPOCH_PLUS_SECOND\", "
+              + "\"USE_CURRENT_TIMESTAMP\"): "
+              + ex.getInvalidCreationTime(),
+          ex);
+
     } catch (IncompatibleBaseImageJavaVersionException ex) {
       throw new GradleException(
           HelpfulSuggestions.forIncompatibleBaseImageJavaVesionForGradle(

diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildImageTask.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildImageTask.java
@@ -25,6 +25,7 @@
 import com.google.cloud.tools.jib.plugins.common.InvalidAppRootException;
 import com.google.cloud.tools.jib.plugins.common.InvalidContainerVolumeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidContainerizingModeException;
+import com.google.cloud.tools.jib.plugins.common.InvalidCreationTimeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidFilesModificationTimeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidWorkingDirectoryException;
 import com.google.cloud.tools.jib.plugins.common.JibBuildRunner;
@@ -152,6 +153,14 @@ public void buildImage()
               + ex.getInvalidFilesModificationTime(),
           ex);
 
+    } catch (InvalidCreationTimeException ex) {
+      throw new GradleException(
+          "container.creationTime should be an ISO 8601 date-time (see "
+              + "DateTimeFormatter.ISO_DATE_TIME) or a special keyword (\"EPOCH_PLUS_SECOND\", "
+              + "\"USE_CURRENT_TIMESTAMP\"): "
+              + ex.getInvalidCreationTime(),
+          ex);
+
     } catch (IncompatibleBaseImageJavaVersionException ex) {
       throw new GradleException(
           HelpfulSuggestions.forIncompatibleBaseImageJavaVesionForGradle(

diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildTarTask.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildTarTask.java
@@ -24,6 +24,7 @@
 import com.google.cloud.tools.jib.plugins.common.InvalidAppRootException;
 import com.google.cloud.tools.jib.plugins.common.InvalidContainerVolumeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidContainerizingModeException;
+import com.google.cloud.tools.jib.plugins.common.InvalidCreationTimeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidFilesModificationTimeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidWorkingDirectoryException;
 import com.google.cloud.tools.jib.plugins.common.JibBuildRunner;
@@ -170,6 +171,14 @@ public void buildTar()
               + ex.getInvalidFilesModificationTime(),
           ex);
 
+    } catch (InvalidCreationTimeException ex) {
+      throw new GradleException(
+          "container.creationTime should be an ISO 8601 date-time (see "
+              + "DateTimeFormatter.ISO_DATE_TIME) or a special keyword (\"EPOCH_PLUS_SECOND\", "
+              + "\"USE_CURRENT_TIMESTAMP\"): "
+              + ex.getInvalidCreationTime(),
+          ex);
+
     } catch (IncompatibleBaseImageJavaVersionException ex) {
       throw new GradleException(
           HelpfulSuggestions.forIncompatibleBaseImageJavaVesionForGradle(

diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ContainerParameters.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ContainerParameters.java
@@ -48,6 +48,7 @@ public class ContainerParameters {
   @Nullable private String user;
   @Nullable private String workingDirectory;
   private String filesModificationTime = "EPOCH_PLUS_SECOND";
+  private String creationTime = "EPOCH_PLUS_SECOND";
 
   @Input
   @Optional
@@ -261,4 +262,17 @@ public String getFilesModificationTime() {
   public void setFilesModificationTime(String filesModificationTime) {
     this.filesModificationTime = filesModificationTime;
   }
+
+  @Input
+  @Optional
+  public String getCreationTime() {
+    if (System.getProperty(PropertyNames.CONTAINER_CREATION_TIME) != null) {
+      return System.getProperty(PropertyNames.CONTAINER_CREATION_TIME);
+    }
+    return creationTime;
+  }
+
+  public void setCreationTime(String creationTime) {
+    this.creationTime = creationTime;
+  }
 }
diff --git a/...gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleRawConfiguration.java b/...gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleRawConfiguration.java
@@ -155,6 +155,11 @@ public String getFilesModificationTime() {
     return jibExtension.getContainer().getFilesModificationTime();
   }
 
+  @Override
+  public String getCreationTime() {
+    return jibExtension.getContainer().getCreationTime();
+  }
+
   @Override
   public List<Path> getExtraDirectories() {
     return jibExtension.getExtraDirectories().getPaths();

diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/TaskCommon.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/TaskCommon.java
@@ -89,6 +89,17 @@ static void checkDeprecatedUsage(JibExtension jibExtension, Logger logger) {
             "You cannot configure both 'jib.extraDirectory.path' and 'jib.extraDirectories.paths'");
       }
     }
+
+    if (jibExtension.getContainer().getUseCurrentTimestamp()) {
+      if (!jibExtension.getContainer().getCreationTime().equals("EPOCH_PLUS_SECOND")) {
+        throw new IllegalArgumentException(
+            "You cannot configure both 'jib.container.useCurrentTimestamp' and "
+                + "'jib.container.creationTime'");
+      }
+      logger.warn(
+          "'jib.container.useCurrentTimestamp' is deprecated; use 'jib.container.creationTime' "
+              + "with the value 'USE_CURRENT_TIMESTAMP' instead");
+    }
   }
 
   /**

diff --git a/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/TaskCommonTest.java b/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/TaskCommonTest.java
@@ -38,6 +38,7 @@
 public class TaskCommonTest {
 
   @Mock private JibExtension jibExtension;
+  @Mock private ContainerParameters containerParameters;
   @Mock private Logger logger;
 
   @Before
@@ -46,6 +47,7 @@ public void setUp() {
     Assert.assertNull(System.getProperty("jib.extraDirectory.permissions"));
     Assert.assertNull(System.getProperty("jib.extraDirectories.paths"));
     Assert.assertNull(System.getProperty("jib.extraDirectories.permissions"));
+    Mockito.when(jibExtension.getContainer()).thenReturn(containerParameters);
   }
 
   @After
@@ -131,6 +133,32 @@ public void testCheckDeprecatedUsage_extraDirectoryAndExtraDirectoriesConfigured
     }
   }
 
+  @Test
+  public void testCheckDeprecatedUsage_useCurrentTimestampConfigured() {
+    Mockito.when(containerParameters.getUseCurrentTimestamp()).thenReturn(true);
+    Mockito.when(containerParameters.getCreationTime()).thenReturn("EPOCH_PLUS_SECOND");
+    TaskCommon.checkDeprecatedUsage(jibExtension, logger);
+    Mockito.verify(logger)
+        .warn(
+            "'jib.container.useCurrentTimestamp' is deprecated; use 'jib.container.creationTime' "
+                + "with the value 'USE_CURRENT_TIMESTAMP' instead");
+  }
+
+  @Test
+  public void testCheckDeprecatedUsage_useCurrentTimestampAndCreationTimeConfigured() {
+    Mockito.when(containerParameters.getUseCurrentTimestamp()).thenReturn(true);
+    Mockito.when(containerParameters.getCreationTime()).thenReturn("USE_CURRENT_TIMESTAMP");
+    try {
+      TaskCommon.checkDeprecatedUsage(jibExtension, logger);
+      Assert.fail();
+    } catch (IllegalArgumentException ex) {
+      Assert.assertEquals(
+          "You cannot configure both 'jib.container.useCurrentTimestamp' and "
+              + "'jib.container.creationTime'",
+          ex.getMessage());
+    }
+  }
+
   @Test
   public void testGetWarTask_normalJavaProject() {
     Project project = ProjectBuilder.builder().build();

diff --git a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/BuildDockerMojo.java b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/BuildDockerMojo.java
@@ -27,6 +27,7 @@
 import com.google.cloud.tools.jib.plugins.common.InvalidAppRootException;
 import com.google.cloud.tools.jib.plugins.common.InvalidContainerVolumeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidContainerizingModeException;
+import com.google.cloud.tools.jib.plugins.common.InvalidCreationTimeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidFilesModificationTimeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidWorkingDirectoryException;
 import com.google.cloud.tools.jib.plugins.common.JibBuildRunner;
@@ -97,6 +98,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
           HelpfulSuggestions.forDockerNotInstalled(HELPFUL_SUGGESTIONS_PREFIX));
     }
 
+    MojoCommon.checkUseCurrentTimestampDeprecation(this);
+
     try {
       RawConfiguration mavenRawConfiguration = new MavenRawConfiguration(this);
       MavenProjectProperties projectProperties =
@@ -170,6 +173,14 @@ public void execute() throws MojoExecutionException, MojoFailureException {
               + ex.getInvalidFilesModificationTime(),
           ex);
 
+    } catch (InvalidCreationTimeException ex) {
+      throw new MojoExecutionException(
+          "<container><creationTime> should be an ISO 8601 date-time (see "
+              + "DateTimeFormatter.ISO_DATE_TIME) or a special keyword (\"EPOCH_PLUS_SECOND\", "
+              + "\"USE_CURRENT_TIMESTAMP\"): "
+              + ex.getInvalidCreationTime(),
+          ex);
+
     } catch (IncompatibleBaseImageJavaVersionException ex) {
       throw new MojoExecutionException(
           HelpfulSuggestions.forIncompatibleBaseImageJavaVesionForMaven(

diff --git a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/BuildImageMojo.java b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/BuildImageMojo.java
@@ -26,6 +26,7 @@
 import com.google.cloud.tools.jib.plugins.common.InvalidAppRootException;
 import com.google.cloud.tools.jib.plugins.common.InvalidContainerVolumeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidContainerizingModeException;
+import com.google.cloud.tools.jib.plugins.common.InvalidCreationTimeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidFilesModificationTimeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidWorkingDirectoryException;
 import com.google.cloud.tools.jib.plugins.common.JibBuildRunner;
@@ -73,6 +74,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
       return;
     }
 
+    MojoCommon.checkUseCurrentTimestampDeprecation(this);
+
     // Validates 'format'.
     if (Arrays.stream(ImageFormat.values()).noneMatch(value -> value.name().equals(getFormat()))) {
       throw new MojoFailureException(
@@ -164,6 +167,14 @@ public void execute() throws MojoExecutionException, MojoFailureException {
               + ex.getInvalidFilesModificationTime(),
           ex);
 
+    } catch (InvalidCreationTimeException ex) {
+      throw new MojoExecutionException(
+          "<container><creationTime> should be an ISO 8601 date-time (see "
+              + "DateTimeFormatter.ISO_DATE_TIME) or a special keyword (\"EPOCH_PLUS_SECOND\", "
+              + "\"USE_CURRENT_TIMESTAMP\"): "
+              + ex.getInvalidCreationTime(),
+          ex);
+
     } catch (IncompatibleBaseImageJavaVersionException ex) {
       throw new MojoExecutionException(
           HelpfulSuggestions.forIncompatibleBaseImageJavaVesionForMaven(

diff --git a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/BuildTarMojo.java b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/BuildTarMojo.java
@@ -24,6 +24,7 @@
 import com.google.cloud.tools.jib.plugins.common.InvalidAppRootException;
 import com.google.cloud.tools.jib.plugins.common.InvalidContainerVolumeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidContainerizingModeException;
+import com.google.cloud.tools.jib.plugins.common.InvalidCreationTimeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidFilesModificationTimeException;
 import com.google.cloud.tools.jib.plugins.common.InvalidWorkingDirectoryException;
 import com.google.cloud.tools.jib.plugins.common.JibBuildRunner;
@@ -71,6 +72,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
       return;
     }
 
+    MojoCommon.checkUseCurrentTimestampDeprecation(this);
+
     try {
       RawConfiguration mavenRawConfiguration = new MavenRawConfiguration(this);
       MavenProjectProperties projectProperties =
@@ -142,6 +145,14 @@ public void execute() throws MojoExecutionException, MojoFailureException {
               + ex.getInvalidFilesModificationTime(),
           ex);
 
+    } catch (InvalidCreationTimeException ex) {
+      throw new MojoExecutionException(
+          "<container><creationTime> should be an ISO 8601 date-time (see "
+              + "DateTimeFormatter.ISO_DATE_TIME) or a special keyword (\"EPOCH_PLUS_SECOND\", "
+              + "\"USE_CURRENT_TIMESTAMP\"): "
+              + ex.getInvalidCreationTime(),
+          ex);
+
     } catch (IncompatibleBaseImageJavaVersionException ex) {
       throw new MojoExecutionException(
           HelpfulSuggestions.forIncompatibleBaseImageJavaVesionForMaven(

diff --git a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/JibPluginConfiguration.java b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/JibPluginConfiguration.java
@@ -186,6 +186,8 @@ public static class ContainerParameters {
     @Nullable @Parameter private String workingDirectory;
 
     @Parameter private String filesModificationTime = "EPOCH_PLUS_SECOND";
+
+    @Parameter private String creationTime = "EPOCH_PLUS_SECOND";
   }
 
   /** Configuration for the {@code extraDirectories} parameter. */
@@ -363,6 +365,7 @@ AuthConfiguration getTargetImageAuth() {
    *
    * @return {@code true} if the build should use the current timestamp, {@code false} if not
    */
+  @Deprecated
   boolean getUseCurrentTimestamp() {
     String property = getProperty(PropertyNames.CONTAINER_USE_CURRENT_TIMESTAMP);
     if (property != null) {
@@ -558,6 +561,19 @@ String getFilesModificationTime() {
     return container.filesModificationTime;
   }
 
+  /**
+   * Gets the configured container creation time value.
+   *
+   * @return the configured container creation time value
+   */
+  String getCreationTime() {
+    String property = getProperty(PropertyNames.CONTAINER_CREATION_TIME);
+    if (property != null) {
+      return property;
+    }
+    return container.creationTime;
+  }
+
   /**
    * Gets the list of configured extra directory paths.
    *

diff --git a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MavenRawConfiguration.java b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MavenRawConfiguration.java
@@ -160,6 +160,11 @@ public String getFilesModificationTime() {
     return jibPluginConfiguration.getFilesModificationTime();
   }
 
+  @Override
+  public String getCreationTime() {
+    return jibPluginConfiguration.getCreationTime();
+  }
+
   @Override
   public List<Path> getExtraDirectories() {
     return MojoCommon.getExtraDirectories(jibPluginConfiguration);

diff --git a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MojoCommon.java b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MojoCommon.java
@@ -38,6 +38,22 @@ public class MojoCommon {
   @VisibleForTesting
   public static final String REQUIRED_VERSION_PROPERTY_NAME = "jib.requiredVersion";
 
+  @Deprecated
+  static void checkUseCurrentTimestampDeprecation(JibPluginConfiguration jibPluginConfiguration) {
+    if (jibPluginConfiguration.getUseCurrentTimestamp()) {
+      if (!jibPluginConfiguration.getCreationTime().equals("EPOCH_PLUS_SECOND")) {
+        throw new IllegalArgumentException(
+            "You cannot configure both <container><useCurrentTimestamp> and "
+                + "<container><creationTime>");
+      }
+      jibPluginConfiguration
+          .getLog()
+          .warn(
+              "<container><useCurrentTimestamp> is deprecated; use <container><creationTime> with "
+                  + "the value CURRENT_TIME instead");
+    }
+  }
+
   /**
    * Gets the list of extra directory paths from a {@link JibPluginConfiguration}. Returns {@code
    * (project dir)/src/main/jib} by default if not configured.