Merge pull request #1282 from hashicorp/gs/refactor-run-task-resources

Migrate tfe_organization_run_task to plugin model
hashicorp · Mar 21, 2024 · b89d0da · b89d0da
2 parents 61586dd + 7a086ca
commit b89d0da
Show file tree

Hide file tree

Showing 8 changed files with 296 additions and 156 deletions.
diff --git a/internal/provider/data_source_organization_run_task_test.go b/internal/provider/data_source_organization_run_task_test.go
@@ -26,8 +26,8 @@ func TestAccTFEOrganizationRunTaskDataSource_basic(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheck(t) },
-		Providers: testAccProviders,
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV5ProviderFactories: testAccMuxedProviders,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccTFEOrganizationRunTaskDataSourceConfig(org.Name, rInt, runTasksURL(), runTasksHMACKey()),

diff --git a/internal/provider/data_source_workspace_run_task_test.go b/internal/provider/data_source_workspace_run_task_test.go
@@ -26,8 +26,8 @@ func TestAccTFEWorkspaceRunTaskDataSource_basic(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheck(t) },
-		Providers: testAccProviders,
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV5ProviderFactories: testAccMuxedProviders,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccTFEWorkspaceRunTaskDataSourceConfig(org.Name, rInt, runTasksURL()),

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -120,7 +120,6 @@ func Provider() *schema.Provider {
 			"tfe_organization_default_settings":  resourceTFEOrganizationDefaultSettings(),
 			"tfe_organization_membership":        resourceTFEOrganizationMembership(),
 			"tfe_organization_module_sharing":    resourceTFEOrganizationModuleSharing(),
-			"tfe_organization_run_task":          resourceTFEOrganizationRunTask(),
 			"tfe_organization_token":             resourceTFEOrganizationToken(),
 			"tfe_policy":                         resourceTFEPolicy(),
 			"tfe_policy_set":                     resourceTFEPolicySet(),

diff --git a/internal/provider/provider_next.go b/internal/provider/provider_next.go
@@ -139,5 +139,6 @@ func (p *frameworkProvider) Resources(ctx context.Context) []func() resource.Res
 		NewResourceVariable,
 		NewSAMLSettingsResource,
 		NewResourceWorkspaceSettings,
+		NewOrganizationRunTaskResource,
 	}
 }