Merge pull request #145 from awslabs/fix/combined-variables

Fix: allow referencing dynamic and static variables in one field

Author: a-hilaly

internal/runtime/runtime.go

@@ -346,6 +346,7 @@ func (rt *ResourceGroupRuntime) evaluateDynamicVariables() error {
 	// and are resolved after all the dependencies are resolved.
 
 	resolvedResources := maps.Keys(rt.resolvedResources)
+	resolvedResources = append(resolvedResources, "schema")
 	env, err := krocel.DefaultEnvironment(krocel.WithResourceIDs(resolvedResources))
 	if err != nil {
 		return err
@@ -374,6 +375,8 @@ func (rt *ResourceGroupRuntime) evaluateDynamicVariables() error {
 				evalContext[dep] = rt.resolvedResources[dep].Object
 			}
 
+			evalContext["schema"] = rt.instance.Unstructured().Object
+
 			value, err := evaluateExpression(env, evalContext, variable.Expression)
 			if err != nil {
 				if strings.Contains(err.Error(), "no such key") {

internal/runtime/runtime_test.go

@@ -179,7 +179,7 @@ func Test_RuntimeWorkflow(t *testing.T) {
 			},
 			"spec": map[string]interface{}{
 				"selector": map[string]interface{}{
-					"app": "${deployment.spec.selector.app}",
+					"app": "${deployment.spec.selector.app + schema.spec.appName}",
 				},
 			},
 		}),
@@ -195,7 +195,7 @@ func Test_RuntimeWorkflow(t *testing.T) {
 			{
 				FieldDescriptor: variable.FieldDescriptor{
 					Path:                 "spec.selector.app",
-					Expressions:          []string{"deployment.spec.selector.app"},
+					Expressions:          []string{"deployment.spec.selector.app + schema.spec.appName"},
 					StandaloneExpression: true,
 				},
 				Kind:         variable.ResourceVariableKindDynamic,
@@ -1690,6 +1690,9 @@ func Test_evaluateDynamicVariables(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			rt := &ResourceGroupRuntime{
+				instance: newTestResource(
+					withObject(map[string]interface{}{}),
+				),
 				expressionsCache:  tt.expressionsCache,
 				resolvedResources: tt.resolvedResources,
 			}

test/integration/suites/core/conditional_test.go

@@ -123,7 +123,7 @@ var _ = Describe("Conditions", func() {
 							},
 						},
 						"spec": map[string]interface{}{
-							"serviceAccountName": "${serviceAccountA.metadata.name}",
+							"serviceAccountName": "${serviceAccountA.metadata.name + schema.spec.name}",
 							"containers": []interface{}{
 								map[string]interface{}{
 									"name":  "${schema.spec.name}-deployment",
@@ -302,7 +302,7 @@ var _ = Describe("Conditions", func() {
 
 			// Verify deployment specs
 			g.Expect(deploymentB.Spec.Template.Spec.Containers).To(HaveLen(1))
-			g.Expect(deploymentB.Spec.Template.Spec.ServiceAccountName).To(Equal(name + "-a"))
+			g.Expect(deploymentB.Spec.Template.Spec.ServiceAccountName).To(Equal(name + "-a" + name))
 		}, 20*time.Second, time.Second).Should(Succeed())
 
 		// Verify ServiceA is not created