Refactoring

Author: aIbrahiim

.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml

@@ -77,13 +77,9 @@ jobs:
           python-version: default
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: GCloud Docker credential helper
-        run: |
-          gcloud auth configure-docker us.gcr.io
       - name: run XVR GoUsingJava Dataflow script
         env:
           USER: github-actions
-          CLOUDSDK_CONFIG: ${{ env.KUBELET_GCLOUD_CONFIG_PATH}}
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
           gradle-command: :runners:google-cloud-dataflow-java:validatesCrossLanguageRunnerGoUsingJava

runners/google-cloud-dataflow-java/build.gradle

@@ -371,11 +371,42 @@ def buildAndPushDockerPythonContainer = tasks.create("buildAndPushDockerPythonCo
           name: "${project.docker_image_default_repo_prefix}python${pythonVer}_sdk",
           root: "apache",
           tag: project.sdk_version)
+  doFirst {
+    def cloudsdkConfig = System.getenv("CLOUDSDK_CONFIG")
+    if (cloudsdkConfig == null || !new File(cloudsdkConfig).canWrite()) {
+      def tmpGcloudDir = new File("/tmp/gcloud")
+      tmpGcloudDir.mkdirs()
+      System.setProperty("CLOUDSDK_CONFIG", "/tmp/gcloud")
+      exec {
+        environment "CLOUDSDK_CONFIG", "/tmp/gcloud"
+        commandLine "gcloud", "--quiet", "auth", "configure-docker", "us.gcr.io"
+        ignoreExitValue = false
+      }
+      exec {
+        environment "CLOUDSDK_CONFIG", "/tmp/gcloud"
+        commandLine "gcloud", "--quiet", "auth", "configure-docker", "gcr.io"
+        ignoreExitValue = false
+      }
+    } else {
+      exec {
+        environment "CLOUDSDK_CONFIG", cloudsdkConfig
+        commandLine "gcloud", "--quiet", "auth", "configure-docker", "us.gcr.io"
+        ignoreExitValue = false
+      }
+      exec {
+        environment "CLOUDSDK_CONFIG", cloudsdkConfig
+        commandLine "gcloud", "--quiet", "auth", "configure-docker", "gcr.io"
+        ignoreExitValue = false
+      }
+    }
+  }
   doLast {
     exec {
       commandLine "docker", "tag", "${defaultDockerImageName}", "${dockerPythonImageName}"
     }
+    def cloudsdkConfig = System.getenv("CLOUDSDK_CONFIG") ?: System.getProperty("CLOUDSDK_CONFIG") ?: "/tmp/gcloud"
     exec {
+      environment "CLOUDSDK_CONFIG", cloudsdkConfig
       commandLine "gcloud", "docker", "--", "push", "${dockerPythonImageName}"
     }
   }