Factorize function

Author: remyleone

internal/meta/extractors.go

@@ -28,15 +28,23 @@ var (
 	_ terraformResourceData = (*schema.ResourceDiff)(nil)
 )
 
+func ExtractRawConfigString(d terraformResourceData, field string) (string, diag.Diagnostics) {
+	rawConfig, diags := d.GetRawConfigAt(cty.GetAttrPath(field))
+	if diags == nil && rawConfig.IsKnown() && !rawConfig.IsNull() {
+		if rawConfig.AsString() != "" {
+			return rawConfig.AsString(), nil
+		}
+	}
+	return "", diags
+}
+
 // ExtractZone will try to guess the zone from the following:
 //   - zone field of the resource data
 //   - default zone from config
 func ExtractZone(d terraformResourceData, m any) (scw.Zone, error) {
-	rawConfig, err := d.GetRawConfigAt(cty.GetAttrPath("zone"))
-	if err == nil && rawConfig.IsKnown() && !rawConfig.IsNull() {
-		if rawConfig.AsString() != "" {
-			return scw.ParseZone(rawConfig.AsString())
-		}
+	rawConfigZone, diags := ExtractRawConfigString(d, "zone")
+	if diags == nil && rawConfigZone != "" {
+		return scw.ParseZone(rawConfigZone)
 	}
 
 	rawZone, exist := d.GetOk("zone")
@@ -56,11 +64,9 @@ func ExtractZone(d terraformResourceData, m any) (scw.Zone, error) {
 //   - region field of the resource data
 //   - default region from config
 func ExtractRegion(d terraformResourceData, m any) (scw.Region, error) {
-	rawConfig, err := d.GetRawConfigAt(cty.GetAttrPath("region"))
-	if err == nil && rawConfig.IsKnown() && !rawConfig.IsNull() {
-		if rawConfig.AsString() != "" {
-			return scw.ParseRegion(rawConfig.AsString())
-		}
+	rawConfigZone, diags := ExtractRawConfigString(d, "region")
+	if diags == nil && rawConfigZone != "" {
+		return scw.ParseRegion(rawConfigZone)
 	}
 
 	rawRegion, exist := d.GetOk("region")
@@ -81,11 +87,9 @@ func ExtractRegion(d terraformResourceData, m any) (scw.Region, error) {
 //   - default region given in argument
 //   - default region from config
 func ExtractRegionWithDefault(d terraformResourceData, m any, defaultRegion scw.Region) (scw.Region, error) {
-	rawConfig, err := d.GetRawConfigAt(cty.GetAttrPath("region"))
-	if err == nil && rawConfig.IsKnown() && !rawConfig.IsNull() {
-		if rawConfig.AsString() != "" {
-			return scw.ParseRegion(rawConfig.AsString())
-		}
+	rawConfigZone, diags := ExtractRawConfigString(d, "region")
+	if diags == nil && rawConfigZone != "" {
+		return scw.ParseRegion(rawConfigZone)
 	}
 
 	rawRegion, exist := d.GetOk("region")

internal/services/ipam/ips_data_source.go

@@ -10,6 +10,7 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 )
@@ -167,11 +168,9 @@ func DataSourceIPAMIPsRead(ctx context.Context, d *schema.ResourceData, m any) d
 		OrganizationID:   types.ExpandStringPtr(d.Get("organization_id")),
 	}
 
-	rawConfig, diagError := d.GetRawConfigAt(cty.GetAttrPath("zonal"))
-	if diagError == nil && rawConfig.IsKnown() && !rawConfig.IsNull() {
-		if rawConfig.AsString() != "" {
-			req.Zonal = types.ExpandStringPtr(rawConfig.AsString())
-		}
+	rawConfigZonal, diags := meta.ExtractRawConfigString(d, "zonal")
+	if diags == nil && rawConfigZonal != "" {
+		req.Zonal = types.ExpandStringPtr(rawConfigZonal)
 	}
 
 	attached, attachedExists := d.GetOk("attached")

internal/services/k8s/pool.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
@@ -15,6 +14,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
@@ -287,18 +287,14 @@ func ResourceK8SPoolCreate(ctx context.Context, d *schema.ResourceData, m any) d
 		PublicIPDisabled: d.Get("public_ip_disabled").(bool),
 	}
 
-	rawConfig, diags := d.GetRawConfigAt(cty.GetAttrPath("region"))
-	if diags == nil && rawConfig.IsKnown() && !rawConfig.IsNull() {
-		if rawConfig.AsString() != "" {
-			req.Region = scw.Region(rawConfig.AsString())
-		}
+	rawConfigRegion, diags := meta.ExtractRawConfigString(d, "region")
+	if diags == nil && rawConfigRegion != "" {
+		req.Region = scw.Region(rawConfigRegion)
 	}
 
-	rawConfig, diags = d.GetRawConfigAt(cty.GetAttrPath("zone"))
-	if diags == nil && rawConfig.IsKnown() && !rawConfig.IsNull() {
-		if rawConfig.AsString() != "" {
-			req.Zone = scw.Zone(rawConfig.AsString())
-		}
+	rawConfigZone, diags := meta.ExtractRawConfigString(d, "zone")
+	if diags == nil && rawConfigZone != "" {
+		req.Region = scw.Region(rawConfigRegion)
 	}
 
 	if placementGroupID, ok := d.GetOk("placement_group_id"); ok {