Update name_from_id function to use errors & use new logging approach

Author: SarahFrench

mmv1/third_party/terraform/functions/name_from_id.go

@@ -10,13 +10,17 @@ import (
 var _ function.Function = NameFromIdFunction{}
 
 func NewNameFromIdFunction() function.Function {
-	return &NameFromIdFunction{}
+	return &NameFromIdFunction{
+		name: "name_from_id",
+	}
 }
 
-type NameFromIdFunction struct{}
+type NameFromIdFunction struct {
+	name string
+}
 
 func (f NameFromIdFunction) Metadata(ctx context.Context, req function.MetadataRequest, resp *function.MetadataResponse) {
-	resp.Name = "name_from_id"
+	resp.Name = f.name
 }
 
 func (f NameFromIdFunction) Definition(ctx context.Context, req function.DefinitionRequest, resp *function.DefinitionResponse) {
@@ -36,9 +40,8 @@ func (f NameFromIdFunction) Definition(ctx context.Context, req function.Definit
 func (f NameFromIdFunction) Run(ctx context.Context, req function.RunRequest, resp *function.RunResponse) {
 	// Load arguments from function call
 	var arg0 string
-	resp.Diagnostics.Append(req.Arguments.GetArgument(ctx, 0, &arg0)...)
-
-	if resp.Diagnostics.HasError() {
+	resp.Error = function.ConcatFuncErrors(req.Arguments.GetArgument(ctx, 0, &arg0))
+	if resp.Error != nil {
 		return
 	}
 
@@ -48,12 +51,12 @@ func (f NameFromIdFunction) Run(ctx context.Context, req function.RunRequest, re
 	pattern := "resourceType/{name}$"                        // Human-readable pseudo-regex pattern used in errors and warnings
 
 	// Validate input
-	ValidateElementFromIdArguments(arg0, regex, pattern, resp)
-	if resp.Diagnostics.HasError() {
+	resp.Error = function.ConcatFuncErrors(ValidateElementFromIdArguments(ctx, arg0, regex, pattern, f.name))
+	if resp.Error != nil {
 		return
 	}
 
 	// Get and return element from input string
 	name := GetElementFromId(arg0, regex, template)
-	resp.Diagnostics.Append(resp.Result.Set(ctx, name)...)
+	resp.Error = function.ConcatFuncErrors(resp.Result.Set(ctx, name))
 }

mmv1/third_party/terraform/functions/name_from_id_internal_test.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
-	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/function"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
@@ -60,13 +59,7 @@ func TestFunctionRun_name_from_id(t *testing.T) {
 			},
 			expected: function.RunResponse{
 				Result: function.NewResultData(types.StringNull()),
-				Diagnostics: diag.Diagnostics{
-					diag.NewArgumentErrorDiagnostic(
-						0,
-						noMatchesErrorSummary,
-						fmt.Sprintf("The input string \"%s\" doesn't contain the expected pattern \"resourceType/{name}$\".", invalidInput),
-					),
-				},
+				Error:  function.NewArgumentFuncError(0, fmt.Sprintf("The input string \"%s\" doesn't contain the expected pattern \"resourceType/{name}$\".", invalidInput)),
 			},
 		},
 	}
@@ -89,8 +82,8 @@ func TestFunctionRun_name_from_id(t *testing.T) {
 			if diff := cmp.Diff(got.Result, tc.expected.Result); diff != "" {
 				t.Errorf("unexpected diff between expected and received result: %s", diff)
 			}
-			if diff := cmp.Diff(got.Diagnostics, tc.expected.Diagnostics); diff != "" {
-				t.Errorf("unexpected diff between expected and received diagnostics: %s", diff)
+			if diff := cmp.Diff(got.Error, tc.expected.Error); diff != "" {
+				t.Errorf("unexpected diff between expected and received errors: %s", diff)
 			}
 		})
 	}