Changes after review

Snowflake-Labs · Feb 17, 2025 · a896c67 · a896c67
1 parent ab47bd4
commit a896c67
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/pkg/sdk/managed_accounts_impl_gen.go b/pkg/sdk/managed_accounts_impl_gen.go
@@ -77,22 +77,22 @@ func (r managedAccountDBRow) convert() *ManagedAccount {
 		IsReader:          r.IsReader,
 	}
 
-	if r.Name.Valid {
-		managedAccount.Name = r.Name.String
-	} else if r.AccountName.Valid {
+	if r.AccountName.Valid {
 		managedAccount.Name = r.AccountName.String
+	} else if r.Name.Valid {
+		managedAccount.Name = r.Name.String
 	}
 
-	if r.Locator.Valid {
-		managedAccount.Locator = r.Locator.String
-	} else if r.AccountLocator.Valid {
+	if r.AccountLocator.Valid {
 		managedAccount.Locator = r.AccountLocator.String
+	} else if r.Locator.Valid {
+		managedAccount.Locator = r.Locator.String
 	}
 
-	if r.Url.Valid {
-		managedAccount.URL = r.Url.String
-	} else if r.AccountUrl.Valid {
+	if r.AccountUrl.Valid {
 		managedAccount.URL = r.AccountUrl.String
+	} else if r.Url.Valid {
+		managedAccount.URL = r.Url.String
 	}
 
 	if r.Comment.Valid {

diff --git a/pkg/sdk/testint/managed_accounts_gen_integration_test.go b/pkg/sdk/testint/managed_accounts_gen_integration_test.go
@@ -133,4 +133,25 @@ func TestInt_ManagedAccounts(t *testing.T) {
 		assert.Contains(t, returnedManagedAccounts, *managedAccount1)
 		assert.NotContains(t, returnedManagedAccounts, *managedAccount2)
 	})
+
+	// proves https://docs.snowflake.com/en/release-notes/bcr-bundles/2024_08/bcr-1738 is supported (column renames)
+	t.Run("show managed account: before and after BCR 2024_08", func(t *testing.T) {
+		managedAccount := createManagedAccount(t)
+
+		returnedManagedAccounts, err := client.ManagedAccounts.ShowByID(ctx, managedAccount.ID())
+		require.NoError(t, err)
+
+		assert.Equal(t, managedAccount.Name, returnedManagedAccounts.Name)
+		assert.Equal(t, managedAccount.Locator, returnedManagedAccounts.Locator)
+		assert.Equal(t, managedAccount.URL, returnedManagedAccounts.URL)
+
+		testClientHelper().BcrBundles.EnableBcrBundle(t, "2024_08")
+
+		returnedManagedAccounts, err = client.ManagedAccounts.ShowByID(ctx, managedAccount.ID())
+		require.NoError(t, err)
+
+		assert.Equal(t, managedAccount.Name, returnedManagedAccounts.Name)
+		assert.Equal(t, managedAccount.Locator, returnedManagedAccounts.Locator)
+		assert.Equal(t, managedAccount.URL, returnedManagedAccounts.URL)
+	})
 }