remove unnecessary chowns, collapse to single test

This commit is contained in:
Cian Johnston 2024-09-25 10:24:57 +01:00
commit a18082cdec

View file

@ -164,50 +164,14 @@ RUN date > /date.txt`,
{
// This tests correct handling of the difference in permissions between
// the provider and the image when running a COPY instruction.
// Added to verify fix for coder/terraform-provider-envbuilder#43
name: "copy_perms",
files: map[string]string{
"Dockerfile": `
FROM localhost:5000/test-ubuntu:latest
COPY date.txt /date.txt
RUN chown 1000:1000 /date.txt`,
"date.txt": fmt.Sprintf("%d", time.Now().Unix()),
},
extraEnv: map[string]string{
"CODER_AGENT_TOKEN": "some-token",
"CODER_AGENT_URL": "https://coder.example.com",
"FOO": testEnvValue,
"ENVBUILDER_GIT_URL": "https://not.the.real.git/url",
"ENVBUILDER_CACHE_REPO": "not-the-real-cache-repo",
"ENVBUILDER_DOCKERFILE_PATH": "Dockerfile",
},
assertEnv: func(t *testing.T, deps testDependencies) resource.TestCheckFunc {
return resource.ComposeAggregateTestCheckFunc(
assertEnv(t,
"CODER_AGENT_TOKEN", "some-token",
"CODER_AGENT_URL", "https://coder.example.com",
"ENVBUILDER_CACHE_REPO", deps.CacheRepo,
"ENVBUILDER_DOCKERFILE_PATH", "Dockerfile",
"ENVBUILDER_DOCKER_CONFIG_BASE64", deps.DockerConfigBase64,
"ENVBUILDER_GIT_SSH_PRIVATE_KEY_PATH", deps.Repo.Key,
"ENVBUILDER_GIT_URL", deps.Repo.URL,
"ENVBUILDER_REMOTE_REPO_BUILD_MODE", "true",
"ENVBUILDER_VERBOSE", "true",
"FOO", "bar\nbaz",
),
)
},
},
{
// Same as above, except for multi-stage build.
name: "copy_perms_multistage",
files: map[string]string{
"Dockerfile": `
FROM localhost:5000/test-ubuntu:latest AS a
COPY date.txt /date.txt
RUN chown 1000:1000 /date.txt
FROM localhost:5000/test-ubuntu:latest
COPY --from=a /date.txt /date.txt
RUN chown 1001:1001 /date.txt`,
COPY --from=a /date.txt /date.txt`,
"date.txt": fmt.Sprintf("%d", time.Now().Unix()),
},
extraEnv: map[string]string{