Skip to content

Commit 7ef294b

Browse files
kindermoumoutekindermoumoute
authored
chore: remove beta reference and renaming nits (#751)
1 parent 88ef99e commit 7ef294b

13 files changed

+41
-42
lines changed

‎scaleway/data_source_marketplace_image.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
func dataSourceScalewayMarketplaceImage() *schema.Resource {
1313
return &schema.Resource{
14-
ReadContext: dataSourceScalewayMarketplaceImageReadBeta,
14+
ReadContext: dataSourceScalewayMarketplaceImageRead,
1515
Schema: map[string]*schema.Schema{
1616
"label": {
1717
Type: schema.TypeString,
@@ -29,7 +29,7 @@ func dataSourceScalewayMarketplaceImage() *schema.Resource {
2929
}
3030
}
3131

32-
func dataSourceScalewayMarketplaceImageReadBeta(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
32+
func dataSourceScalewayMarketplaceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
3333
marketplaceAPI, zone, err := marketplaceAPIWithZone(d, m)
3434
if err != nil {
3535
return diag.FromErr(err)

‎scaleway/data_source_rdb_instance_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,32 @@ func TestAccScalewayDataSourceRDBInstance_Basic(t *testing.T) {
1616
Steps: []resource.TestStep{
1717
{
1818
Config: `
19-
resource "scaleway_rdb_instance_beta" "test" {
19+
resource "scaleway_rdb_instance" "test" {
2020
name = "test-terraform"
2121
engine = "PostgreSQL-11"
2222
node_type = "db-dev-s"
2323
}`,
2424
},
2525
{
2626
Config: `
27-
resource "scaleway_rdb_instance_beta" "test" {
27+
resource "scaleway_rdb_instance" "test" {
2828
name = "test-terraform"
2929
engine = "PostgreSQL-11"
3030
node_type = "db-dev-s"
3131
}
3232
3333
data "scaleway_rdb_instance" "test" {
34-
name = scaleway_rdb_instance_beta.test.name
34+
name = scaleway_rdb_instance.test.name
3535
}
3636
3737
data "scaleway_rdb_instance" "test2" {
38-
instance_id = scaleway_rdb_instance_beta.test.id
38+
instance_id = scaleway_rdb_instance.test.id
3939
}
4040
`,
4141
Check: resource.ComposeTestCheckFunc(
42-
testAccCheckScalewayRdbExists(tt, "scaleway_rdb_instance_beta.test"),
42+
testAccCheckScalewayRdbExists(tt, "scaleway_rdb_instance.test"),
4343

44-
resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.test", "name", "test-terraform"),
44+
resource.TestCheckResourceAttr("scaleway_rdb_instance.test", "name", "test-terraform"),
4545
resource.TestCheckResourceAttrSet("data.scaleway_rdb_instance.test", "id"),
4646

4747
resource.TestCheckResourceAttr("data.scaleway_rdb_instance.test2", "name", "test-terraform"),

‎scaleway/data_source_registry_image_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccScalewayDataSourceRegistryImage_Basic(t *testing.T) {
1818
resource.ParallelTest(t, resource.TestCase{
1919
PreCheck: func() { testAccPreCheck(t) },
2020
ProviderFactories: tt.ProviderFactories,
21-
CheckDestroy: testAccCheckScalewayRegistryNamespaceBetaDestroy(tt),
21+
CheckDestroy: testAccCheckScalewayRegistryNamespaceDestroy(tt),
2222
Steps: []resource.TestStep{
2323
{
2424
Config: `

‎scaleway/data_source_registry_namespace_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func TestAccScalewayDataSourceRegistryNamespace_Basic(t *testing.T) {
1313
resource.ParallelTest(t, resource.TestCase{
1414
PreCheck: func() { testAccPreCheck(t) },
1515
ProviderFactories: tt.ProviderFactories,
16-
CheckDestroy: testAccCheckScalewayRegistryNamespaceBetaDestroy(tt),
16+
CheckDestroy: testAccCheckScalewayRegistryNamespaceDestroy(tt),
1717
Steps: []resource.TestStep{
1818
{
1919
Config: `

‎scaleway/resource_instance_server.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -236,25 +236,24 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc
236236

237237
commercialType := d.Get("type").(string)
238238

239-
image := expandZonedID(d.Get("image"))
240-
if !scwvalidation.IsUUID(image.ID) {
241-
instanceAPI := marketplace.NewAPI(m.(*Meta).scwClient)
242-
imageUUID, err := instanceAPI.GetLocalImageIDByLabel(&marketplace.GetLocalImageIDByLabelRequest{
239+
imageUUID := expandZonedID(d.Get("image")).ID
240+
if !scwvalidation.IsUUID(imageUUID) {
241+
marketPlaceAPI := marketplace.NewAPI(m.(*Meta).scwClient)
242+
imageUUID, err = marketPlaceAPI.GetLocalImageIDByLabel(&marketplace.GetLocalImageIDByLabelRequest{
243243
CommercialType: commercialType,
244244
Zone: zone,
245-
ImageLabel: image.ID,
245+
ImageLabel: imageUUID,
246246
})
247247
if err != nil {
248-
return diag.FromErr(fmt.Errorf("could not get image '%s': %s", image, err))
248+
return diag.FromErr(fmt.Errorf("could not get image '%s': %s", newZonedID(zone, imageUUID), err))
249249
}
250-
image = newZonedID(zone, imageUUID)
251250
}
252251

253252
req := &instance.CreateServerRequest{
254253
Zone: zone,
255254
Name: expandOrGenerateString(d.Get("name"), "srv"),
256255
Project: expandStringPtr(d.Get("project_id")),
257-
Image: image.ID,
256+
Image: imageUUID,
258257
CommercialType: commercialType,
259258
EnableIPv6: d.Get("enable_ipv6").(bool),
260259
SecurityGroup: expandStringPtr(expandZonedID(d.Get("security_group_id")).ID),
@@ -355,7 +354,7 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc
355354
}
356355

357356
if len(userDataRequests.UserData) > 0 {
358-
err := instanceAPI.SetAllServerUserData(userDataRequests)
357+
err = instanceAPI.SetAllServerUserData(userDataRequests)
359358
if err != nil {
360359
return diag.FromErr(err)
361360
}

‎scaleway/resource_k8s_cluster_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ func testAccCheckScalewayK8SClusterConfigMinimal(version string) string {
433433
resource "scaleway_k8s_cluster" "minimal" {
434434
cni = "calico"
435435
version = "%s"
436-
name = "ClusterBetaConfigMinimal"
436+
name = "ClusterConfigMinimal"
437437
tags = [ "terraform-test", "scaleway_k8s_cluster", "minimal" ]
438438
}`, version)
439439
}

‎scaleway/resource_k8s_pool_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func TestAccScalewayK8SCluster_PoolBasic(t *testing.T) {
5656
Config: testAccCheckScalewayK8SPoolConfigMinimal(latestK8SVersion, false),
5757
Check: resource.ComposeTestCheckFunc(
5858
testAccCheckScalewayK8SClusterExists(tt, "scaleway_k8s_cluster.minimal"),
59-
testAccCheckScalewayK8SPoolBetaDestroy(tt, "scaleway_k8s_pool.minimal"),
59+
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.minimal"),
6060
),
6161
},
6262
},
@@ -130,7 +130,7 @@ func TestAccScalewayK8SCluster_PoolWait(t *testing.T) {
130130
Config: testAccCheckScalewayK8SPoolConfigWait(latestK8SVersion, false, 0),
131131
Check: resource.ComposeTestCheckFunc(
132132
testAccCheckScalewayK8SClusterExists(tt, "scaleway_k8s_cluster.minimal"),
133-
testAccCheckScalewayK8SPoolBetaDestroy(tt, "scaleway_k8s_pool.minimal"),
133+
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.minimal"),
134134
),
135135
},
136136
},
@@ -160,7 +160,7 @@ func TestAccScalewayK8SCluster_PoolPlacementGroup(t *testing.T) {
160160
})
161161
}
162162

163-
func testAccCheckScalewayK8SPoolBetaDestroy(tt *TestTools, n string) resource.TestCheckFunc {
163+
func testAccCheckScalewayK8SPoolDestroy(tt *TestTools, n string) resource.TestCheckFunc {
164164
return func(s *terraform.State) error {
165165
rs, ok := s.RootModule().Resources[n]
166166
if !ok {
@@ -239,7 +239,7 @@ resource "scaleway_k8s_pool" "default" {
239239
tags = [ "terraform-test", "scaleway_k8s_cluster", "default" ]
240240
}
241241
resource "scaleway_k8s_cluster" "minimal" {
242-
name = "K8SPoolBetaConfigMinimal"
242+
name = "K8SPoolConfigMinimal"
243243
cni = "calico"
244244
version = "%s"
245245
tags = [ "terraform-test", "scaleway_k8s_cluster", "minimal" ]
@@ -275,7 +275,7 @@ resource "scaleway_k8s_pool" "default" {
275275
}
276276
277277
resource "scaleway_k8s_cluster" "minimal" {
278-
name = "PoolBetaConfigWait"
278+
name = "PoolConfigWait"
279279
cni = "calico"
280280
version = "%s"
281281
tags = [ "terraform-test", "scaleway_k8s_cluster", "minimal" ]

‎scaleway/resource_lb.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ func resourceScalewayLb() *schema.Resource {
3838
Description: "The type of load-balancer you want to create",
3939
},
4040
"tags": {
41-
Type: schema.TypeList,
41+
Type: schema.TypeList,
42+
Optional: true,
4243
Elem: &schema.Schema{
4344
Type: schema.TypeString,
4445
},
45-
Optional: true,
4646
Description: "Array of tags to associate with the load-balancer",
4747
},
4848
"ip_id": {
4949
Type: schema.TypeString,
5050
Required: true,
51-
Description: "The load-balance public IP ID",
5251
ForceNew: true,
52+
Description: "The load-balance public IP ID",
5353
DiffSuppressFunc: diffSuppressFuncLocality,
5454
},
5555
"ip_address": {

‎scaleway/resource_lb_backend_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func TestAccScalewayLbBackend_Basic(t *testing.T) {
1515
resource.ParallelTest(t, resource.TestCase{
1616
PreCheck: func() { testAccPreCheck(t) },
1717
ProviderFactories: tt.ProviderFactories,
18-
CheckDestroy: testAccCheckScalewayLbBackendBetaDestroy(tt),
18+
CheckDestroy: testAccCheckScalewayLbBackendDestroy(tt),
1919
Steps: []resource.TestStep{
2020
{
2121
Config: `
@@ -98,13 +98,13 @@ func TestAccScalewayLbBackend_Basic(t *testing.T) {
9898
})
9999
}
100100

101-
func TestAccScalewayLbBackendBeta_HealthCheck(t *testing.T) {
101+
func TestAccScalewayLbBackend_HealthCheck(t *testing.T) {
102102
tt := NewTestTools(t)
103103
defer tt.Cleanup()
104104
resource.ParallelTest(t, resource.TestCase{
105105
PreCheck: func() { testAccPreCheck(t) },
106106
ProviderFactories: tt.ProviderFactories,
107-
CheckDestroy: testAccCheckScalewayLbBackendBetaDestroy(tt),
107+
CheckDestroy: testAccCheckScalewayLbBackendDestroy(tt),
108108
Steps: []resource.TestStep{
109109
{
110110
Config: `
@@ -212,7 +212,7 @@ func testAccCheckScalewayLbBackendExists(tt *TestTools, n string) resource.TestC
212212
}
213213
}
214214

215-
func testAccCheckScalewayLbBackendBetaDestroy(tt *TestTools) resource.TestCheckFunc {
215+
func testAccCheckScalewayLbBackendDestroy(tt *TestTools) resource.TestCheckFunc {
216216
return func(state *terraform.State) error {
217217
for _, rs := range state.RootModule().Resources {
218218
if rs.Type != "scaleway_lb_backend" {

‎scaleway/resource_lb_frontend.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func resourceScalewayLbFrontendCreate(ctx context.Context, d *schema.ResourceDat
174174

175175
d.SetId(newRegionalIDString(region, res.ID))
176176

177-
diagnostics := resourceScalewayLbFrontendBetaUpdateACL(ctx, d, lbAPI, region, res.ID)
177+
diagnostics := resourceScalewayLbFrontendUpdateACL(ctx, d, lbAPI, region, res.ID)
178178
if diagnostics != nil {
179179
return diagnostics
180180
}
@@ -238,7 +238,7 @@ func flattenLBACLs(ACLs []*lb.ACL) interface{} {
238238
return rawACLs
239239
}
240240

241-
func resourceScalewayLbFrontendBetaUpdateACL(ctx context.Context, d *schema.ResourceData, lbAPI *lb.API, region scw.Region, frontendID string) diag.Diagnostics {
241+
func resourceScalewayLbFrontendUpdateACL(ctx context.Context, d *schema.ResourceData, lbAPI *lb.API, region scw.Region, frontendID string) diag.Diagnostics {
242242
//Fetch existing acl from the api. and convert it to a hashmap with index as key
243243
resACL, err := lbAPI.ListACLs(&lb.ListACLsRequest{
244244
Region: region,
@@ -340,7 +340,7 @@ func resourceScalewayLbFrontendUpdate(ctx context.Context, d *schema.ResourceDat
340340
}
341341

342342
//update acl
343-
diagnostics := resourceScalewayLbFrontendBetaUpdateACL(ctx, d, lbAPI, region, ID)
343+
diagnostics := resourceScalewayLbFrontendUpdateACL(ctx, d, lbAPI, region, ID)
344344
if diagnostics != nil {
345345
return diagnostics
346346
}

‎scaleway/resource_lb_frontend_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestAccScalewayLbFrontend_Basic(t *testing.T) {
1717
resource.ParallelTest(t, resource.TestCase{
1818
PreCheck: func() { testAccPreCheck(t) },
1919
ProviderFactories: tt.ProviderFactories,
20-
CheckDestroy: testAccCheckScalewayLbFrontendBetaDestroy(tt),
20+
CheckDestroy: testAccCheckScalewayLbFrontendDestroy(tt),
2121
Steps: []resource.TestStep{
2222
{
2323
Config: `
@@ -84,7 +84,7 @@ func TestAccScalewayLbAcl_Basic(t *testing.T) {
8484
resource.ParallelTest(t, resource.TestCase{
8585
PreCheck: func() { testAccPreCheck(t) },
8686
ProviderFactories: tt.ProviderFactories,
87-
CheckDestroy: testAccCheckScalewayLbFrontendBetaDestroy(tt),
87+
CheckDestroy: testAccCheckScalewayLbFrontendDestroy(tt),
8888
Steps: []resource.TestStep{
8989
{
9090
Config: `
@@ -346,7 +346,7 @@ func testAccCheckScalewayLbFrontendExists(tt *TestTools, n string) resource.Test
346346
}
347347
}
348348

349-
func testAccCheckScalewayLbFrontendBetaDestroy(tt *TestTools) resource.TestCheckFunc {
349+
func testAccCheckScalewayLbFrontendDestroy(tt *TestTools) resource.TestCheckFunc {
350350
return func(state *terraform.State) error {
351351
for _, rs := range state.RootModule().Resources {
352352
if rs.Type != "scaleway_lb_frontend" {

‎scaleway/resource_lb_ip.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func resourceScalewayLbIP() *schema.Resource {
1414
CreateContext: resourceScalewayLbIPCreate,
1515
ReadContext: resourceScalewayLbIPRead,
1616
UpdateContext: resourceScalewayLbIPUpdate,
17-
DeleteContext: resourceScalewayLbIPBetaDelete,
17+
DeleteContext: resourceScalewayLbIPDelete,
1818
Importer: &schema.ResourceImporter{
1919
StateContext: schema.ImportStatePassthroughContext,
2020
},
@@ -120,7 +120,7 @@ func resourceScalewayLbIPUpdate(ctx context.Context, d *schema.ResourceData, m i
120120
return resourceScalewayLbIPRead(ctx, d, m)
121121
}
122122

123-
func resourceScalewayLbIPBetaDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
123+
func resourceScalewayLbIPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
124124
lbAPI, region, ID, err := lbAPIWithRegionAndID(m, d.Id())
125125
if err != nil {
126126
return diag.FromErr(err)

‎scaleway/resource_registry_namespace_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestAccScalewayRegistryNamespace_Basic(t *testing.T) {
4646
resource.ParallelTest(t, resource.TestCase{
4747
PreCheck: func() { testAccPreCheck(t) },
4848
ProviderFactories: tt.ProviderFactories,
49-
CheckDestroy: testAccCheckScalewayRegistryNamespaceBetaDestroy(tt),
49+
CheckDestroy: testAccCheckScalewayRegistryNamespaceDestroy(tt),
5050
Steps: []resource.TestStep{
5151
{
5252
Config: `
@@ -104,7 +104,7 @@ func testAccCheckScalewayRegistryNamespaceExists(tt *TestTools, n string) resour
104104
}
105105
}
106106

107-
func testAccCheckScalewayRegistryNamespaceBetaDestroy(tt *TestTools) resource.TestCheckFunc {
107+
func testAccCheckScalewayRegistryNamespaceDestroy(tt *TestTools) resource.TestCheckFunc {
108108
return func(state *terraform.State) error {
109109
for _, rs := range state.RootModule().Resources {
110110
if rs.Type != "scaleway_registry_namespace" {

0 commit comments

Comments
 (0)