fix[prod] single quote and double quote issue

goto · Nov 6, 2023 · 5128f11 · 5128f11
1 parent 9320256
commit 5128f11
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/client/cmd/job/run_input.go b/client/cmd/job/run_input.go
@@ -158,12 +158,8 @@ func (j *jobRunInputCommand) writeJobResponseSecretToFile(
 ) error {
 	// write all secrets into a file
 	secretsFileContent := ""
-	for key, val := range jobResponse.Secrets {
-		if strings.Contains(val, unsubstitutedValue) {
-			j.keysWithUnsubstitutedValue = append(j.keysWithUnsubstitutedValue, key)
-		}
-		secretsFileContent += fmt.Sprintf("%s='%s'\n", key, val)
-	}
+	secretsFileContent, keysWithUnsubstitutedValue := ConstructConfigEnvSourcingContent(jobResponse.Envs)
+	j.keysWithUnsubstitutedValue = append(j.keysWithUnsubstitutedValue, keysWithUnsubstitutedValue...)
 
 	filePath := filepath.Join(dirPath, typeSecretFileName)
 	writeToFileFn := utils.WriteStringToFileIndexed()
@@ -174,13 +170,8 @@ func (j *jobRunInputCommand) writeJobResponseSecretToFile(
 }
 
 func (j *jobRunInputCommand) writeJobResponseEnvToFile(jobResponse *pb.JobRunInputResponse, dirPath string) error {
-	envFileBlob := ""
-	for key, val := range jobResponse.Envs {
-		if strings.Contains(val, unsubstitutedValue) {
-			j.keysWithUnsubstitutedValue = append(j.keysWithUnsubstitutedValue, key)
-		}
-		envFileBlob += fmt.Sprintf("%s='%s'\n", key, val)
-	}
+	envFileBlob, keysWithUnsubstitutedValue := ConstructConfigEnvSourcingContent(jobResponse.Envs)
+	j.keysWithUnsubstitutedValue = append(j.keysWithUnsubstitutedValue, keysWithUnsubstitutedValue...)
 
 	filePath := filepath.Join(dirPath, typeEnvFileName)
 	writeToFileFn := utils.WriteStringToFileIndexed()
@@ -190,6 +181,17 @@ func (j *jobRunInputCommand) writeJobResponseEnvToFile(jobResponse *pb.JobRunInp
 	return nil
 }
 
+func ConstructConfigEnvSourcingContent(config map[string]string) (content string, keysWithUnsubstitutedValue []string) {
+	for key, val := range config {
+		if strings.Contains(val, unsubstitutedValue) {
+			keysWithUnsubstitutedValue = append(keysWithUnsubstitutedValue, key)
+		}
+		escapedVal := strings.ReplaceAll(val, "'", "'\\''")
+		content += fmt.Sprintf("%s='%s'\n", key, escapedVal)
+	}
+	return content, keysWithUnsubstitutedValue
+}
+
 func (j *jobRunInputCommand) writeJobAssetsToFiles(
 	jobResponse *pb.JobRunInputResponse, dirPath string,
 ) error {