fix: add immage flag for . image convention

score-spec · Jan 31, 2024 · 592bbad · 592bbad
1 parent 111380a
commit 592bbad
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/internal/command/consts.go b/internal/command/consts.go
@@ -29,6 +29,7 @@ var (
 	workloadSourceURL string
 
 	overrideParams []string
+	currentImage   string
 	message        string
 
 	// deltaID is a cli flag receiver used to support "score-humanitec delta --use foo"

diff --git a/internal/command/delta.go b/internal/command/delta.go
@@ -42,6 +42,7 @@ func init() {
 	deltaCmd.MarkFlagRequired("env")
 
 	deltaCmd.Flags().StringArrayVarP(&overrideParams, "property", "p", nil, "Overrides selected property value")
+	deltaCmd.Flags().StringVarP(&currentImage, "image", "i", ".", "Image to use for for the current image, signified by \".\"")
 	deltaCmd.Flags().StringVarP(&message, "message", "m", messageDefault, "Message")
 
 	deltaCmd.Flags().BoolVar(&deploy, "deploy", false, "Trigger a new delta deployment at the end")

diff --git a/internal/command/draft.go b/internal/command/draft.go
@@ -28,6 +28,7 @@ func init() {
 	draftCmd.MarkFlagRequired("env")
 
 	draftCmd.Flags().StringArrayVarP(&overrideParams, "property", "p", nil, "Overrides selected property value")
+	draftCmd.Flags().StringVarP(&currentImage, "image", "i", ".", "Image to use for for the current image, signified by \".\"")
 
 	draftCmd.Flags().BoolVar(&deploy, "deploy", false, "Trigger a new draft deployment at the end")
 	draftCmd.Flags().BoolVar(&verbose, "verbose", false, "Enable diagnostic messages (written to STDERR)")

diff --git a/internal/command/run.go b/internal/command/run.go
@@ -39,6 +39,7 @@ func init() {
 	runCmd.MarkFlagRequired("env")
 
 	runCmd.Flags().StringArrayVarP(&overrideParams, "property", "p", nil, "Overrides selected property value")
+	runCmd.Flags().StringVarP(&currentImage, "image", "i", ".", "Image to use for for the current image, signified by \".\"")
 	runCmd.Flags().StringVarP(&message, "message", "m", messageDefault, "Message")
 
 	runCmd.Flags().BoolVar(&skipValidation, "skip-validation", false, "DEPRECATED: Disables Score file schema validation.")
@@ -158,6 +159,18 @@ func loadSpec(scoreFile, overridesFile, extensionsFile string, skipValidation bo
 		}
 	}
 
+	// Replace images defined by . (optional)
+	//
+	if containers, ok := srcMap["containers"].(map[string]interface{}); ok {
+		for _, containerVal := range containers {
+			if container, ok := containerVal.(map[string]interface{}); ok {
+				if image, ok := container["image"].(string); ok && image == "." {
+					container["image"] = currentImage
+				}
+			}
+		}
+	}
+
 	// Load extensions (optional)
 	//
 	var extMap = make(map[string]interface{})