Add secondary account and fix tests

Snowflake-Labs · Jan 8, 2024 · bd19377 · bd19377
1 parent 9a9ea33
commit bd19377
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 35 deletions.
diff --git a/pkg/sdk/testint/helpers_test.go b/pkg/sdk/testint/helpers_test.go
@@ -91,7 +91,7 @@ func createDatabaseWithOptions(t *testing.T, client *sdk.Client, id sdk.AccountO
 	return database, func() {
 		err := client.Databases.Drop(ctx, id, nil)
 		require.NoError(t, err)
-		err = client.Sessions.UseSchema(ctx, testSchema(t).ID())
+		err = testClient(t).Sessions.UseSchema(ctx, testSchema(t).ID())
 		require.NoError(t, err)
 	}
 }

diff --git a/pkg/sdk/testint/shares_integration_test.go b/pkg/sdk/testint/shares_integration_test.go
@@ -125,10 +125,11 @@ func TestInt_SharesDrop(t *testing.T) {
 
 func TestInt_SharesAlter(t *testing.T) {
 	client := testClient(t)
+	secondaryClient, err := testClientFromProfile(t, secondaryAccountProfile)
+	require.NoError(t, err)
 	ctx := testContext(t)
 
 	t.Run("add and remove accounts", func(t *testing.T) {
-		t.Skipf("Snowflake secondary account is not configured. Must be set in ~./snowflake/config.yml with profile name: %s", secondaryAccountProfile)
 		shareTest, shareCleanup := createShare(t, client)
 		t.Cleanup(shareCleanup)
 		err := client.Grants.GrantPrivilegeToShare(ctx, sdk.ObjectPrivilegeUsage, &sdk.GrantPrivilegeToShareOn{
@@ -141,7 +142,6 @@ func TestInt_SharesAlter(t *testing.T) {
 			}, shareTest.ID())
 		})
 		require.NoError(t, err)
-		secondaryClient := testSecondaryClient(t)
 		accountsToAdd := []sdk.AccountIdentifier{
 			getAccountIdentifier(t, secondaryClient),
 		}
@@ -184,32 +184,32 @@ func TestInt_SharesAlter(t *testing.T) {
 	})
 
 	t.Run("set accounts", func(t *testing.T) {
-		t.Skipf("Snowflake secondary account is not configured. Must be set in ~./snowflake/config.yml with profile name: %s", secondaryAccountProfile)
-		shareTest, shareCleanup := createShare(t, client)
+		db, dbCleanup := createDatabase(t, secondaryClient)
+		t.Cleanup(dbCleanup)
+		shareTest, shareCleanup := createShare(t, secondaryClient)
 		t.Cleanup(shareCleanup)
-		err := client.Grants.GrantPrivilegeToShare(ctx, sdk.ObjectPrivilegeUsage, &sdk.GrantPrivilegeToShareOn{
-			Database: testDb(t).ID(),
+		err := secondaryClient.Grants.GrantPrivilegeToShare(ctx, sdk.ObjectPrivilegeUsage, &sdk.GrantPrivilegeToShareOn{
+			Database: db.ID(),
 		}, shareTest.ID())
 		require.NoError(t, err)
 		t.Cleanup(func() {
-			err = client.Grants.RevokePrivilegeFromShare(ctx, sdk.ObjectPrivilegeUsage, &sdk.RevokePrivilegeFromShareOn{
-				Database: testDb(t).ID(),
+			err = secondaryClient.Grants.RevokePrivilegeFromShare(ctx, sdk.ObjectPrivilegeUsage, &sdk.RevokePrivilegeFromShareOn{
+				Database: db.ID(),
 			}, shareTest.ID())
 		})
 		require.NoError(t, err)
-		secondaryClient := testSecondaryClient(t)
 		accountsToSet := []sdk.AccountIdentifier{
-			getAccountIdentifier(t, secondaryClient),
+			getAccountIdentifier(t, client),
 		}
 		// first add the account.
-		err = client.Shares.Alter(ctx, shareTest.ID(), &sdk.AlterShareOptions{
+		err = secondaryClient.Shares.Alter(ctx, shareTest.ID(), &sdk.AlterShareOptions{
 			IfExists: sdk.Bool(true),
 			Set: &sdk.ShareSet{
 				Accounts: accountsToSet,
 			},
 		})
 		require.NoError(t, err)
-		shares, err := client.Shares.Show(ctx, &sdk.ShowShareOptions{
+		shares, err := secondaryClient.Shares.Show(ctx, &sdk.ShowShareOptions{
 			Like: &sdk.Like{
 				Pattern: sdk.String(shareTest.Name.Name()),
 			},
@@ -346,39 +346,40 @@ func TestInt_ShareDescribeProvider(t *testing.T) {
 			require.NoError(t, err)
 		})
 
-		t.Run("describe share by name", func(t *testing.T) {
-			shareDetails, err := client.Shares.DescribeProvider(ctx, shareTest.ID())
-			require.NoError(t, err)
-			assert.Equal(t, 1, len(shareDetails.SharedObjects))
-			sharedObject := shareDetails.SharedObjects[0]
-			assert.Equal(t, sdk.ObjectTypeDatabase, sharedObject.Kind)
-			assert.Equal(t, testDb(t).ID(), sharedObject.Name)
-		})
+		shareDetails, err := client.Shares.DescribeProvider(ctx, shareTest.ID())
+		require.NoError(t, err)
+
+		assert.Equal(t, 1, len(shareDetails.SharedObjects))
+		sharedObject := shareDetails.SharedObjects[0]
+		assert.Equal(t, sdk.ObjectTypeDatabase, sharedObject.Kind)
+		assert.Equal(t, testDb(t).ID(), sharedObject.Name)
 	})
 }
 
 func TestInt_ShareDescribeConsumer(t *testing.T) {
-	consumerClient := testSecondaryClient(t)
 	ctx := testContext(t)
-	providerClient := testClient(t)
+	providerClient := testSecondaryClient(t)
+	consumerClient := testClient(t)
 
 	t.Run("describe share", func(t *testing.T) {
-		t.Skipf("Snowflake secondary account is not configured. Must be set in ~./snowflake/config.yml with profile name: %s", secondaryAccountProfile)
+		db, dbCleanup := createDatabase(t, providerClient)
+		t.Cleanup(dbCleanup)
+
 		shareTest, shareCleanup := createShare(t, providerClient)
 		t.Cleanup(shareCleanup)
 
 		err := providerClient.Grants.GrantPrivilegeToShare(ctx, sdk.ObjectPrivilegeUsage, &sdk.GrantPrivilegeToShareOn{
-			Database: testDb(t).ID(),
+			Database: db.ID(),
 		}, shareTest.ID())
 		require.NoError(t, err)
 		t.Cleanup(func() {
 			err = providerClient.Grants.RevokePrivilegeFromShare(ctx, sdk.ObjectPrivilegeUsage, &sdk.RevokePrivilegeFromShareOn{
-				Database: testDb(t).ID(),
+				Database: db.ID(),
 			}, shareTest.ID())
 			require.NoError(t, err)
 		})
 
-		// add consumer account to share.
+		// add a consumer account to share.
 		err = providerClient.Shares.Alter(ctx, shareTest.ID(), &sdk.AlterShareOptions{
 			Add: &sdk.ShareAdd{
 				Accounts: []sdk.AccountIdentifier{
@@ -387,13 +388,13 @@ func TestInt_ShareDescribeConsumer(t *testing.T) {
 			},
 		})
 		require.NoError(t, err)
-		t.Run("describe consume share", func(t *testing.T) {
-			shareDetails, err := consumerClient.Shares.DescribeConsumer(ctx, shareTest.ExternalID())
-			require.NoError(t, err)
-			assert.Equal(t, 1, len(shareDetails.SharedObjects))
-			sharedObject := shareDetails.SharedObjects[0]
-			assert.Equal(t, sdk.ObjectTypeDatabase, sharedObject.Kind)
-			assert.Equal(t, sdk.NewAccountObjectIdentifier("<DB>"), sharedObject.Name)
-		})
+
+		shareDetails, err := consumerClient.Shares.DescribeConsumer(ctx, shareTest.ExternalID())
+		require.NoError(t, err)
+
+		assert.Equal(t, 1, len(shareDetails.SharedObjects))
+		sharedObject := shareDetails.SharedObjects[0]
+		assert.Equal(t, sdk.ObjectTypeDatabase, sharedObject.Kind)
+		assert.Equal(t, sdk.NewAccountObjectIdentifier("<DB>"), sharedObject.Name)
 	})
 }