default properly

Author: johnstcn

internal/provider/cached_image_resource.go

@@ -338,9 +338,11 @@ func (r *CachedImageResource) Read(ctx context.Context, req resource.ReadRequest
 	if !data.GitPassword.IsNull() {
 		data.Env = appendKnownEnvToList(data.Env, "ENVBUILDER_GIT_PASSWORD", data.GitPassword)
 	}
-	if !data.RemoteRepoBuildMode.IsNull() {
-		// Default to remote build mode.
+	// Default to remote build mode.
+	if data.RemoteRepoBuildMode.IsNull() {
 		data.Env = appendKnownEnvToList(data.Env, "ENVBUILDER_REMOTE_REPO_BUILD_MODE", types.BoolValue(true))
+	} else {
+		data.Env = appendKnownEnvToList(data.Env, "ENVBUILDER_REMOTE_REPO_BUILD_MODE", data.RemoteRepoBuildMode)
 	}
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
@@ -391,9 +393,11 @@ func (r *CachedImageResource) Create(ctx context.Context, req resource.CreateReq
 	if !data.GitPassword.IsNull() {
 		data.Env = appendKnownEnvToList(data.Env, "ENVBUILDER_GIT_PASSWORD", data.GitPassword)
 	}
-	if !data.RemoteRepoBuildMode.IsNull() {
-		// Default to remote build mode.
+	// Default to remote build mode.
+	if data.RemoteRepoBuildMode.IsNull() {
 		data.Env = appendKnownEnvToList(data.Env, "ENVBUILDER_REMOTE_REPO_BUILD_MODE", types.BoolValue(true))
+	} else {
+		data.Env = appendKnownEnvToList(data.Env, "ENVBUILDER_REMOTE_REPO_BUILD_MODE", data.RemoteRepoBuildMode)
 	}
 
 	// Save data into Terraform state
@@ -495,7 +499,7 @@ func (r *CachedImageResource) runCacheProbe(ctx context.Context, data CachedImag
 		GitPassword:          data.GitPassword.ValueString(),
 		GitSSHPrivateKeyPath: data.GitSSHPrivateKeyPath.ValueString(),
 		GitHTTPProxyURL:      data.GitHTTPProxyURL.ValueString(),
-		RemoteRepoBuildMode:  true, // Cache probes are always done based on the remote state.
+		RemoteRepoBuildMode:  data.RemoteRepoBuildMode.ValueBool(),
 		RemoteRepoDir:        filepath.Join(tmpDir, "repo"),
 		SSLCertBase64:        data.SSLCertBase64.ValueString(),
 

internal/provider/cached_image_resource_test.go

@@ -38,7 +38,6 @@ func TestAccCachedImageDataSource(t *testing.T) {
 					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "id", uuid.Nil.String()),
 					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "exists", "false"),
 					resource.TestCheckResourceAttrSet("envbuilder_cached_image.test", "env.0"),
-					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "remote_repo_build_mode", "true"),
 					// Cached image should be set to the builder image.
 					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "image", deps.BuilderImage),
 					// Inputs should still be present.
@@ -60,7 +59,6 @@ func TestAccCachedImageDataSource(t *testing.T) {
 					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "id", uuid.Nil.String()),
 					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "exists", "false"),
 					resource.TestCheckResourceAttrSet("envbuilder_cached_image.test", "env.0"),
-					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "remote_repo_build_mode", "true"),
 					// Cached image should be set to the builder image.
 					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "image", deps.BuilderImage),
 					// Inputs should still be present.
@@ -85,7 +83,6 @@ func TestAccCachedImageDataSource(t *testing.T) {
 					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "cache_repo", deps.CacheRepo),
 					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "extra_env.FOO", "bar"),
 					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "git_url", deps.Repo.URL),
-					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "remote_repo_build_mode", "true"),
 					// Should be empty
 					resource.TestCheckNoResourceAttr("envbuilder_cached_image.test", "git_username"),
 					resource.TestCheckNoResourceAttr("envbuilder_cached_image.test", "git_password"),
@@ -98,7 +95,7 @@ func TestAccCachedImageDataSource(t *testing.T) {
 					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "env.0", "FOO=bar"),
 					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "env.1", fmt.Sprintf("ENVBUILDER_CACHE_REPO=%s", deps.CacheRepo)),
 					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "env.2", fmt.Sprintf("ENVBUILDER_GIT_URL=%s", deps.Repo.URL)),
-					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "env.3", fmt.Sprintf("ENVBUILDER_REMOTE_REPO_BUILD_MODE=%t", deps.RemoteRepoBuildMode)),
+					resource.TestCheckResourceAttr("envbuilder_cached_image.test", "env.3", "ENVBUILDER_REMOTE_REPO_BUILD_MODE=true"),
 					resource.TestCheckNoResourceAttr("envbuilder_cached_image.test", "env.4"),
 				),
 			},

internal/provider/provider_test.go

@@ -35,11 +35,10 @@ var testAccProtoV6ProviderFactories = map[string]func() (tfprotov6.ProviderServe
 
 // testDependencies contain information about stuff the test depends on.
 type testDependencies struct {
-	BuilderImage        string
-	CacheRepo           string
-	ExtraEnv            map[string]string
-	Repo                testGitRepoSSH
-	RemoteRepoBuildMode bool
+	BuilderImage string
+	CacheRepo    string
+	ExtraEnv     map[string]string
+	Repo         testGitRepoSSH
 }
 
 // Config generates a valid Terraform config file from the dependencies.
@@ -57,7 +56,6 @@ resource "envbuilder_cached_image" "test" {
 	}
 	git_url                  = {{ quote .Repo.URL }}
 	git_ssh_private_key_path = {{ quote .Repo.Key }}
-	remote_repo_build_mode   = {{ .RemoteRepoBuildMode }}
 	verbose                  = true
 }`
 
@@ -89,11 +87,10 @@ func setup(ctx context.Context, t testing.TB, files map[string]string) testDepen
 	gitRepo := serveGitRepoSSH(ctx, t, repoDir)
 
 	return testDependencies{
-		BuilderImage:        envbuilderImageRef,
-		CacheRepo:           reg + "/test",
-		ExtraEnv:            make(map[string]string),
-		Repo:                gitRepo,
-		RemoteRepoBuildMode: true,
+		BuilderImage: envbuilderImageRef,
+		CacheRepo:    reg + "/test",
+		ExtraEnv:     make(map[string]string),
+		Repo:         gitRepo,
 	}
 }