Merge pull request #237 from Scalr/revert-233-feature/SCALRCORE-24861

Revert "Provider > Add link API between on-prem VCS and Agent-Pool"
Scalr · Apr 20, 2023 · 7aadd4d · 7aadd4d
2 parents fc02a28 + d1a3971
commit 7aadd4d
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 70 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,10 +23,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `data.scalr_environment`: optional `id` and `name` arguments can be used together ([#228](https://github.com/Scalr/terraform-provider-scalr/pull/228))
 - `data.scalr_endpoint`: optional `id` and `name` arguments can be used together ([#228](https://github.com/Scalr/terraform-provider-scalr/pull/228))
 - `data.scalr_service_account`: optional `id` and `email` arguments can be used together ([#228](https://github.com/Scalr/terraform-provider-scalr/pull/228))
-- `scalr_vcs_provider`: added new attribute `agent_pool_id` ([#233](https://github.com/Scalr/terraform-provider-scalr/pull/233))
-- `data.scalr_vcs_provider`: added new attribute `agent_pool_id` ([#233](https://github.com/Scalr/terraform-provider-scalr/pull/233))
-- `scalr_agent_pool`: added new attribute `vcs_enabled` ([#233](https://github.com/Scalr/terraform-provider-scalr/pull/233))
-- `data.scalr_agent_pool`: added new attribute `vcs_enabled` ([#233](https://github.com/Scalr/terraform-provider-scalr/pull/232))
 - `scalr_workspace_run_schedule`: make `apply-schedule` and `destroy-schedule` attributes nullable ([#231](https://github.com/Scalr/terraform-provider-scalr/pull/231))
 
 ### Fixed

diff --git a/docs/data-sources/scalr_agent_pool.md b/docs/data-sources/scalr_agent_pool.md
@@ -27,7 +27,6 @@ data "scalr_agent_pool" "default" {
 * `name` - (Optional) A name of the agent pool.
 * `account_id` - (Optional) An identifier of the Scalr account.
 * `environment_id` - (Optional) An identifier of the Scalr environment.
-* `vcs_enabled` - (Optional) Indicates whether the VCS support is enabled for agents in the pool.
 
 Arguments `id` and `name` are both optional, specify at least one of them to obtain `scalr_agent_pool`.
 

diff --git a/docs/data-sources/scalr_vcs_provider.md b/docs/data-sources/scalr_vcs_provider.md
@@ -28,7 +28,6 @@ The following arguments are supported:
 * `vcs_type` - (Optional) Type of the VCS provider. For example, `github`.
 * `environment_id` - (Optional) ID of the environment the VCS provider has to be linked to, in the format `env-<RANDOM STRING>`.
 * `account_id` - (Optional) ID of the account, in the format `acc-<RANDOM STRING>`.
-* `agent_pool_id` - (Optional) ID of the agent pool, in the format `apool-<RANDOM STRING>`.
 
 ## Attribute Reference
 

diff --git a/docs/resources/scalr_agent_pool.md b/docs/resources/scalr_agent_pool.md
@@ -19,7 +19,6 @@ resource "scalr_agent_pool" "default" {
 * `name` - (Required) Name of the agent pool.
 * `account_id` - (Optional) ID of the account.
 * `environment_id` - (Optional) ID of the environment.
-* `vcs_enabled` - (Optional) Indicates whether the VCS support is enabled for agents in the pool.
 
 ## Attribute Reference
 

diff --git a/docs/resources/scalr_vcs_provider.md b/docs/resources/scalr_vcs_provider.md
@@ -27,7 +27,6 @@ resource "scalr_vcs_provider" "example" {
 * `account_id` - (Optional) ID of the account.
 * `url` - (Optional) This field is required for self-hosted vcs providers.
 * `username` - (Optional) This field is required for `bitbucket_enterprise` provider type.
-* `agent_pool_id` - (Optional) ID of the agent pool to communicate with VCS through.
 
 
 ## Attribute Reference

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ require (
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
 	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734
-	github.com/scalr/go-scalr v0.0.0-20230419170500-fde618c901e4
+	github.com/scalr/go-scalr v0.0.0-20230420172716-77c82c62f17a
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -242,8 +242,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/scalr/go-scalr v0.0.0-20230419170500-fde618c901e4 h1:Nqaw2N8N7djvSBK02g4MFTcIo9fUZaLeJS5kZmshhe4=
-github.com/scalr/go-scalr v0.0.0-20230419170500-fde618c901e4/go.mod h1:p34SHb25YRvbgft7SUjSDYESeoQhWzAlxGXId/BbaSE=
+github.com/scalr/go-scalr v0.0.0-20230420172716-77c82c62f17a h1:wMX9BnoWxMZWAruqk3anbV7IHG3WBwwmyqx+SSAV9Zs=
+github.com/scalr/go-scalr v0.0.0-20230420172716-77c82c62f17a/go.mod h1:p34SHb25YRvbgft7SUjSDYESeoQhWzAlxGXId/BbaSE=
 github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=

diff --git a/scalr/data_source_scalr_agent_pool.go b/scalr/data_source_scalr_agent_pool.go
@@ -28,12 +28,6 @@ func dataSourceScalrAgentPool() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validation.StringIsNotWhiteSpace,
 			},
-			"vcs_enabled": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				Computed: true,
-			},
-
 			"account_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -79,10 +73,6 @@ func dataSourceScalrAgentPoolRead(ctx context.Context, d *schema.ResourceData, m
 		options.Environment = scalr.String(envID)
 	}
 
-	if vcsEnabled, ok := d.GetOkExists("vcs_enabled"); ok { //nolint:staticcheck
-		options.VcsEnabled = scalr.Bool(vcsEnabled.(bool))
-	}
-
 	agentPoolsList, err := scalrClient.AgentPools.List(ctx, options)
 	if err != nil {
 		return diag.Errorf("Error retrieving agent pool: %v", err)
@@ -107,7 +97,6 @@ func dataSourceScalrAgentPoolRead(ctx context.Context, d *schema.ResourceData, m
 		log.Printf("[DEBUG] agent pool %s workspaces: %+v", agentPool.ID, workspaces)
 		_ = d.Set("workspace_ids", workspaces)
 	}
-	_ = d.Set("vcs_enabled", agentPool.VcsEnabled)
 	_ = d.Set("name", agentPool.Name)
 	d.SetId(agentPool.ID)
 

diff --git a/scalr/data_source_scalr_vcs_provider.go b/scalr/data_source_scalr_vcs_provider.go
@@ -44,10 +44,6 @@ func dataSourceScalrVcsProvider() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
-			"agent_pool_id": {
-				Type:     schema.TypeString,
-				Optional: true,
-			},
 			"environments": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -74,10 +70,6 @@ func dataSourceScalrVcsProviderRead(ctx context.Context, d *schema.ResourceData,
 		options.Environment = scalr.String(envId.(string))
 	}
 
-	if agentPoolID, ok := d.GetOk("agent_pool_id"); ok {
-		options.AgentPool = scalr.String(agentPoolID.(string))
-	}
-
 	if vcsType, ok := d.GetOk("vcs_type"); ok {
 		vcsType := scalr.VcsType(vcsType.(string))
 		options.VcsType = &vcsType
@@ -109,9 +101,6 @@ func dataSourceScalrVcsProviderRead(ctx context.Context, d *schema.ResourceData,
 	_ = d.Set("name", vcsProvider.Name)
 	_ = d.Set("url", vcsProvider.Url)
 	_ = d.Set("environments", envIds)
-	if vcsProvider.AgentPool != nil {
-		_ = d.Set("agent_pool_id", vcsProvider.AgentPool.ID)
-	}
 	d.SetId(vcsProvider.ID)
 
 	return nil

diff --git a/scalr/resource_scalr_agent_pool.go b/scalr/resource_scalr_agent_pool.go
@@ -38,11 +38,6 @@ func resourceScalrAgentPool() *schema.Resource {
 				Optional: true,
 				ForceNew: true,
 			},
-			"vcs_enabled": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				Default:  false,
-			},
 		},
 	}
 }
@@ -54,13 +49,11 @@ func resourceScalrAgentPoolCreate(ctx context.Context, d *schema.ResourceData, m
 	// Get required options
 	name := d.Get("name").(string)
 	accountID := d.Get("account_id").(string)
-	vcsEnabled := d.Get("vcs_enabled").(bool)
 
 	// Create a new options struct
 	options := scalr.AgentPoolCreateOptions{
-		Name:       scalr.String(name),
-		Account:    &scalr.Account{ID: accountID},
-		VcsEnabled: scalr.Bool(vcsEnabled),
+		Name:    scalr.String(name),
+		Account: &scalr.Account{ID: accountID},
 	}
 
 	if envID, ok := d.GetOk("environment_id"); ok {
@@ -96,7 +89,6 @@ func resourceScalrAgentPoolRead(ctx context.Context, d *schema.ResourceData, met
 	// Update the config.
 	_ = d.Set("name", agentPool.Name)
 	_ = d.Set("account_id", agentPool.Account.ID)
-	_ = d.Set("vcs_enabled", agentPool.VcsEnabled)
 
 	if agentPool.Environment != nil {
 		_ = d.Set("environment_id", agentPool.Environment.ID)
@@ -111,10 +103,6 @@ func resourceScalrAgentPoolUpdate(ctx context.Context, d *schema.ResourceData, m
 
 	id := d.Id()
 
-	if d.HasChange("vcs_enabled") {
-		return diag.Errorf("Error updating agentPool %s: %v", id, "vcs_enabled attribute is readonly.")
-	}
-
 	if d.HasChange("name") {
 		// Create a new options struct
 		options := scalr.AgentPoolUpdateOptions{

diff --git a/scalr/resource_scalr_vcs_provider.go b/scalr/resource_scalr_vcs_provider.go
@@ -69,10 +69,6 @@ func resourceScalrVcsProvider() *schema.Resource {
 				DefaultFunc: scalrAccountIDDefaultFunc,
 				ForceNew:    true,
 			},
-			"agent_pool_id": {
-				Type:     schema.TypeString,
-				Optional: true,
-			},
 		},
 	}
 }
@@ -101,12 +97,6 @@ func resourceScalrVcsProviderCreate(ctx context.Context, d *schema.ResourceData,
 		options.Username = scalr.String(username.(string))
 	}
 
-	if agentPoolID, ok := d.GetOk("agent_pool_id"); ok {
-		options.AgentPool = &scalr.AgentPool{
-			ID: agentPoolID.(string),
-		}
-	}
-
 	log.Printf("[DEBUG] Create vcs provider: %s", name)
 	provider, err := scalrClient.VcsProviders.Create(ctx, options)
 	if err != nil {
@@ -135,11 +125,6 @@ func resourceScalrVcsProviderRead(ctx context.Context, d *schema.ResourceData, m
 	if provider.Account != nil {
 		_ = d.Set("account_id", provider.Account.ID)
 	}
-	if provider.AgentPool != nil {
-		_ = d.Set("agent_pool_id", provider.AgentPool.ID)
-	} else {
-		_ = d.Set("agent_pool_id", "")
-	}
 
 	return nil
 }
@@ -161,12 +146,6 @@ func resourceScalrVcsProviderUpdate(ctx context.Context, d *schema.ResourceData,
 		options.Username = scalr.String(username.(string))
 	}
 
-	if agentPoolID, ok := d.GetOk("agent_pool_id"); ok {
-		options.AgentPool = &scalr.AgentPool{
-			ID: agentPoolID.(string),
-		}
-	}
-
 	log.Printf("[DEBUG] Update vcs provider: %s", d.Id())
 	_, err := scalrClient.VcsProviders.Update(ctx, d.Id(), options)
 	if err != nil {

diff --git a/scalr/resource_scalr_workspace.go b/scalr/resource_scalr_workspace.go
@@ -479,8 +479,6 @@ func resourceScalrWorkspaceRead(ctx context.Context, d *schema.ResourceData, met
 
 	if workspace.AgentPool != nil {
 		_ = d.Set("agent_pool_id", workspace.AgentPool.ID)
-	} else {
-		_ = d.Set("agent_pool_id", "")
 	}
 
 	var mv string