add support for GOOGLE_APPLICATION_CREDENTIALS env variable (#56)

spotify · May 12, 2021 · c6d8ff7 · c6d8ff7
1 parent dc1212d
commit c6d8ff7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/flink/resources.go b/pkg/flink/resources.go
@@ -55,6 +55,7 @@ type gcsDownloader struct{}
 func (gcsDownloader) Container(artifacts []string) corev1.Container {
 	cmd := strings.Join([]string{
 		fmt.Sprintf("mkdir -p %s", defaultJarLibPath),
+		`if [ -n "${GOOGLE_APPLICATION_CREDENTIALS}" ]; then gcloud auth activate-service-account --key-file $GOOGLE_APPLICATION_CREDENTIALS; fi`,
 		fmt.Sprintf("gsutil -m cp %s %s", strings.Join(artifacts[:], " "), defaultJarLibPath),
 	}, " && ")
 
@@ -203,7 +204,7 @@ func (fc *FlinkCluster) updateJobSpec(taskCtx FlinkTaskContext) error {
 
 	groupBy := GroupByScheme(taskCtx.Job.GetJarFiles())
 	if len(groupBy) == 0 {
-		// use jflye artifacts as fallback only
+		// use jflyte artifacts as fallback only
 		urls := make([]string, len(taskCtx.Job.GetJflyte().GetArtifacts()))
 		for i, a := range taskCtx.Job.GetJflyte().GetArtifacts() {
 			urls[i] = a.Location

diff --git a/pkg/flink/resources_test.go b/pkg/flink/resources_test.go
@@ -272,6 +272,7 @@ func TestBuildFlinkClusterSpecJobCommand(t *testing.T) {
 	args := []string{
 		"-c",
 		"mkdir -p /jars/lib && " +
+			`if [ -n "${GOOGLE_APPLICATION_CREDENTIALS}" ]; then gcloud auth activate-service-account --key-file $GOOGLE_APPLICATION_CREDENTIALS; fi && ` +
 			"gsutil -m cp" +
 			" gs://bucket/artifact0.jar" +
 			" gs://bucket/artifact1.jar" +