chore: Adjust to 2025_07 BCR part 1 (#4171)

- Adjust handling show output in warehouses.
- Add entries to the BCR migration guide.

## References
https://docs.snowflake.com/en/release-notes/bcr-bundles/2025_07

Author: sfc-gh-jmichalak

MIGRATION_GUIDE.md

@@ -119,6 +119,17 @@ Now, this behavior is fixed. Here's the list of affected resources:
 
 No changes in configuration and state are required.
 
+### *(improvement)* Handling show_output in warehouses
+
+In v2.7.0 ([migration guide](./MIGRATION_GUIDE.md#new-feature-added-support-for-generation-2-standard-warehouses-and-resource-constraints-for-snowpark-optimized-warehouses)),
+we added support for gen2 warehouses. In this change, we added new fields to `show_output`: `generation`, and `resource_constraint`. Before the 2025_07 bundle, the `generation` column was not available in `SHOW WAREHOUSES`. Internally, we dispatched
+`resource_constraint` value based on the warehouse type, and filled the values in the resource state.
+
+The 2025_07 bundle adds the `generation` column (read our [BCR Migration Guide](./SNOWFLAKE_BCR_MIGRATION_GUIDE.md#new-generation-column-in-output-in-show-warehouses)). Now, instead of dispatching the `resource_constraint` value, the provider simply passes the `generation` field from Snowflake to the `show_output`.
+If the bundle is disabled, then the `generation` column is not present in Snowflake, and the providers behaves in the old way.
+
+No changes in the configuration are necessary.
+
 ## v2.9.x ➞ v2.10.0
 
 ### *(improvement)* Features promoted to stable

SNOWFLAKE_BCR_MIGRATION_GUIDE.md

@@ -32,6 +32,21 @@ To use the provider with the bundles containing this change:
 
 Reference: [BCR-1944](https://docs.snowflake.com/release-notes/bcr-bundles/un-bundled/bcr-1944)
 
+## [Bundle 2025_07](https://docs.snowflake.com/en/release-notes/bcr-bundles/2025_07_bundle)
+
+### USAGE privilege on CATALOG INTEGRATION and EXTERNAL VOLUME required for database owner role for all operations
+
+In certain scenarios, new privileges would be required to perform operations on catalog integrations and external volumes. You can manage these in Terraform with [grant_privileges_to_account_role](https://registry.terraform.io/providers/snowflakedb/snowflake/latest/docs/resources/grant_privileges_to_account_role)
+and [grant_privileges_to_database_role](https://registry.terraform.io/providers/snowflakedb/snowflake/latest/docs/resources/grant_privileges_to_database_role).
+
+Reference: [BCR-2114](https://docs.snowflake.com/en/release-notes/bcr-bundles/2025_07/bcr-2114)
+
+### New `generation` column in output in SHOW WAREHOUSES
+
+This bundle adds the `generation` column. The values in `resource_constraint` column remain the same. The provider has been adjusted in [v2.10.1](./MIGRATION_GUIDE.md#improvement-handling-show_output-in-warehouses).
+
+Reference: [BCR-2110](https://docs.snowflake.com/en/release-notes/bcr-bundles/2025_07/bcr-2110)
+
 ## [Bundle 2025_06](https://docs.snowflake.com/en/release-notes/bcr-bundles/2025_06_bundle)
 
 ### Changes in authentication policies

pkg/sdk/testint/warehouses_integration_test.go

@@ -17,6 +17,7 @@ import (
 
 func TestInt_Warehouses(t *testing.T) {
 	client := testClient(t)
+	secondaryClient := testSecondaryClient(t)
 	ctx := testContext(t)
 
 	prefix := random.StringN(6)
@@ -217,6 +218,23 @@ func TestInt_Warehouses(t *testing.T) {
 		assert.Equal(t, sdk.Pointer("v2"), tag2Value)
 	})
 
+	t.Run("create: with generation - BCR 2025_07", func(t *testing.T) {
+		secondaryTestClientHelper().BcrBundles.EnableBcrBundle(t, "2025_07")
+		id := secondaryTestClientHelper().Ids.RandomAccountObjectIdentifier()
+
+		err := secondaryClient.Warehouses.Create(ctx, id, &sdk.CreateWarehouseOptions{
+			Generation: sdk.Pointer(sdk.WarehouseGenerationStandardGen1),
+		})
+		require.NoError(t, err)
+
+		result, err := secondaryClient.Warehouses.ShowByID(ctx, id)
+		require.NoError(t, err)
+		assertThatObject(t, objectassert.WarehouseFromObject(t, result).
+			HasGeneration(sdk.WarehouseGenerationStandardGen1).
+			HasNoResourceConstraint(),
+		)
+	})
+
 	t.Run("create: no options", func(t *testing.T) {
 		id := testClientHelper().Ids.RandomAccountObjectIdentifier()
 		err := client.Warehouses.Create(ctx, id, nil)
@@ -500,7 +518,7 @@ func TestInt_Warehouses(t *testing.T) {
 		assert.Equal(t, sdk.WarehouseResourceConstraintMemory16X, *returnedWarehouse.ResourceConstraint)
 	})
 
-	t.Run("alter: set and unset generation (old resource constraint syntax)", func(t *testing.T) {
+	setAndUnsetGenerationOld := func(t *testing.T, client *sdk.Client, testClientHelper func() *helpers.TestClient) {
 		id := testClientHelper().Ids.RandomAccountObjectIdentifier()
 		// new warehouse created on purpose
 		warehouse, warehouseCleanup := testClientHelper().Warehouse.CreateWarehouseWithOptions(t, id, &sdk.CreateWarehouseOptions{})
@@ -537,9 +555,18 @@ func TestInt_Warehouses(t *testing.T) {
 		require.NoError(t, err)
 		assert.NotNil(t, returnedWarehouse.Generation)
 		assert.Equal(t, sdk.WarehouseGenerationStandardGen1, *returnedWarehouse.Generation)
+	}
+
+	t.Run("alter: set and unset generation (old resource constraint syntax)", func(t *testing.T) {
+		setAndUnsetGenerationOld(t, client, testClientHelper)
 	})
 
-	t.Run("alter: set and unset generation (new generation syntax)", func(t *testing.T) {
+	t.Run("alter: set and unset generation (old resource constraint syntax) - BCR 2025_07", func(t *testing.T) {
+		secondaryTestClientHelper().BcrBundles.EnableBcrBundle(t, "2025_07")
+		setAndUnsetGenerationOld(t, secondaryClient, secondaryTestClientHelper)
+	})
+
+	setAndUnsetGeneration := func(t *testing.T, client *sdk.Client, testClientHelper func() *helpers.TestClient) {
 		id := testClientHelper().Ids.RandomAccountObjectIdentifier()
 		// new warehouse created on purpose
 		warehouse, warehouseCleanup := testClientHelper().Warehouse.CreateWarehouseWithOptions(t, id, &sdk.CreateWarehouseOptions{})
@@ -576,6 +603,15 @@ func TestInt_Warehouses(t *testing.T) {
 		require.NoError(t, err)
 		assert.NotNil(t, returnedWarehouse.Generation)
 		assert.Equal(t, sdk.WarehouseGenerationStandardGen1, *returnedWarehouse.Generation)
+	}
+
+	t.Run("alter: set and unset generation (new generation syntax)", func(t *testing.T) {
+		setAndUnsetGeneration(t, client, testClientHelper)
+	})
+
+	t.Run("alter: set and unset generation (new generation syntax) - BCR 2025_07", func(t *testing.T) {
+		testClientHelper().BcrBundles.EnableBcrBundle(t, "2025_07")
+		setAndUnsetGeneration(t, secondaryClient, secondaryTestClientHelper)
 	})
 
 	t.Run("alter: set and unset generation (both at the same time)", func(t *testing.T) {

pkg/sdk/warehouses.go

@@ -643,6 +643,7 @@ type warehouseDBRow struct {
 	ScalingPolicy                   string         `db:"scaling_policy"`
 	OwnerRoleType                   sql.NullString `db:"owner_role_type"`
 	ResourceConstraint              sql.NullString `db:"resource_constraint"`
+	Generation                      sql.NullString `db:"generation"`
 }
 
 func (row warehouseDBRow) convert() (*Warehouse, error) {
@@ -709,23 +710,29 @@ func (row warehouseDBRow) convert() (*Warehouse, error) {
 	if row.ResourceMonitor != "null" {
 		wh.ResourceMonitor = NewAccountObjectIdentifierFromFullyQualifiedName(row.ResourceMonitor)
 	}
+	if row.Generation.Valid {
+		generation, err := ToWarehouseGeneration(row.Generation.String)
+		if err != nil {
+			return nil, err
+		}
+		wh.Generation = &generation
+	}
 	if row.ResourceConstraint.Valid {
+		resourceConstraint, err := ToWarehouseResourceConstraint(row.ResourceConstraint.String)
+		if err != nil {
+			return nil, err
+		}
 		switch wh.Type {
 		case WarehouseTypeStandard:
-			resourceConstraint, err := ToWarehouseResourceConstraint(row.ResourceConstraint.String)
-			if err != nil {
-				return nil, err
-			}
-			generation, err := resourceConstraint.ToWarehouseGeneration()
-			if err != nil {
-				return nil, err
+			// Before BCR 2025_07, the generation column was not present, so we converted the resource constraint to generation.
+			if wh.Generation == nil {
+				generation, err := resourceConstraint.ToWarehouseGeneration()
+				if err != nil {
+					return nil, err
+				}
+				wh.Generation = &generation
 			}
-			wh.Generation = &generation
 		case WarehouseTypeSnowparkOptimized:
-			resourceConstraint, err := ToWarehouseResourceConstraint(row.ResourceConstraint.String)
-			if err != nil {
-				return nil, err
-			}
 			wh.ResourceConstraint = &resourceConstraint
 		default:
 			return nil, fmt.Errorf("invalid warehouse type: %s", wh.Type)

pkg/testacc/1_setup_provider_test.go

@@ -18,6 +18,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
+type ProviderFactory = map[string]func() (tfprotov6.ProviderServer, error)
+
 var (
 	// TODO [SNOW-2661409]: check all the places using TestAccProvider directly
 	TestAccProvider                 *schema.Provider