Check batching attributes in framework defaults (#7642) (#14235)

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/7642.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+provider: fixed an issue where the provider crashed when "batching" was set in `4.60.0`/`4.60.1`
+```

google/framework_config.go

@@ -249,7 +249,7 @@ func (p *frameworkProvider) HandleDefaults(ctx context.Context, data *ProviderMo
 			pbConfigs[0].EnableBatching = types.BoolValue(true)
 		}
 
-		data.Batching, d = types.ListValueFrom(ctx, types.ObjectType{}, pbConfigs)
+		data.Batching, d = types.ListValueFrom(ctx, types.ObjectType{}.WithAttributeTypes(ProviderBatchingAttributes), pbConfigs)
 	}
 
 	if data.UserProjectOverride.IsNull() && os.Getenv("USER_PROJECT_OVERRIDE") != "" {

google/provider_model.go

@@ -1,6 +1,7 @@
 package google
 
 import (
+	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
@@ -141,6 +142,11 @@ type ProviderBatching struct {
 	EnableBatching types.Bool   `tfsdk:"enable_batching"`
 }
 
+var ProviderBatchingAttributes = map[string]attr.Type{
+	"send_after":      types.StringType,
+	"enable_batching": types.BoolType,
+}
+
 // ProviderMetaModel describes the provider meta model
 type ProviderMetaModel struct {
 	ModuleName types.String `tfsdk:"module_name"`