use git repo in tests

Author: mafredri

internal/provider/cached_image_data_source_test.go

@@ -35,7 +35,7 @@ func TestAccCachedImageDataSource(t *testing.T) {
 	}
 	cache_repo = %q
 	verbose = true
-}`, deps.BuilderImage, deps.RepoDir, deps.RepoDir, deps.CacheRepo)
+}`, deps.BuilderImage, "/workspace", deps.RepoURL, deps.CacheRepo)
 		resource.Test(t, resource.TestCase{
 			PreCheck:                 func() { testAccPreCheck(t) },
 			ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
@@ -46,7 +46,7 @@ func TestAccCachedImageDataSource(t *testing.T) {
 						// Inputs should still be present.
 						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "cache_repo", deps.CacheRepo),
 						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "extra_env.FOO", "bar"),
-						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "git_url", deps.RepoDir),
+						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "git_url", deps.RepoURL),
 						// Should be empty
 						resource.TestCheckNoResourceAttr("data.envbuilder_cached_image.test", "git_username"),
 						resource.TestCheckNoResourceAttr("data.envbuilder_cached_image.test", "git_password"),
@@ -94,7 +94,7 @@ func TestAccCachedImageDataSource(t *testing.T) {
 	}
 	cache_repo = %q
 	verbose = true
-}`, deps.BuilderImage, deps.RepoDir, deps.RepoDir, deps.CacheRepo)
+}`, deps.BuilderImage, "/workspace", deps.RepoURL, deps.CacheRepo)
 		resource.Test(t, resource.TestCase{
 			PreCheck:                 func() { testAccPreCheck(t) },
 			ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
@@ -105,7 +105,7 @@ func TestAccCachedImageDataSource(t *testing.T) {
 						// Inputs should still be present.
 						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "cache_repo", deps.CacheRepo),
 						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "extra_env.FOO", "bar"),
-						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "git_url", deps.RepoDir),
+						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "git_url", deps.RepoURL),
 						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "exists", "false"),
 						resource.TestCheckResourceAttr("data.envbuilder_cached_image.test", "image", deps.BuilderImage),
 						// Should be empty

internal/provider/provider_test.go

@@ -71,9 +71,11 @@ func testAccPreCheck(t *testing.T) {
 type testDependencies struct {
 	BuilderImage string
 	RepoDir      string
+	RepoURL      string
 	CacheRepo    string
 	GitImage     string
 	SSHDir       string
+	SSHPort      string
 }
 
 func setup(t testing.TB, files map[string]string) testDependencies {
@@ -98,12 +100,17 @@ func setup(t testing.TB, files map[string]string) testDependencies {
 		"authorized_keys": testSSHUserPubKey,
 	}, sshDir)
 
+	// TODO(mafredri): Use a dynamic port?
+	sshPort := "2222"
+
 	return testDependencies{
 		BuilderImage: envbuilderImageRef,
 		CacheRepo:    reg + "/test",
 		RepoDir:      repoDir,
+		RepoURL:      fmt.Sprintf("ssh://git@localhost:%s/srv/git/repo.git", sshPort),
 		GitImage:     gitImageRef,
 		SSHDir:       sshDir,
+		SSHPort:      sshPort,
 	}
 }
 
@@ -120,9 +127,6 @@ func seedCache(ctx context.Context, t testing.TB, deps testDependencies) {
 	ensureImage(ctx, t, cli, deps.GitImage)
 	ensureImage(ctx, t, cli, deps.BuilderImage)
 
-	// TODO(mafredri): Use a dynamic port?
-	sshPort := "2222"
-
 	gitCtr, err := cli.ContainerCreate(ctx, &container.Config{
 		Image: deps.GitImage,
 		Env: []string{
@@ -133,7 +137,7 @@ func seedCache(ctx context.Context, t testing.TB, deps testDependencies) {
 		},
 	}, &container.HostConfig{
 		PortBindings: nat.PortMap{
-			"22/tcp": []nat.PortBinding{{HostIP: "localhost", HostPort: sshPort}},
+			"22/tcp": []nat.PortBinding{{HostIP: "localhost", HostPort: deps.SSHPort}},
 		},
 		Binds: []string{
 			deps.RepoDir + ":/srv/git/repo.git",
@@ -159,7 +163,7 @@ func seedCache(ctx context.Context, t testing.TB, deps testDependencies) {
 			"ENVBUILDER_INIT_SCRIPT=exit",
 			"ENVBUILDER_PUSH_IMAGE=true",
 			"ENVBUILDER_VERBOSE=true",
-			fmt.Sprintf("ENVBUILDER_GIT_URL=ssh://git@localhost:%s/srv/git/repo.git", sshPort),
+			"ENVBUILDER_GIT_URL=" + deps.RepoURL,
 			"ENVBUILDER_GIT_SSH_PRIVATE_KEY_PATH=/tmp/ssh/id_ed25519",
 		},
 		Labels: map[string]string{