chore: fix bugs (#711)

Signed-off-by: Patrik Cyvoct <[email protected]>

Author: Sh4d1

scaleway/resource_baremetal_server.go

@@ -138,7 +138,7 @@ func resourceScalewayBaremetalServerCreate(d *schema.ResourceData, m interface{}
 	server, err := baremetalAPI.CreateServer(&baremetal.CreateServerRequest{
 		Zone:           zone,
 		Name:           expandOrGenerateString(d.Get("name"), "bm"),
-		OrganizationID: scw.StringPtr(d.Get("organization_id").(string)),
+		OrganizationID: expandStringPtr(d.Get("organization_id").(string)),
 		Description:    d.Get("description").(string),
 		OfferID:        offerID.ID,
 		Tags:           expandStrings(d.Get("tags")),

scaleway/resource_k8s_cluster_beta.go

@@ -357,7 +357,7 @@ func resourceScalewayK8SClusterBetaCreate(d *schema.ResourceData, m interface{})
 
 	req := &k8s.CreateClusterRequest{
 		Region:           region,
-		OrganizationID:   scw.StringPtr(d.Get("organization_id").(string)),
+		OrganizationID:   expandStringPtr(d.Get("organization_id").(string)),
 		Name:             expandOrGenerateString(d.Get("name"), "cluster"),
 		Description:      description.(string),
 		Cni:              k8s.CNI(d.Get("cni").(string)),

scaleway/resource_lb_beta.go

@@ -67,7 +67,7 @@ func resourceScalewayLbBetaCreate(d *schema.ResourceData, m interface{}) error {
 	createReq := &lb.CreateLBRequest{
 		Region:         region,
 		IPID:           scw.StringPtr(expandID(d.Get("ip_id").(string))),
-		OrganizationID: scw.StringPtr(d.Get("organization_id").(string)),
+		OrganizationID: expandStringPtr(d.Get("organization_id").(string)),
 		Name:           expandOrGenerateString(d.Get("name"), "lb"),
 		Type:           d.Get("type").(string),
 	}

scaleway/resource_lb_beta_test.go

@@ -25,14 +25,14 @@ func testSweepLB(region string) error {
 	lbAPI := lb.NewAPI(scwClient)
 
 	l.Debugf("sweeper: destroying the lbs in (%s)", region)
-	listLBs, err := lbAPI.ListLbs(&lb.ListLbsRequest{}, scw.WithAllPages())
+	listLBs, err := lbAPI.ListLBs(&lb.ListLBsRequest{}, scw.WithAllPages())
 	if err != nil {
 		return fmt.Errorf("error listing lbs in (%s) in sweeper: %s", region, err)
 	}
 
-	for _, l := range listLBs.Lbs {
-		err := lbAPI.DeleteLb(&lb.DeleteLbRequest{
-			LbID:      l.ID,
+	for _, l := range listLBs.LBs {
+		err := lbAPI.DeleteLB(&lb.DeleteLBRequest{
+			LBID:      l.ID,
 			ReleaseIP: true,
 		})
 		if err != nil {
@@ -94,8 +94,8 @@ func testAccCheckScalewayLbBetaExists(n string) resource.TestCheckFunc {
 			return err
 		}
 
-		_, err = lbAPI.GetLb(&lb.GetLbRequest{
-			LbID:   ID,
+		_, err = lbAPI.GetLB(&lb.GetLBRequest{
+			LBID:   ID,
 			Region: region,
 		})
 
@@ -118,9 +118,9 @@ func testAccCheckScalewayLbBetaDestroy(s *terraform.State) error {
 			return err
 		}
 
-		_, err = lbAPI.GetLb(&lb.GetLbRequest{
+		_, err = lbAPI.GetLB(&lb.GetLBRequest{
 			Region: region,
-			LbID:   ID,
+			LBID:   ID,
 		})
 
 		// If no error resource still exist

scaleway/resource_lb_ip_beta.go

@@ -3,7 +3,6 @@ package scaleway
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	lb "github.com/scaleway/scaleway-sdk-go/api/lb/v1"
-	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
 func resourceScalewayLbIPBeta() *schema.Resource {
@@ -48,7 +47,7 @@ func resourceScalewayLbIPBetaCreate(d *schema.ResourceData, m interface{}) error
 
 	createReq := &lb.CreateIPRequest{
 		Region:         region,
-		OrganizationID: scw.StringPtr(d.Get("organization_id").(string)),
+		OrganizationID: expandStringPtr(d.Get("organization_id").(string)),
 		Reverse:        expandStringPtr(d.Get("reverse")),
 	}
 

scaleway/resource_lb_ip_beta_test.go

@@ -31,7 +31,7 @@ func testSweepLBIP(region string) error {
 	}
 
 	for _, ip := range listIPs.IPs {
-		if ip.LbID == nil {
+		if ip.LBID == nil {
 			err := lbAPI.ReleaseIP(&lb.ReleaseIPRequest{
 				IPID: ip.ID,
 			})

scaleway/resource_rdb_instance_beta.go

@@ -126,7 +126,7 @@ func resourceScalewayRdbInstanceBetaCreate(d *schema.ResourceData, m interface{}
 
 	createReq := &rdb.CreateInstanceRequest{
 		Region:         region,
-		OrganizationID: scw.StringPtr(d.Get("organization_id").(string)),
+		OrganizationID: expandStringPtr(d.Get("organization_id").(string)),
 		Name:           expandOrGenerateString(d.Get("name"), "rdb"),
 		NodeType:       d.Get("node_type").(string),
 		Engine:         d.Get("engine").(string),

scaleway/resource_registry_namespace_beta.go

@@ -52,7 +52,7 @@ func resourceScalewayRegistryNamespaceBetaCreate(d *schema.ResourceData, m inter
 
 	ns, err := api.CreateNamespace(&registry.CreateNamespaceRequest{
 		Region:         region,
-		OrganizationID: scw.StringPtr(d.Get("organization_id").(string)),
+		OrganizationID: expandStringPtr(d.Get("organization_id").(string)),
 		Name:           d.Get("name").(string),
 		Description:    d.Get("description").(string),
 		IsPublic:       d.Get("is_public").(bool),