[WIP] Templates share image

Author: Abacn

plugins/core-plugin/src/main/java/com/google/cloud/teleport/plugin/DockerfileGenerator.java

@@ -41,9 +41,9 @@
  * includes Python, Yaml and Xlang templates
  */
 public class DockerfileGenerator {
-
+  // TODO(DO NOT MERGE) - testing!
   public static final String BASE_CONTAINER_IMAGE =
-      "gcr.io/dataflow-templates-base/java17-template-launcher-base-distroless:latest";
+      "gcr.io/dataflow-build/yathu/java17-template-launcher-base-distroless:850175030";
   // Keep in sync with python version used in
   // https://github.com/GoogleCloudPlatform/DataflowTemplates/blob/main/python/generate_dependencies.sh
   public static final String BASE_PYTHON_CONTAINER_IMAGE =

plugins/core-plugin/src/main/java/com/google/cloud/teleport/plugin/TemplateSpecsGenerator.java

@@ -26,7 +26,6 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.file.Path;
 import java.util.List;
 import java.util.logging.Logger;
 import org.apache.commons.lang3.StringUtils;
@@ -121,14 +120,6 @@ public File saveMetadata(
     }
 
     String imageName = templateDash.toLowerCase();
-    if (StringUtils.isNotEmpty(templateAnnotation.flexContainerName())) {
-      imageName = Path.of(templateAnnotation.flexContainerName()).getFileName().toString();
-    }
-
-    if (!targetDirectory.exists()) {
-      targetDirectory.mkdirs();
-    }
-
     File file = new File(targetDirectory, imageName + "-generated-metadata.json");
     LOG.info("Saving image spec metadata " + file.getAbsolutePath());
 

plugins/core-plugin/src/test/java/com/google/cloud/teleport/plugin/TemplateSpecsGeneratorTest.java

@@ -105,8 +105,8 @@ public void saveMetadataNestedFlex() {
     assertNotNull(saveMetadata);
     assertTrue(saveMetadata.exists());
     assertEquals(
-        saveMetadata.getPath(),
-        outputFolder.toPath().resolve("AtoBNestedFlex-generated-metadata.json").toString());
+        outputFolder.toPath().resolve("atobnestedflex-generated-metadata.json").toString(),
+        saveMetadata.getPath());
   }
 
   @Test

plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesReleaseMojo.java

@@ -170,6 +170,35 @@ public void execute() throws MojoExecutionException {
         return;
       }
 
+      String useRegion = StringUtils.isNotEmpty(region) ? region : "us-central1";
+      TemplatesStageMojo configuredMojo =
+          new TemplatesStageMojo(
+              project,
+              session,
+              outputDirectory,
+              outputClassesDirectory,
+              resourcesDirectory,
+              targetDirectory,
+              projectId,
+              templateName,
+              bucketName,
+              librariesBucketName,
+              stagePrefix,
+              useRegion,
+              artifactRegion,
+              gcpTempLocation,
+              baseContainerImage,
+              basePythonContainerImage,
+              pythonTemplateLauncherEntryPoint,
+              javaTemplateLauncherEntryPoint,
+              pythonVersion,
+              beamVersion,
+              artifactRegistry,
+              stagingArtifactRegistry,
+              unifiedWorker,
+              generateSBOM);
+      configuredMojo.stageCommandSpecs(templateDefinitions);
+
       for (TemplateDefinitions definition : templateDefinitions) {
 
         ImageSpec imageSpec = definition.buildSpecModel(true);
@@ -181,36 +210,6 @@ public void execute() throws MojoExecutionException {
 
         LOG.info("Staging template {}...", currentTemplateName);
 
-        String useRegion = StringUtils.isNotEmpty(region) ? region : "us-central1";
-
-        // TODO: is there a better way to get the plugin on the _same project_?
-        TemplatesStageMojo configuredMojo =
-            new TemplatesStageMojo(
-                project,
-                session,
-                outputDirectory,
-                outputClassesDirectory,
-                resourcesDirectory,
-                targetDirectory,
-                projectId,
-                templateName,
-                bucketName,
-                librariesBucketName,
-                stagePrefix,
-                useRegion,
-                artifactRegion,
-                gcpTempLocation,
-                baseContainerImage,
-                basePythonContainerImage,
-                pythonTemplateLauncherEntryPoint,
-                javaTemplateLauncherEntryPoint,
-                pythonVersion,
-                beamVersion,
-                artifactRegistry,
-                stagingArtifactRegistry,
-                unifiedWorker,
-                generateSBOM);
-
         String templatePath = configuredMojo.stageTemplate(definition, imageSpec, pluginManager);
 
         if (!definition.getTemplateAnnotation().stageImageOnly()) {