Merge pull request #2019 from bruin-data/patch/expose-variant-name

TanayBensuYurtturk · web-flow · commit 8cff41006da7 · 2026-05-07T21:25:36.000+03:00
expose selected variant name
diff --git a/integration-tests/test-pipelines/parse-asset-extends/expectations/pipeline.json b/integration-tests/test-pipelines/parse-asset-extends/expectations/pipeline.json
@@ -152,5 +152,6 @@
   "snapshot": "",
   "agent": false,
   "variables": null,
+  "selected_variant": "",
   "macros": []
 }
diff --git a/integration-tests/test-pipelines/parse-default-option/expectations/pipeline.yml.json b/integration-tests/test-pipelines/parse-default-option/expectations/pipeline.yml.json
@@ -343,5 +343,6 @@
   "snapshot": "",
   "agent": false,
   "variables": null,
+  "selected_variant": "",
   "macros": []
 }
diff --git a/integration-tests/test-pipelines/parse-happy-path/expectations/pipeline.yml.json b/integration-tests/test-pipelines/parse-happy-path/expectations/pipeline.yml.json
@@ -281,5 +281,6 @@
   "snapshot": "",
   "agent": false,
   "variables": null,
+  "selected_variant": "",
   "macros": []
 }
diff --git a/integration-tests/test-pipelines/parse-lineage-pipeline/expectations/lineage.json b/integration-tests/test-pipelines/parse-lineage-pipeline/expectations/lineage.json
@@ -585,5 +585,6 @@
   "snapshot": "",
   "agent": false,
   "variables": null,
+  "selected_variant": "",
   "macros": []
 }
diff --git a/integration-tests/test-pipelines/parse-whole-pipeline/expectations/pipeline.yml.json b/integration-tests/test-pipelines/parse-whole-pipeline/expectations/pipeline.yml.json
@@ -245,6 +245,7 @@
   "snapshot": "",
   "agent": false,
   "variables": null,
+  "selected_variant": "",
   "macros": [
     "{{ some_macro() }}"
   ]
diff --git a/pkg/pipeline/pipeline.go b/pkg/pipeline/pipeline.go
@@ -1581,6 +1581,7 @@ type Pipeline struct {
 	Agent              bool                   `json:"agent" yaml:"agent,omitempty" mapstructure:"agent"`
 	Variables          Variables              `json:"variables" yaml:"variables,omitempty" mapstructure:"variables"`
 	Variants           VariantSet             `json:"variants,omitempty" yaml:"variants,omitempty" mapstructure:"variants"`
+	SelectedVariant    string                 `json:"selected_variant" yaml:"-"`
 	TasksByType        map[AssetType][]*Asset `json:"-" yaml:"-"`
 	tasksByName        map[string]*Asset      `yaml:"-"`
 	MacrosPath         string                 `json:"-" yaml:"-"`
diff --git a/pkg/pipeline/testdata/pipeline/first-pipeline_unix.json b/pkg/pipeline/testdata/pipeline/first-pipeline_unix.json
@@ -311,5 +311,6 @@
     "snapshot": "",
     "agent": false,
     "variables": null,
+    "selected_variant": "",
   "macros": []
 }
diff --git a/pkg/pipeline/testdata/pipeline/first-pipeline_windows.json b/pkg/pipeline/testdata/pipeline/first-pipeline_windows.json
@@ -14,6 +14,7 @@
     "path": "__BASEDIR__\\testdata\\pipeline\\first-pipeline\\pipeline.yml"
   },
   "variables": null,
+  "selected_variant": "",
   "macros": [],
   "default_connections": {
     "gcpConnectionId": "gcp-connection-id-here",
diff --git a/pkg/pipeline/testdata/pipeline/pipeline-with-no-assets_unix.json b/pkg/pipeline/testdata/pipeline/pipeline-with-no-assets_unix.json
@@ -34,5 +34,6 @@
     "snapshot": "",
     "agent": false,
     "variables": null,
+    "selected_variant": "",
     "macros": []
 }
diff --git a/pkg/pipeline/testdata/pipeline/pipeline-with-no-assets_windows.json b/pkg/pipeline/testdata/pipeline/pipeline-with-no-assets_windows.json
@@ -14,6 +14,7 @@
     "path": "__BASEDIR__\\testdata\\pipeline\\pipeline-with-no-assets\\pipeline.yml"
   },
   "variables": null,
