deref

Author: Zyther

internal/fleet/agent_policy/models.go

@@ -2,7 +2,6 @@ package agent_policy
 
 import (
 	"context"
-	"reflect"
 	"slices"
 
 	"github.com/elastic/terraform-provider-elasticstack/generated/kbapi"
@@ -32,18 +31,6 @@ func newGlobalDataTagModel(data struct {
 	}
 }
 
-func hasKey(s interface{}, key string) bool {
-	val := reflect.ValueOf(s)
-	if val.Kind() == reflect.Ptr {
-		val = val.Elem()
-	}
-	if val.Kind() != reflect.Struct {
-		return false
-	}
-	field := val.FieldByName(key)
-	return field.IsValid()
-}
-
 type agentPolicyModel struct {
 	ID                 types.String `tfsdk:"id"`
 	PolicyID           types.String `tfsdk:"policy_id"`
@@ -91,20 +78,17 @@ func (model *agentPolicyModel) populateFromAPI(ctx context.Context, data *kbapi.
 	model.MonitoringOutputId = types.StringPointerValue(data.MonitoringOutputId)
 	model.Name = types.StringValue(data.Name)
 	model.Namespace = types.StringValue(data.Namespace)
-	if serverVersion.GreaterThanOrEqual(MinVersionGlobalDataTags) && hasKey(data, "GlobalDataTags") {
-		var diag diag.Diagnostics
+	if serverVersion.GreaterThanOrEqual(MinVersionGlobalDataTags) && utils.Deref(data.GlobalDataTags) != nil {
+
 		gdt := []globalDataTagModel{}
-		for _, val := range *data.GlobalDataTags {
+		for _, val := range utils.Deref(data.GlobalDataTags) {
 			gdt = append(gdt, newGlobalDataTagModel(val))
 		}
 		gdtList, diags := types.ListValueFrom(ctx, getGlobalDataTagsType(), gdt)
 		if diags.HasError() {
 			return
 		}
 		model.GlobalDataTags = gdtList
-		if diag.HasError() {
-			return
-		}
 	}
 }