rebase + fix conflicts

Author: mrinalirao

helper_test.go

@@ -697,7 +697,7 @@ func createPolicySet(t *testing.T, client *Client, org *Organization, policies [
 	}
 }
 
-func createPolicySetWithOptions(t *testing.T, client *Client, org *Organization, policies []*Policy, workspaces []*Workspace, opts PolicySetCreateOptions) (*PolicySet, func()) {
+func createPolicySetWithOptions(t *testing.T, client *Client, org *Organization, policies []*Policy, workspaces, excludedWorkspace []*Workspace, projects []*Project, opts PolicySetCreateOptions) (*PolicySet, func()) {
 	var orgCleanup func()
 
 	if org == nil {
@@ -706,13 +706,15 @@ func createPolicySetWithOptions(t *testing.T, client *Client, org *Organization,
 
 	ctx := context.Background()
 	ps, err := client.PolicySets.Create(ctx, org.Name, PolicySetCreateOptions{
-		Name:              String(randomString(t)),
-		Policies:          policies,
-		Workspaces:        workspaces,
-		Kind:              opts.Kind,
-		Overridable:       opts.Overridable,
-		AgentEnabled:      opts.AgentEnabled,
-		PolicyToolVersion: opts.PolicyToolVersion,
+		Name:                String(randomString(t)),
+		Policies:            policies,
+		Workspaces:          workspaces,
+		WorkspaceExclusions: excludedWorkspace,
+		Projects:            projects,
+		Kind:                opts.Kind,
+		Overridable:         opts.Overridable,
+		AgentEnabled:        opts.AgentEnabled,
+		PolicyToolVersion:   opts.PolicyToolVersion,
 	})
 	if err != nil {
 		t.Fatal(err)

policy_set_integration_test.go

@@ -36,11 +36,11 @@ func TestPolicySetsList(t *testing.T) {
 		Overridable:       Bool(true),
 	}
 
-	psTest1, psTestCleanup1 := createPolicySetWithOptions(t, client, orgTest, nil, []*Workspace{workspace}, []*Workspace{excludedWorkspace}, options)
+	psTest1, psTestCleanup1 := createPolicySetWithOptions(t, client, orgTest, nil, []*Workspace{workspace}, []*Workspace{excludedWorkspace}, nil, options)
 	defer psTestCleanup1()
-	psTest2, psTestCleanup2 := createPolicySetWithOptions(t, client, orgTest, nil, []*Workspace{workspace}, []*Workspace{excludedWorkspace}, options)
+	psTest2, psTestCleanup2 := createPolicySetWithOptions(t, client, orgTest, nil, []*Workspace{workspace}, []*Workspace{excludedWorkspace}, nil, options)
 	defer psTestCleanup2()
-	psTest3, psTestCleanup3 := createPolicySet(t, client, orgTest, nil, []*Workspace{workspace}, nil, OPA)
+	psTest3, psTestCleanup3 := createPolicySet(t, client, orgTest, nil, []*Workspace{workspace}, []*Workspace{excludedWorkspace}, nil, OPA)
 	defer psTestCleanup3()
 
 	t.Run("without list options", func(t *testing.T) {
@@ -105,7 +105,7 @@ func TestPolicySetsList(t *testing.T) {
 			Include: []PolicySetIncludeOpt{PolicySetWorkspaceExclusions},
 		})
 		require.NoError(t, err)
-		assert.Equal(t, 2, len(psl.Items))
+		assert.Equal(t, 3, len(psl.Items))
 
 		assert.NotNil(t, psl.Items[0].WorkspaceExclusions)
 		assert.Equal(t, 1, len(psl.Items[0].WorkspaceExclusions))
@@ -634,9 +634,9 @@ func TestPolicySetsUpdate(t *testing.T) {
 		Overridable:       Bool(true),
 	}
 
-	psTest, psTestCleanup := createPolicySetWithOptions(t, client, orgTest, nil, nil, options)
+	psTest, psTestCleanup := createPolicySetWithOptions(t, client, orgTest, nil, nil, nil, nil, options)
 	defer psTestCleanup()
-	psTest2, psTestCleanup2 := createPolicySet(t, client, orgTest, nil, nil, nil, "opa")
+	psTest2, psTestCleanup2 := createPolicySet(t, client, orgTest, nil, nil, nil, nil, "opa")
 	defer psTestCleanup2()
 
 	t.Run("with valid attributes", func(t *testing.T) {

task_stages_integration_beta_test.go

@@ -200,7 +200,7 @@ func TestTaskStageOverride_Beta(t *testing.T) {
 			Kind:        OPA,
 			Overridable: Bool(true),
 		}
-		createPolicySetWithOptions(t, client, orgTest, []*Policy{pTest}, []*Workspace{wTest}, opts)
+		createPolicySetWithOptions(t, client, orgTest, []*Policy{pTest}, []*Workspace{wTest}, nil, nil, opts)
 		rTest, tTestCleanup := createRunWaitForStatus(t, client, wTest, RunPostPlanAwaitingDecision)
 		defer tTestCleanup()
 
@@ -239,7 +239,7 @@ func TestTaskStageOverride_Beta(t *testing.T) {
 			Kind:        OPA,
 			Overridable: Bool(true),
 		}
-		createPolicySetWithOptions(t, client, orgTest, []*Policy{pTest}, []*Workspace{wTest}, opts)
+		createPolicySetWithOptions(t, client, orgTest, []*Policy{pTest}, []*Workspace{wTest}, nil, nil, opts)
 		rTest, tTestCleanup := createRunWaitForStatus(t, client, wTest, RunPostPlanAwaitingDecision)
 		defer tTestCleanup()
 
@@ -280,7 +280,7 @@ func TestTaskStageOverride_Beta(t *testing.T) {
 			Kind:        OPA,
 			Overridable: Bool(true),
 		}
-		createPolicySetWithOptions(t, client, orgTest, []*Policy{pTest}, []*Workspace{wTest}, opts)
+		createPolicySetWithOptions(t, client, orgTest, []*Policy{pTest}, []*Workspace{wTest}, nil, nil, opts)
 		rTest, tTestCleanup := createPlannedRun(t, client, wTest)
 		defer tTestCleanup()