Use errors.FrameworkDiagnosticsError with the plugin framework external client

Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>

Author: ulucinar

pkg/controller/external_tfpluginfw.go

@@ -19,7 +19,6 @@ import (
 	"github.com/crossplane/crossplane-runtime/v2/pkg/meta"
 	"github.com/crossplane/crossplane-runtime/v2/pkg/reconciler/managed"
 	xpresource "github.com/crossplane/crossplane-runtime/v2/pkg/resource"
-	fwdiag "github.com/hashicorp/terraform-plugin-framework/diag"
 	fwprovider "github.com/hashicorp/terraform-plugin-framework/provider"
 	"github.com/hashicorp/terraform-plugin-framework/providerserver"
 	fwresource "github.com/hashicorp/terraform-plugin-framework/resource"
@@ -36,6 +35,7 @@ import (
 	"github.com/crossplane/upjet/v2/pkg/resource"
 	upjson "github.com/crossplane/upjet/v2/pkg/resource/json"
 	"github.com/crossplane/upjet/v2/pkg/terraform"
+	tferrors "github.com/crossplane/upjet/v2/pkg/terraform/errors"
 )
 
 // TerraformPluginFrameworkConnector is an external client, with credentials and
@@ -249,8 +249,7 @@ func (c *TerraformPluginFrameworkConnector) getResourceSchema(ctx context.Contex
 	schemaResp := &fwresource.SchemaResponse{}
 	res.Schema(ctx, fwresource.SchemaRequest{}, schemaResp)
 	if schemaResp.Diagnostics.HasError() {
-		fwErrors := frameworkDiagnosticsToString(schemaResp.Diagnostics)
-		return rschema.Schema{}, errors.Errorf("could not retrieve resource schema: %s", fwErrors)
+		return rschema.Schema{}, tferrors.FrameworkDiagnosticsError("could not retrieve resource schema", schemaResp.Diagnostics)
 	}
 
 	return schemaResp.Schema, nil
@@ -269,8 +268,7 @@ func (c *TerraformPluginFrameworkConnector) configureProvider(ctx context.Contex
 	var schemaResp fwprovider.SchemaResponse
 	ts.FrameworkProvider.Schema(ctx, fwprovider.SchemaRequest{}, &schemaResp)
 	if schemaResp.Diagnostics.HasError() {
-		fwDiags := frameworkDiagnosticsToString(schemaResp.Diagnostics)
-		return nil, fmt.Errorf("cannot retrieve provider schema: %s", fwDiags)
+		return nil, tferrors.FrameworkDiagnosticsError("cannot retrieve provider schema", schemaResp.Diagnostics)
 	}
 	providerServer := providerserver.NewProtocol6(ts.FrameworkProvider)()
 
@@ -905,18 +903,6 @@ func getFatalDiagnostics(diags []*tfprotov6.Diagnostic) error {
 	return errs
 }
 
-// frameworkDiagnosticsToString constructs an error string from the provided
-// Plugin Framework diagnostics instance. Only Error severity diagnostics are
-// included.
-func frameworkDiagnosticsToString(fwdiags fwdiag.Diagnostics) string {
-	frameworkErrorDiags := fwdiags.Errors()
-	diagErrors := make([]string, 0, len(frameworkErrorDiags))
-	for _, tfdiag := range frameworkErrorDiags {
-		diagErrors = append(diagErrors, fmt.Sprintf("%s: %s", tfdiag.Summary(), tfdiag.Detail()))
-	}
-	return strings.Join(diagErrors, "\n")
-}
-
 // protov6DynamicValueFromMap constructs a protov6 DynamicValue given the
 // map[string]any using the terraform type as reference.
 func protov6DynamicValueFromMap(data map[string]any, terraformType tftypes.Type) (*tfprotov6.DynamicValue, error) {