Fix FeatureContexts keys

Aaron Lehmann · Aaron Lehmann · commit 2953d4d6657a · 2024-06-17T13:12:06.000-07:00
This needs to be updated to correspond to the changes in coder#205.
diff --git a/devcontainer/devcontainer.go b/devcontainer/devcontainer.go
@@ -295,7 +295,7 @@ func (s *Spec) compileFeatures(fs billy.Filesystem, devcontainerDir, scratchDir
 		}
 		featureDirectives = append(featureDirectives, directive)
 		if useBuildContexts {
-			featureContexts[featureName] = featureDir
+			featureContexts[featureRef] = featureDir
 			lines = append(lines, fromDirective)
 		}
 	}
diff --git a/devcontainer/devcontainer_test.go b/devcontainer/devcontainer_test.go
@@ -87,16 +87,35 @@ func TestCompileWithFeatures(t *testing.T) {
 	dc, err := devcontainer.Parse([]byte(raw))
 	require.NoError(t, err)
 	fs := memfs.New()
-	params, err := dc.Compile(fs, "", magicDir, "", "", false, os.LookupEnv)
-	require.NoError(t, err)
 
-	// We have to SHA because we get a different MD5 every time!
 	featureOneMD5 := md5.Sum([]byte(featureOne))
 	featureOneDir := fmt.Sprintf("/.envbuilder/features/one-%x", featureOneMD5[:4])
 	featureTwoMD5 := md5.Sum([]byte(featureTwo))
 	featureTwoDir := fmt.Sprintf("/.envbuilder/features/two-%x", featureTwoMD5[:4])
 
-	require.Equal(t, `FROM localhost:5000/envbuilder-test-codercom-code-server:latest
+	t.Run("WithoutBuildContexts", func(t *testing.T) {
+		params, err := dc.Compile(fs, "", magicDir, "", "", false, os.LookupEnv)
+		require.NoError(t, err)
+
+		require.Equal(t, `FROM localhost:5000/envbuilder-test-codercom-code-server:latest
+
+USER root
+# Rust tomato - Example description!
+WORKDIR `+featureOneDir+`
+ENV TOMATO=example
+RUN _CONTAINER_USER="1000" _REMOTE_USER="1000" ./install.sh
+# Go potato - Example description!
+WORKDIR `+featureTwoDir+`
+ENV POTATO=example
+RUN VERSION="potato" _CONTAINER_USER="1000" _REMOTE_USER="1000" ./install.sh
+USER 1000`, params.DockerfileContent)
+	})
+
+	t.Run("WithBuildContexts", func(t *testing.T) {
+		params, err := dc.Compile(fs, "", magicDir, "", "", false, os.LookupEnv)
+		require.NoError(t, err)
+
+		require.Equal(t, `FROM localhost:5000/envbuilder-test-codercom-code-server:latest
 
 USER root
 # Rust tomato - Example description!
@@ -108,6 +127,12 @@ WORKDIR `+featureTwoDir+`
 ENV POTATO=example
 RUN VERSION="potato" _CONTAINER_USER="1000" _REMOTE_USER="1000" ./install.sh
 USER 1000`, params.DockerfileContent)
+
+		require.Equal(t, map[string]string{
+			"coder/one": featureOneDir,
+			"coder/two": featureTwoDir,
+		}, params.FeatureContexts)
+	})
 }
 
 func TestCompileDevContainer(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ func (s *Spec) compileFeatures(fs billy.Filesystem, devcontainerDir, scratchDir`
`295`	`295`	`}`
`296`	`296`	`featureDirectives = append(featureDirectives, directive)`
`297`	`297`	`if useBuildContexts {`
`298`		`- featureContexts[featureName] = featureDir`
	`298`	`+ featureContexts[featureRef] = featureDir`
`299`	`299`	`lines = append(lines, fromDirective)`
`300`	`300`	`}`
`301`	`301`	`}`