Merge branch 'main' into TF-11775-terraform-provider-tfe-gh-issue-118…

…9-provider-error-when-re-creating-tfe-registry-gpg-key-and-using-provider-default-organization
hashicorp · Dec 22, 2023 · e0e60dd · e0e60dd
2 parents 39c3fba + bbae4b8
commit e0e60dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 BUG FIXES:
 * `r/tfe_admin_organization_settings`: Fixed default provider organization usage, by @brandonc [1183](https://github.com/hashicorp/terraform-provider-tfe/pull/1183)
 * `r/tfe_registry_gpg_key`: Fixed update plans when using default organization, by @brandonc [1190](https://github.com/hashicorp/terraform-provider-tfe/pull/1190)
+* `/r/tfe_workspace_settings`: Fix compatibility with older versions of Terraform Enterprise when using agent execution by @brandonc [1193](https://github.com/hashicorp/terraform-provider-tfe/pull/1193)
 
 # v0.51.0
 

diff --git a/internal/provider/resource_tfe_workspace_settings.go b/internal/provider/resource_tfe_workspace_settings.go
@@ -166,9 +166,11 @@ func (m unknownIfExecutionModeUnset) PlanModifyString(ctx context.Context, req p
 		if configured.ExecutionMode.IsNull() && overwritesState[0].ExecutionMode.ValueBool() {
 			resp.PlanValue = types.StringUnknown()
 		}
-	} else if req.Path.Equal(path.Root("execution_mode")) {
+	} else if configured.ExecutionMode.IsNull() && req.Path.Equal(path.Root("execution_mode")) {
 		// TFE does not support overwrites so default the execution mode to "remote"
 		resp.PlanValue = types.StringValue("remote")
+	} else if configured.AgentPoolID.IsNull() && req.Path.Equal(path.Root("agent_pool_id")) {
+		resp.PlanValue = types.StringNull()
 	}
 }
 

diff --git a/website/docs/d/github_installation.html.markdown b/website/docs/d/github_installation.html.markdown
@@ -15,29 +15,29 @@ Use this data source to get information about the Github App Installation.
 
 ```hcl
 data "tfe_github_app_installation" "gha_installation" {
-  installation_id = 12345
+  installation_id = 12345678
 }
 ```
 
 ### Finding a Github App Installation by its name
 
 ```hcl
 data "tfe_github_app_installation" "gha_installation" {
-  name = "installation_name"
+  name = "github_username_or_organization"
 }
 ```
 
 ## Argument Reference
 
-The following arguments are supported. At least one of `name`, `installation_id` must be set. 
+The following arguments are supported. At least one of `name`, `installation_id` must be set.
+
+* `installation_id` - (Optional) ID of the Github Installation. The installation ID can be found in the URL slug when visiting the installation's configuration page, e.g `https://github.com/settings/installations/12345678`.
+* `name` - (Optional) Name of the Github user or organization account that installed the app.
 
-* `installation_id` - (Optional) ID of the Github Installation as shown in Github.
-* `name` - (Optional) Name of the Github Installation as shown in Github.
-
 Must be one of: `installation_id` or `name`.
 
 ## Attributes Reference
 
 In addition to all arguments above, the following attributes are exported:
 
-* `id` - The internal ID of the Github Installation. This is different from the `installation_id`.
+* `id` - The internal ID of the Github Installation. This is different from the `installation_id`.