test now passes

Author: johnstcn

GNUmakefile

@@ -22,3 +22,29 @@ terraform-provider-envbuilder: internal/provider/*.go main.go
 update-envbuilder-version:
 	go get github.com/coder/envbuilder@main
 	go mod tidy
+
+# Starts a local Docker registry on port 5000 with a local disk cache.
+.PHONY: test-registry
+test-registry: test-registry-container test-images-pull test-images-push
+
+.PHONY: test-registry-container
+test-registry-container: .registry-cache
+	if ! curl -fsSL http://localhost:5000/v2/_catalog > /dev/null 2>&1; then \
+		docker rm -f tfprov-envbuilder-registry && \
+		docker run -d -p 5000:5000 --name envbuilder-registry --volume $(PWD)/.registry-cache:/var/lib/registry registry:2; \
+	fi
+
+# Pulls images referenced in integration tests and pushes them to the local cache.
+.PHONY: test-images-push
+test-images-push: .registry-cache/docker/registry/v2/repositories/test-ubuntu
+
+.PHONY: test-images-pull
+test-images-pull:
+	docker pull ubuntu:latest
+	docker tag ubuntu:latest localhost:5000/test-ubuntu:latest
+
+.registry-cache:
+	mkdir -p .registry-cache && chmod -R ag+w .registry-cache
+
+.registry-cache/docker/registry/v2/repositories/test-ubuntu:
+	docker push localhost:5000/test-ubuntu:latest

internal/provider/cached_image_data_source_test.go

@@ -18,7 +18,7 @@ func TestAccCachedImageDataSource(t *testing.T) {
 	t.Cleanup(cancel)
 	files := map[string]string{
 		"devcontainer.json": `{"build": { "dockerfile": "Dockerfile" }}`,
-		"Dockerfile": `FROM ubuntu:latest
+		"Dockerfile": `FROM localhost:5000/test-ubuntu:latest
 	RUN apt-get update && apt-get install -y cowsay`,
 	}
 	deps := setup(ctx, t, files)
@@ -52,8 +52,10 @@ func TestAccCachedImageDataSource(t *testing.T) {
 					resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "exists", "true"),
 					resource.TestCheckResourceAttrSet("data.envbuilder_cached_image.test", "image"),
 					resource.TestCheckResourceAttrWith("data.envbuilder_cached_image.test", "image", func(value string) error {
+						// value is enclosed in quotes
+						value = strings.Trim(value, `"`)
 						if !strings.HasPrefix(value, deps.CacheRepo) {
-							return fmt.Errorf("expected prefix %q", deps.CacheRepo)
+							return fmt.Errorf("expected image %q to have prefix %q", value, deps.CacheRepo)
 						}
 						return nil
 					}),

internal/provider/provider_test.go

@@ -83,7 +83,10 @@ func setup(ctx context.Context, t testing.TB, files map[string]string) testDepen
 			"ENVBUILDER_DEVCONTAINER_DIR=" + repoDir,
 			"ENVBUILDER_EXIT_ON_BUILD_FAILURE=true",
 			"ENVBUILDER_INIT_SCRIPT=exit",
-			"ENVBUILDER_PUSH_IMAGE=true",
+			// FIXME: Enabling this options causes envbuilder to add its binary to the image under the path
+			// /.envbuilder/bin/envbuilder. This file will have ownership root:root and permissions 0o755.
+			// Because of this, t.Cleanup() will be unable to delete the temp dir, causing the test to fail.
+			// "ENVBUILDER_PUSH_IMAGE=true",
 		},
 		Labels: map[string]string{
 			testContainerLabel: "true",