Tidy diagnostics handling in list_resource_result.go

bbasata · bbasata · commit 3ff5bfa66400 · 2025-06-13T22:55:13.000-04:00
diff --git a/internal/toproto5/list_resource_result.go b/internal/toproto5/list_resource_result.go
@@ -11,41 +11,41 @@ import (
 )
 
 func ListResourceResult(ctx context.Context, result *fwserver.ListResult) tfprotov5.ListResourceResult {
-	diags := result.Diagnostics
-	if diags.HasError() {
+	allDiags := result.Diagnostics
+	if allDiags.HasError() {
 		return tfprotov5.ListResourceResult{
-			Diagnostics: Diagnostics(ctx, diags),
+			Diagnostics: Diagnostics(ctx, allDiags),
 		}
 	}
 
-	resourceIdentity, d := ResourceIdentity(ctx, result.Identity)
-	diags.Append(d...)
+	resourceIdentity, diags := ResourceIdentity(ctx, result.Identity)
+	allDiags.Append(diags...)
 
 	return tfprotov5.ListResourceResult{
 		DisplayName: result.DisplayName,
 		Identity:    resourceIdentity,
-		Diagnostics: Diagnostics(ctx, result.Diagnostics),
+		Diagnostics: Diagnostics(ctx, allDiags),
 	}
 }
 
 func ListResourceResultWithResource(ctx context.Context, result *fwserver.ListResult) tfprotov5.ListResourceResult {
-	diags := result.Diagnostics
-	if diags.HasError() {
+	allDiags := result.Diagnostics
+	if allDiags.HasError() {
 		return tfprotov5.ListResourceResult{
-			Diagnostics: Diagnostics(ctx, diags),
+			Diagnostics: Diagnostics(ctx, allDiags),
 		}
 	}
 
-	resourceIdentity, d := ResourceIdentity(ctx, result.Identity)
-	diags.Append(d...)
+	resourceIdentity, diags := ResourceIdentity(ctx, result.Identity)
+	allDiags.Append(diags...)
 
-	resource, d := Resource(ctx, result.Resource)
-	diags.Append(d...)
+	resource, diags := Resource(ctx, result.Resource)
+	allDiags.Append(diags...)
 
 	return tfprotov5.ListResourceResult{
 		DisplayName: result.DisplayName,
 		Identity:    resourceIdentity,
 		Resource:    resource,
-		Diagnostics: Diagnostics(ctx, result.Diagnostics),
+		Diagnostics: Diagnostics(ctx, allDiags),
 	}
 }
diff --git a/internal/toproto6/list_resource_result.go b/internal/toproto6/list_resource_result.go
@@ -11,41 +11,41 @@ import (
 )
 
 func ListResourceResult(ctx context.Context, result *fwserver.ListResult) tfprotov6.ListResourceResult {
-	diags := result.Diagnostics
-	if diags.HasError() {
+	allDiags := result.Diagnostics
+	if allDiags.HasError() {
 		return tfprotov6.ListResourceResult{
-			Diagnostics: Diagnostics(ctx, diags),
+			Diagnostics: Diagnostics(ctx, allDiags),
 		}
 	}
 
-	resourceIdentity, d := ResourceIdentity(ctx, result.Identity)
-	diags.Append(d...)
+	resourceIdentity, diags := ResourceIdentity(ctx, result.Identity)
+	allDiags.Append(diags...)
 
 	return tfprotov6.ListResourceResult{
 		DisplayName: result.DisplayName,
 		Identity:    resourceIdentity,
-		Diagnostics: Diagnostics(ctx, result.Diagnostics),
+		Diagnostics: Diagnostics(ctx, allDiags),
 	}
 }
 
 func ListResourceResultWithResource(ctx context.Context, result *fwserver.ListResult) tfprotov6.ListResourceResult {
-	diags := result.Diagnostics
-	if diags.HasError() {
+	allDiags := result.Diagnostics
+	if allDiags.HasError() {
 		return tfprotov6.ListResourceResult{
-			Diagnostics: Diagnostics(ctx, diags),
+			Diagnostics: Diagnostics(ctx, allDiags),
 		}
 	}
 
-	resourceIdentity, d := ResourceIdentity(ctx, result.Identity)
-	diags.Append(d...)
+	resourceIdentity, diags := ResourceIdentity(ctx, result.Identity)
+	allDiags.Append(diags...)
 
-	resource, d := Resource(ctx, result.Resource)
-	diags.Append(d...)
+	resource, diags := Resource(ctx, result.Resource)
+	allDiags.Append(diags...)
 
 	return tfprotov6.ListResourceResult{
 		DisplayName: result.DisplayName,
 		Identity:    resourceIdentity,
 		Resource:    resource,
-		Diagnostics: Diagnostics(ctx, result.Diagnostics),
+		Diagnostics: Diagnostics(ctx, allDiags),
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -11,41 +11,41 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func ListResourceResult(ctx context.Context, result *fwserver.ListResult) tfprotov5.ListResourceResult {`
`14`		`- diags := result.Diagnostics`
`15`		`- if diags.HasError() {`
	`14`	`+ allDiags := result.Diagnostics`
	`15`	`+ if allDiags.HasError() {`
`16`	`16`	`return tfprotov5.ListResourceResult{`
`17`		`- Diagnostics: Diagnostics(ctx, diags),`
	`17`	`+ Diagnostics: Diagnostics(ctx, allDiags),`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`		`- resourceIdentity, d := ResourceIdentity(ctx, result.Identity)`
`22`		`- diags.Append(d...)`
	`21`	`+ resourceIdentity, diags := ResourceIdentity(ctx, result.Identity)`
	`22`	`+ allDiags.Append(diags...)`
`23`	`23`
`24`	`24`	`return tfprotov5.ListResourceResult{`
`25`	`25`	`DisplayName: result.DisplayName,`
`26`	`26`	`Identity: resourceIdentity,`
`27`		`- Diagnostics: Diagnostics(ctx, result.Diagnostics),`
	`27`	`+ Diagnostics: Diagnostics(ctx, allDiags),`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func ListResourceResultWithResource(ctx context.Context, result *fwserver.ListResult) tfprotov5.ListResourceResult {`
`32`		`- diags := result.Diagnostics`
`33`		`- if diags.HasError() {`
	`32`	`+ allDiags := result.Diagnostics`
	`33`	`+ if allDiags.HasError() {`
`34`	`34`	`return tfprotov5.ListResourceResult{`
`35`		`- Diagnostics: Diagnostics(ctx, diags),`
	`35`	`+ Diagnostics: Diagnostics(ctx, allDiags),`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- resourceIdentity, d := ResourceIdentity(ctx, result.Identity)`
`40`		`- diags.Append(d...)`
	`39`	`+ resourceIdentity, diags := ResourceIdentity(ctx, result.Identity)`
	`40`	`+ allDiags.Append(diags...)`
`41`	`41`
`42`		`- resource, d := Resource(ctx, result.Resource)`
`43`		`- diags.Append(d...)`
	`42`	`+ resource, diags := Resource(ctx, result.Resource)`
	`43`	`+ allDiags.Append(diags...)`
`44`	`44`
`45`	`45`	`return tfprotov5.ListResourceResult{`
`46`	`46`	`DisplayName: result.DisplayName,`
`47`	`47`	`Identity: resourceIdentity,`
`48`	`48`	`Resource: resource,`
`49`		`- Diagnostics: Diagnostics(ctx, result.Diagnostics),`
	`49`	`+ Diagnostics: Diagnostics(ctx, allDiags),`
`50`	`50`	`}`
`51`	`51`	`}`