fix failing test due to same policy set name

Author: mrinalirao

policy_set_integration_test.go

@@ -24,6 +24,21 @@ func TestPolicySetsList(t *testing.T) {
 
 	upgradeOrganizationSubscription(t, client, orgTest)
 
+	version := createAdminSentinelVersion()
+	opts := AdminSentinelVersionCreateOptions{
+		Version:          version,
+		URL:              "https://www.hashicorp.com",
+		SHA:              genSha(t),
+		Official:         Bool(false),
+		Deprecated:       Bool(true),
+		DeprecatedReason: String("Test Reason"),
+		Enabled:          Bool(false),
+		Beta:             Bool(false),
+	}
+	sv, err := client.Admin.SentinelVersions.Create(ctx, opts)
+	//defer client.Admin.SentinelVersions.Delete(ctx, sv.ID)
+	require.NoError(t, err)
+
 	workspace, workspaceCleanup := createWorkspace(t, client, orgTest)
 	defer workspaceCleanup()
 	excludedWorkspace, excludedWorkspaceCleanup := createWorkspace(t, client, orgTest)
@@ -32,7 +47,7 @@ func TestPolicySetsList(t *testing.T) {
 	options := PolicySetCreateOptions{
 		Kind:              Sentinel,
 		AgentEnabled:      true,
-		PolicyToolVersion: "0.22.1",
+		PolicyToolVersion: sv.Version,
 		Overridable:       Bool(true),
 	}
 
@@ -42,6 +57,10 @@ func TestPolicySetsList(t *testing.T) {
 	defer psTestCleanup2()
 	psTest3, psTestCleanup3 := createPolicySet(t, client, orgTest, nil, []*Workspace{workspace}, []*Workspace{excludedWorkspace}, nil, OPA)
 	defer psTestCleanup3()
+	defer func() {
+		err := client.Admin.SentinelVersions.Delete(ctx, sv.ID)
+		require.NoError(t, err)
+	}()
 
 	t.Run("without list options", func(t *testing.T) {
 		psl, err := client.PolicySets.List(ctx, orgTest.Name, nil)
@@ -51,7 +70,7 @@ func TestPolicySetsList(t *testing.T) {
 		assert.Contains(t, psl.Items, psTest2)
 		assert.Contains(t, psl.Items, psTest3)
 		assert.Equal(t, true, psl.Items[0].AgentEnabled)
-		assert.Equal(t, "0.22.1", psl.Items[0].PolicyToolVersion)
+		assert.Equal(t, sv.Version, psl.Items[0].PolicyToolVersion)
 		assert.Equal(t, 1, psl.CurrentPage)
 		assert.Equal(t, 3, psl.TotalCount)
 	})
@@ -130,11 +149,31 @@ func TestPolicySetsCreate(t *testing.T) {
 
 	upgradeOrganizationSubscription(t, client, orgTest)
 
+	version := createAdminSentinelVersion()
+	opts := AdminSentinelVersionCreateOptions{
+		Version:          version,
+		URL:              "https://www.hashicorp.com",
+		SHA:              genSha(t),
+		Official:         Bool(false),
+		Deprecated:       Bool(true),
+		DeprecatedReason: String("Test Reason"),
+		Enabled:          Bool(false),
+		Beta:             Bool(false),
+	}
+	sv, err := client.Admin.SentinelVersions.Create(ctx, opts)
+	defer func() {
+		err := client.Admin.SentinelVersions.Delete(ctx, sv.ID)
+		require.NoError(t, err)
+	}()
+	//defer client.Admin.SentinelVersions.Delete(ctx, sv.ID)
+	require.NoError(t, err)
+
 	var vcsPolicyID string
 
 	t.Run("with valid attributes", func(t *testing.T) {
 		options := PolicySetCreateOptions{
-			Name: String("policy-set"),
+			Name:              String("policy-set"),
+			PolicyToolVersion: sv.Version,
 		}
 
 		ps, err := client.PolicySets.Create(ctx, orgTest.Name, options)
@@ -162,10 +201,10 @@ func TestPolicySetsCreate(t *testing.T) {
 
 	t.Run("with pinned policy runtime version valid attributes", func(t *testing.T) {
 		options := PolicySetCreateOptions{
-			Name:              String("policy-set"),
+			Name:              String(randomString(t)),
 			Kind:              Sentinel,
 			AgentEnabled:      true,
-			PolicyToolVersion: "0.22.1",
+			PolicyToolVersion: sv.Version,
 		}
 
 		ps, err := client.PolicySets.Create(ctx, orgTest.Name, options)
@@ -175,15 +214,15 @@ func TestPolicySetsCreate(t *testing.T) {
 		assert.Equal(t, ps.Description, "")
 		assert.Equal(t, ps.Kind, Sentinel)
 		assert.Equal(t, ps.AgentEnabled, true)
-		assert.Equal(t, ps.PolicyToolVersion, "0.22.1")
+		assert.Equal(t, ps.PolicyToolVersion, sv.Version)
 		assert.False(t, ps.Global)
 	})
 
 	t.Run("with pinned policy runtime version and missing kind", func(t *testing.T) {
 		options := PolicySetCreateOptions{
 			Name:              String(randomString(t)),
 			AgentEnabled:      true,
-			PolicyToolVersion: "0.22.1",
+			PolicyToolVersion: sv.Version,
 			Overridable:       Bool(true),
 		}
 		ps, err := client.PolicySets.Create(ctx, orgTest.Name, options)
@@ -193,7 +232,7 @@ func TestPolicySetsCreate(t *testing.T) {
 		assert.Equal(t, ps.Description, "")
 		assert.Equal(t, ps.Kind, Sentinel)
 		assert.Equal(t, ps.AgentEnabled, true)
-		assert.Equal(t, ps.PolicyToolVersion, "0.22.1")
+		assert.Equal(t, ps.PolicyToolVersion, sv.Version)
 		assert.False(t, ps.Global)
 	})
 
@@ -627,10 +666,29 @@ func TestPolicySetsUpdate(t *testing.T) {
 
 	upgradeOrganizationSubscription(t, client, orgTest)
 
+	version := createAdminSentinelVersion()
+	opts := AdminSentinelVersionCreateOptions{
+		Version:          version,
+		URL:              "https://www.hashicorp.com",
+		SHA:              genSha(t),
+		Official:         Bool(false),
+		Deprecated:       Bool(true),
+		DeprecatedReason: String("Test Reason"),
+		Enabled:          Bool(false),
+		Beta:             Bool(false),
+	}
+	sv, err := client.Admin.SentinelVersions.Create(ctx, opts)
+	defer func() {
+		err := client.Admin.SentinelVersions.Delete(ctx, sv.ID)
+		require.NoError(t, err)
+	}()
+	//defer client.Admin.SentinelVersions.Delete(ctx, sv.ID)
+	require.NoError(t, err)
+
 	options := PolicySetCreateOptions{
 		Kind:              Sentinel,
 		AgentEnabled:      true,
-		PolicyToolVersion: "0.22.1",
+		PolicyToolVersion: sv.Version,
 		Overridable:       Bool(true),
 	}