fix extra config triggering pf check config errors

pkg/pf/tests/provider_checkconfig_test.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/provider/schema"
+	rschema "github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/hexops/autogold/v2"
@@ -34,9 +35,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/structpb"
 
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder"
 	pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge"
 	tfbridge0 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
 )
 
@@ -802,3 +805,36 @@ func makeProviderServer(
 	require.NoError(t, err)
 	return server
 }
+
+func TestExtraConfigDoesNotCauseCheckFailure(t *testing.T) {
+	t.Parallel()
+
+	provBuilder := providerbuilder.NewProvider(
+		providerbuilder.NewProviderArgs{
+			AllResources: []providerbuilder.Resource{
+				providerbuilder.NewResource(providerbuilder.NewResourceArgs{
+					ResourceSchema: rschema.Schema{
+						Attributes: map[string]rschema.Attribute{
+							"s": rschema.StringAttribute{Optional: true},
+						},
+					},
+				}),
+			},
+			ProviderSchema: schema.Schema{
+				Attributes: map[string]schema.Attribute{
+					"config": schema.StringAttribute{Optional: true},
+				},
+			},
+		})
+
+	prov := bridgedProvider(provBuilder)
+
+	prov.ExtraConfig["extra"] = &info.Config{
+		Schema: shim.Schema{
+			Attributes: map[string]shim.SchemaAttribute{
+				"extra": shim.SchemaAttribute{Optional: true},
+			},
+		},
+	}
+
+}

pkg/pf/tfbridge/provider_checkconfig.go

@@ -17,6 +17,7 @@ package tfbridge
 import (
 	"context"
 	"fmt"
+	"q"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
@@ -162,12 +163,15 @@ func (p *provider) validateProviderConfig(
 		return nil, err
 	}
 
+	q.Q(inputs)
+
 	resp, err := p.tfServer.ValidateProviderConfig(ctx, &tfprotov6.ValidateProviderConfigRequest{
 		Config: config,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("error calling ValidateProviderConfig: %w", err)
 	}
+	q.Q(resp.Diagnostics)
 
 	// Note: according to the docs on resp.PrepareConfig for new providers it typically is equal to config passed in
 	// ValidateProviderConfigRequest so the code here ignores it for now.
@@ -197,6 +201,10 @@ func (p *provider) validateProviderConfig(
 		if k == "version" || k == "pluginDownloadURL" {
 			continue
 		}
+
+		if _, has := p.info.ExtraConfig[string(k)]; has {
+			continue
+		}
 		// TODO[https://github.com/pulumi/pulumi/issues/16757] While #16757 is
 		// outstanding, we need to filter out the keys for parameterized providers
 		// from the top level namespace.