Fix additional_cacheable_ports empty case

cloudflare · Oct 17, 2023 · 5005765 · 5005765
1 parent a0e96dc
commit 5005765
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 27 deletions.
diff --git a/internal/framework/flatteners/int64set.go b/internal/framework/flatteners/int64set.go
diff --git a/internal/framework/flatteners/set.go b/internal/framework/flatteners/set.go
@@ -17,3 +17,15 @@ func StringSet(in []attr.Value) basetypes.SetValue {
 	}
 	return types.SetValueMust(types.StringType, in)
 }
+
+// Int64Set accepts a `[]attr.Value` and returns a `basetypes.SetValue`. The
+// return type automatically handles `SetNull` for empty results and coercing
+// all element values to a string if there are any elements.
+//
+// nolint: contextcheck
+func Int64Set(in []attr.Value) basetypes.SetValue {
+	if len(in) == 0 {
+		return types.SetNull(types.Int64Type)
+	}
+	return types.SetValueMust(types.Int64Type, in)
+}
diff --git a/internal/framework/service/rulesets/resource.go b/internal/framework/service/rulesets/resource.go
@@ -359,14 +359,6 @@ func toRulesetResourceModel(ctx context.Context, zoneID, accountID basetypes.Str
 				Version:                 flatteners.String(cloudflare.String(ruleResponse.ActionParameters.Version)),
 			})
 
-			if !reflect.ValueOf(ruleResponse.ActionParameters.AdditionalCacheablePorts).IsNil() {
-				var ports []attr.Value
-				for _, s := range ruleResponse.ActionParameters.AdditionalCacheablePorts {
-					ports = append(ports, types.Int64Value((int64(s))))
-				}
-				rule.ActionParameters[0].AdditionalCacheablePorts = flatteners.Int64Set(ports)
-			}
-
 			if !reflect.ValueOf(ruleResponse.ActionParameters.Polish).IsNil() {
 				rule.ActionParameters[0].Polish = flatteners.String(ruleResponse.ActionParameters.Polish.String())
 			}
@@ -379,6 +371,12 @@ func toRulesetResourceModel(ctx context.Context, zoneID, accountID basetypes.Str
 				rule.ActionParameters[0].SSL = flatteners.String(ruleResponse.ActionParameters.SSL.String())
 			}
 
+			var ports []attr.Value
+			for _, s := range ruleResponse.ActionParameters.AdditionalCacheablePorts {
+				ports = append(ports, types.Int64Value((int64(s))))
+			}
+			rule.ActionParameters[0].AdditionalCacheablePorts = flatteners.Int64Set(ports)
+
 			var phases []attr.Value
 			for _, s := range ruleResponse.ActionParameters.Phases {
 				phases = append(phases, types.StringValue(s))