+  "selected_variant": "",
   "macros": [],
   "default_connections": {
     "gcpConnectionId": "gcp-connection-id-here",
diff --git a/pkg/pipeline/testdata/pipeline/second-pipeline_unix.json b/pkg/pipeline/testdata/pipeline/second-pipeline_unix.json
@@ -280,5 +280,6 @@
     "snapshot": "",
     "agent": false,
     "variables": null,
+    "selected_variant": "",
     "macros": []
 }
diff --git a/pkg/pipeline/testdata/pipeline/second-pipeline_windows.json b/pkg/pipeline/testdata/pipeline/second-pipeline_windows.json
@@ -14,6 +14,7 @@
     "path": "__BASEDIR__\\testdata\\pipeline\\second-pipeline\\pipeline.yml"
   },
   "variables": null,
+  "selected_variant": "",
   "macros": [],
   "default_connections": {
     "gcpConnectionId": "gcp-connection-id-here",
diff --git a/pkg/pipeline/variant.go b/pkg/pipeline/variant.go
@@ -89,6 +89,7 @@ func (pl *Pipeline) ApplyVariantVariables(variantName string) error {
 	if err := pl.Variables.Merge(overrides); err != nil {
 		return fmt.Errorf("invalid variant %q: %w", variantName, err)
 	}
+	pl.SelectedVariant = variantName
 	return nil
 }
 
diff --git a/pkg/pipeline/variant_test.go b/pkg/pipeline/variant_test.go
@@ -251,6 +251,7 @@ func TestVariantVisitorCoversStringFields(t *testing.T) {
 		"Pipeline.MacrosPath":          true,
 		"Pipeline.Commit":              true,
 		"Pipeline.Snapshot":            true,
+		"Pipeline.SelectedVariant":     true,
 		"Pipeline.DefinitionFile.Name": true,
 		"Pipeline.DefinitionFile.Path": true,
 		"Pipeline.Macros[]":            true, // macro bodies are run-time Jinja

Original file line number	Diff line number	Diff line change
`@@ -152,5 +152,6 @@`
`152`	`152`	`"snapshot": "",`
`153`	`153`	`"agent": false,`
`154`	`154`	`"variables": null,`
	`155`	`+ "selected_variant": "",`
`155`	`156`	`"macros": []`
`156`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -343,5 +343,6 @@`
`343`	`343`	`"snapshot": "",`
`344`	`344`	`"agent": false,`
`345`	`345`	`"variables": null,`
	`346`	`+ "selected_variant": "",`
`346`	`347`	`"macros": []`
`347`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -281,5 +281,6 @@`
`281`	`281`	`"snapshot": "",`
`282`	`282`	`"agent": false,`
`283`	`283`	`"variables": null,`
	`284`	`+ "selected_variant": "",`
`284`	`285`	`"macros": []`
`285`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -585,5 +585,6 @@`
`585`	`585`	`"snapshot": "",`
`586`	`586`	`"agent": false,`
`587`	`587`	`"variables": null,`
	`588`	`+ "selected_variant": "",`
`588`	`589`	`"macros": []`
`589`	`590`	`}`
Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,7 @@`
`245`	`245`	`"snapshot": "",`
`246`	`246`	`"agent": false,`
`247`	`247`	`"variables": null,`
	`248`	`+ "selected_variant": "",`
`248`	`249`	`"macros": [`
`249`	`250`	`"{{ some_macro() }}"`
`250`	`251`	`]`
Original file line number	Diff line number	Diff line change
`@@ -311,5 +311,6 @@`
`311`	`311`	`"snapshot": "",`
`312`	`312`	`"agent": false,`
`313`	`313`	`"variables": null,`
	`314`	`+ "selected_variant": "",`
`314`	`315`	`"macros": []`
`315`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@`
`34`	`34`	`"snapshot": "",`
`35`	`35`	`"agent": false,`
`36`	`36`	`"variables": null,`
	`37`	`+ "selected_variant": "",`
`37`	`38`	`"macros": []`
`38`	`39`	`}`