Merge branch 'develop' into feature/SCALRCORE-22677

Scalr · Sep 27, 2022 · c12c22e · c12c22e
2 parents 92a79d3 + cda9bd9
commit c12c22e
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `scalr_policy_group` data source: remove environments include from policy groups ([172](https://github.com/Scalr/terraform-provider-scalr/pull/172))
 
+### Removed
+
+- `scalr_policy_group` data source: remove `workspaces` attribute ([173](https://github.com/Scalr/terraform-provider-scalr/pull/173))
+- `scalr_policy_group` resource: remove `workspaces` attribute ([173](https://github.com/Scalr/terraform-provider-scalr/pull/173))
+
 ## [1.0.0-rc36] - 2022-08-19
 
 ### Added

diff --git a/docs/data-sources/scalr_policy_group.md b/docs/data-sources/scalr_policy_group.md
@@ -29,7 +29,6 @@ All arguments plus:
 * `vcs_repo` - Contains VCS-related meta-data for the policy group.
 * `policies` - A list of the OPA policies the policy group verifies each run.
 * `environments` - A list of the environments the policy group is linked to.
-* `workspaces` - A list of the workspaces this policy group verifies runs for.
 
 The `vcs_repo` object contains:
 

diff --git a/docs/resources/scalr_policy_group.md b/docs/resources/scalr_policy_group.md
@@ -41,7 +41,6 @@ All arguments plus:
 * `error_message` - A detailed error if Scalr failed to process the policy group.
 * `policies` - A list of the OPA policies the group verifies each run.
 * `environments` - A list of the environments the policy group is linked to.
-* `workspaces` - A list of the workspaces this policy group verifies runs for.
 
 The `policies` list contains definitions of OPA policies in the following form:
 

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 v1.17.2
 	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734
-	github.com/scalr/go-scalr v0.0.0-20220915080750-9d8c91c03eef
+	github.com/scalr/go-scalr v0.0.0-20220927111002-2eda5e412437
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -300,8 +300,8 @@ github.com/posener/complete v1.2.1 h1:LrvDIY//XNo65Lq84G/akBuMGlawHvGBABv8f/ZN6D
 github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DKN0g6uH7E=
 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-20220915080750-9d8c91c03eef h1:cX1dwt588OmNeU28PB1qmmOaOm98298A9G9mO2n2m1o=
-github.com/scalr/go-scalr v0.0.0-20220915080750-9d8c91c03eef/go.mod h1:xMnwfer9UxugeNITZjTpQBwQ/4bw6/JdyDLpGdmyorE=
+github.com/scalr/go-scalr v0.0.0-20220927111002-2eda5e412437 h1:+h7p28b9d9bJJdtD+9k6uPA6oosCTiaXqkYTrDhhNYA=
+github.com/scalr/go-scalr v0.0.0-20220927111002-2eda5e412437/go.mod h1:xMnwfer9UxugeNITZjTpQBwQ/4bw6/JdyDLpGdmyorE=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 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_policy_group.go b/scalr/data_source_scalr_policy_group.go
@@ -86,11 +86,6 @@ func dataSourceScalrPolicyGroup() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
-			"workspaces": {
-				Type:     schema.TypeList,
-				Computed: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
-			},
 		},
 	}
 }
@@ -105,7 +100,7 @@ func dataSourceScalrPolicyGroupRead(d *schema.ResourceData, meta interface{}) er
 	options := scalr.PolicyGroupListOptions{
 		Account: accountID,
 		Name:    name,
-		Include: "policies,workspaces",
+		Include: "policies",
 	}
 	log.Printf("[DEBUG] Read configuration of policy group: %s/%s", accountID, name)
 
@@ -160,14 +155,6 @@ func dataSourceScalrPolicyGroupRead(d *schema.ResourceData, meta interface{}) er
 	}
 	d.Set("environments", envs)
 
-	var wss []string
-	if len(pg.Workspaces) != 0 {
-		for _, ws := range pg.Workspaces {
-			wss = append(wss, ws.ID)
-		}
-	}
-	d.Set("workspaces", wss)
-
 	d.SetId(pg.ID)
 
 	return nil

diff --git a/scalr/data_source_scalr_policy_group_test.go b/scalr/data_source_scalr_policy_group_test.go
@@ -68,7 +68,6 @@ func TestAccPolicyGroupDataSource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.scalr_policy_group.test", "vcs_repo.0.branch"),
 					resource.TestCheckResourceAttrSet("data.scalr_policy_group.test", "policies.#"),
 					resource.TestCheckResourceAttrSet("data.scalr_policy_group.test", "environments.#"),
-					resource.TestCheckResourceAttrSet("data.scalr_policy_group.test", "workspaces.#"),
 				),
 			},
 			{

diff --git a/scalr/resource_scalr_policy_group.go b/scalr/resource_scalr_policy_group.go
@@ -94,11 +94,6 @@ func resourceScalrPolicyGroup() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
-			"workspaces": {
-				Type:     schema.TypeList,
-				Computed: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
-			},
 		},
 	}
 }
@@ -191,14 +186,6 @@ func resourceScalrPolicyGroupRead(d *schema.ResourceData, meta interface{}) erro
 	}
 	d.Set("environments", envs)
 
-	var wss []string
-	if len(pg.Workspaces) != 0 {
-		for _, ws := range pg.Workspaces {
-			wss = append(wss, ws.ID)
-		}
-	}
-	d.Set("workspaces", wss)
-
 	return nil
 }
 

diff --git a/scalr/resource_scalr_policy_group_test.go b/scalr/resource_scalr_policy_group_test.go
@@ -63,7 +63,6 @@ func TestAccPolicyGroup_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "vcs_repo.0.branch"),
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "policies.#"),
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "environments.#"),
-					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "workspaces.#"),
 				),
 			},
 		},
@@ -117,7 +116,6 @@ func TestAccPolicyGroup_update(t *testing.T) {
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "vcs_repo.0.branch"),
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "policies.#"),
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "environments.#"),
-					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "workspaces.#"),
 				),
 			},
 			{
@@ -155,7 +153,6 @@ func TestAccPolicyGroup_update(t *testing.T) {
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "vcs_repo.0.branch"),
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "policies.#"),
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "environments.#"),
-					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "workspaces.#"),
 				),
 			},
 		},
@@ -210,7 +207,6 @@ func TestAccPolicyGroup_renamed(t *testing.T) {
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "vcs_repo.0.branch"),
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "policies.#"),
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "environments.#"),
-					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "workspaces.#"),
 				),
 			},
 			{
@@ -249,7 +245,6 @@ func TestAccPolicyGroup_renamed(t *testing.T) {
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "vcs_repo.0.branch"),
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "policies.#"),
 					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "environments.#"),
-					resource.TestCheckResourceAttrSet("scalr_policy_group.test", "workspaces.#"),
 				),
 			},
 		},