Fixed env expansion in proto instance mapping (#787)

cirruslabs · Sep 11, 2024 · 5d2397e · 5d2397e
1 parent a025250
commit 5d2397e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/pkg/parser/instance/proto.go b/pkg/parser/instance/proto.go
@@ -64,10 +64,7 @@ func NewProtoParser(
 				case field.IsMap():
 					fieldInstance := instance.proto.NewField(field)
 
-					mappingRetriever := func(env map[string]string) (map[string]string, error) {
-						return node.GetStringMapping()
-					}
-
+					mappingRetriever := node.GetStringMappingWithExpansion
 					if field.Name() == "docker_arguments" {
 						mappingRetriever = node.GetMapOrListOfMapsWithExpansion
 					}

diff --git a/pkg/parser/node/accessor.go b/pkg/parser/node/accessor.go
@@ -110,6 +110,19 @@ func (node *Node) GetSliceOfExpandedStrings(env map[string]string) ([]string, er
 	return result, nil
 }
 
+func (node *Node) GetStringMappingWithExpansion(env map[string]string) (map[string]string, error) {
+	result, err := node.GetStringMapping()
+	if err != nil {
+		return nil, err
+	}
+
+	for key, value := range result {
+		result[key] = expander.ExpandEnvironmentVariables(value, env)
+	}
+
+	return result, nil
+}
+
 func (node *Node) GetStringMapping() (map[string]string, error) {
 	result := make(map[string]string)
 

diff --git a/pkg/parser/testdata/proto-instance-volumes.json b/pkg/parser/testdata/proto-instance-volumes.json
@@ -7,6 +7,9 @@
         "name": "clone"
       }
     ],
+    "environment": {
+      "NAME": "test-name"
+    },
     "instance": {
       "@type": "type.googleapis.com/org.cirruslabs.ci.services.cirruscigrpc.PersistentWorkerInstance",
       "isolation": {
@@ -22,6 +25,9 @@
             }
           ]
         }
+      },
+      "labels": {
+        "name": "test-name"
       }
     },
     "metadata": {
@@ -44,7 +50,8 @@
       }
     ],
     "environment": {
-      "CIRRUS_OS": "linux"
+      "CIRRUS_OS": "linux",
+      "NAME": "test-name"
     },
     "instance": {
       "@type": "type.googleapis.com/org.cirruslabs.ci.services.cirruscigrpc.PersistentWorkerInstance",
@@ -61,6 +68,9 @@
             }
           ]
         }
+      },
+      "labels": {
+        "name": "test-name"
       }
     },
     "localGroupId": "1",

diff --git a/pkg/parser/testdata/proto-instance-volumes.yml b/pkg/parser/testdata/proto-instance-volumes.yml
@@ -1,4 +1,9 @@
+env:
+  NAME: test-name
+
 aliases: &worker_body
+  labels:
+    name: $NAME
   isolation:
     container:
       image: alpine:latest