Skip to content

Commit 9885f7f

Browse files
remyleoneremyleone
committed
Fix
1 parent 6808548 commit 9885f7f

File tree

5 files changed

+28
-26
lines changed

5 files changed

+28
-26
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/hashicorp/go-retryablehttp v0.6.7
88
github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.3
99
github.com/mitchellh/go-homedir v1.1.0
10-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200923142616-ae5d7880b199
10+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20201012113348-9c005a5dceaf
1111
github.com/stretchr/testify v1.6.1
1212
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
1313
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
297297
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
298298
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200923142616-ae5d7880b199 h1:SVgNpFhrq0iOwzD4y881l0Bp7FwNTTjHhMmK/05vERw=
299299
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200923142616-ae5d7880b199/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
300+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20201012113348-9c005a5dceaf h1:EF4RmbyknaSjL2rSilhv7CHzJPtlBjIdEHJSQJCD47I=
301+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20201012113348-9c005a5dceaf/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
300302
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
301303
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
302304
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=

‎scaleway/helpers_k8s.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ func k8sGetMinorVersionFromFull(version string) (string, error) {
6969
}
7070

7171
// k8sGetLatestVersionFromMinor returns the latest full version (x.y.z) for a given minor version (x.y)
72-
func k8sGetLatestVersionFromMinor(k8sAPI *k8s.API, region scw.Region, version string) (string, error) {
72+
func k8sGetLatestVersionFromMinor(ctx context.Context, k8sAPI *k8s.API, region scw.Region, version string) (string, error) {
7373
versionSplit := strings.Split(version, ".")
7474
if len(versionSplit) != 2 {
7575
return "", fmt.Errorf("minor version should be like x.y not %s", version)
7676
}
7777

7878
versionsResp, err := k8sAPI.ListVersions(&k8s.ListVersionsRequest{
7979
Region: region,
80-
})
80+
}, scw.WithContext(ctx))
8181
if err != nil {
8282
return "", err
8383
}
@@ -94,12 +94,12 @@ func k8sGetLatestVersionFromMinor(k8sAPI *k8s.API, region scw.Region, version st
9494
return "", fmt.Errorf("no available upstream version found for %s", version)
9595
}
9696

97-
func waitK8SCluster(k8sAPI *k8s.API, region scw.Region, clusterID string, desiredStates ...k8s.ClusterStatus) error {
97+
func waitK8SCluster(ctx context.Context, k8sAPI *k8s.API, region scw.Region, clusterID string, desiredStates ...k8s.ClusterStatus) error {
9898
cluster, err := k8sAPI.WaitForCluster(&k8s.WaitForClusterRequest{
9999
ClusterID: clusterID,
100100
Region: region,
101101
Timeout: scw.TimeDurationPtr(K8SClusterWaitForPoolRequiredTimeout),
102-
})
102+
}, scw.WithContext(ctx))
103103
if err != nil {
104104
return err
105105
}
@@ -113,12 +113,12 @@ func waitK8SCluster(k8sAPI *k8s.API, region scw.Region, clusterID string, desire
113113
return fmt.Errorf("cluster %s has state %s, wants one of %+q", clusterID, cluster.Status, desiredStates)
114114
}
115115

116-
func waitK8SClusterDeleted(k8sAPI *k8s.API, region scw.Region, clusterID string) error {
116+
func waitK8SClusterDeleted(ctx context.Context, k8sAPI *k8s.API, region scw.Region, clusterID string) error {
117117
cluster, err := k8sAPI.WaitForCluster(&k8s.WaitForClusterRequest{
118118
ClusterID: clusterID,
119119
Region: region,
120120
Timeout: scw.TimeDurationPtr(K8SClusterWaitForDeletedTimeout),
121-
})
121+
}, scw.WithContext(ctx))
122122
if err != nil {
123123
if is404Error(err) {
124124
return nil
@@ -129,12 +129,12 @@ func waitK8SClusterDeleted(k8sAPI *k8s.API, region scw.Region, clusterID string)
129129
return fmt.Errorf("cluster %s has state %s, wants %s", clusterID, cluster.Status, k8s.ClusterStatusDeleted)
130130
}
131131

132-
func waitK8SPoolReady(k8sAPI *k8s.API, region scw.Region, poolID string) error {
132+
func waitK8SPoolReady(ctx context.Context, k8sAPI *k8s.API, region scw.Region, poolID string) error {
133133
pool, err := k8sAPI.WaitForPool(&k8s.WaitForPoolRequest{
134134
PoolID: poolID,
135135
Region: region,
136136
Timeout: scw.TimeDurationPtr(K8SPoolWaitForReadyTimeout),
137-
})
137+
}, scw.WithContext(ctx))
138138

139139
if err != nil {
140140
return err

‎scaleway/resource_k8s_cluster_beta.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func resourceScalewayK8SClusterBeta() *schema.Resource {
1919
UpdateContext: resourceScalewayK8SClusterBetaUpdate,
2020
DeleteContext: resourceScalewayK8SClusterBetaDelete,
2121
Importer: &schema.ResourceImporter{
22-
State: schema.ImportStatePassthrough,
22+
StateContext: schema.ImportStatePassthroughContext,
2323
},
2424
SchemaVersion: 0,
2525
Schema: map[string]*schema.Schema{
@@ -448,7 +448,7 @@ func resourceScalewayK8SClusterBetaCreate(ctx context.Context, d *schema.Resourc
448448
}
449449

450450
if versionIsOnlyMinor {
451-
version, err = k8sGetLatestVersionFromMinor(k8sAPI, region, version)
451+
version, err = k8sGetLatestVersionFromMinor(ctx, k8sAPI, region, version)
452452
if err != nil {
453453
return diag.FromErr(fmt.Errorf("minor version x.y must be used with auto upgrade enabled"))
454454
}
@@ -491,7 +491,7 @@ func resourceScalewayK8SClusterBetaCreate(ctx context.Context, d *schema.Resourc
491491
}
492492

493493
if _, ok := d.GetOk("default_pool"); ok {
494-
err = waitK8SCluster(k8sAPI, region, res.ID, k8s.ClusterStatusReady)
494+
err = waitK8SCluster(ctx, k8sAPI, region, res.ID, k8s.ClusterStatusReady)
495495
if err != nil {
496496
return diag.FromErr(err)
497497
}
@@ -501,13 +501,13 @@ func resourceScalewayK8SClusterBetaCreate(ctx context.Context, d *schema.Resourc
501501
return diag.FromErr(err)
502502
}
503503

504-
err = waitK8SPoolReady(k8sAPI, region, expandID(pool.ID))
504+
err = waitK8SPoolReady(ctx, k8sAPI, region, expandID(pool.ID))
505505
if err != nil {
506506
return diag.FromErr(err)
507507
}
508508
}
509509
} else {
510-
err = waitK8SCluster(k8sAPI, region, res.ID, k8s.ClusterStatusPoolRequired)
510+
err = waitK8SCluster(ctx, k8sAPI, region, res.ID, k8s.ClusterStatusPoolRequired)
511511
if err != nil {
512512
return diag.FromErr(err)
513513
}
@@ -788,7 +788,7 @@ func resourceScalewayK8SClusterBetaDefaultPoolUpdate(ctx context.Context, d *sch
788788

789789
if oldPoolID != "" {
790790
// wait for new pool to be ready before deleting old one
791-
err = waitK8SPoolReady(k8sAPI, region, expandID(defaultPoolID))
791+
err = waitK8SPoolReady(ctx, k8sAPI, region, expandID(defaultPoolID))
792792
if err != nil {
793793
return diag.FromErr(err)
794794
}
@@ -804,7 +804,7 @@ func resourceScalewayK8SClusterBetaDefaultPoolUpdate(ctx context.Context, d *sch
804804
}
805805

806806
if d.Get("default_pool.0.wait_for_pool_ready").(bool) { // wait for the pool to be ready if specified
807-
err = waitK8SPoolReady(k8sAPI, region, expandID(defaultPoolID))
807+
err = waitK8SPoolReady(ctx, k8sAPI, region, expandID(defaultPoolID))
808808
if err != nil {
809809
return diag.FromErr(err)
810810
}
@@ -880,7 +880,7 @@ func resourceScalewayK8SClusterBetaUpdate(ctx context.Context, d *schema.Resourc
880880
}
881881

882882
if versionIsOnlyMinor {
883-
version, err = k8sGetLatestVersionFromMinor(k8sAPI, region, version)
883+
version, err = k8sGetLatestVersionFromMinor(ctx, k8sAPI, region, version)
884884
if err != nil {
885885
return diag.FromErr(err)
886886
}
@@ -951,7 +951,7 @@ func resourceScalewayK8SClusterBetaUpdate(ctx context.Context, d *schema.Resourc
951951
return diag.FromErr(err)
952952
}
953953

954-
err = waitK8SCluster(k8sAPI, region, clusterID, k8s.ClusterStatusReady, k8s.ClusterStatusPoolRequired)
954+
err = waitK8SCluster(ctx, k8sAPI, region, clusterID, k8s.ClusterStatusReady, k8s.ClusterStatusPoolRequired)
955955
if err != nil {
956956
return diag.FromErr(err)
957957
}
@@ -971,7 +971,7 @@ func resourceScalewayK8SClusterBetaUpdate(ctx context.Context, d *schema.Resourc
971971
return diag.FromErr(err)
972972
}
973973

974-
err = waitK8SCluster(k8sAPI, region, clusterID, k8s.ClusterStatusReady, k8s.ClusterStatusPoolRequired)
974+
err = waitK8SCluster(ctx, k8sAPI, region, clusterID, k8s.ClusterStatusReady, k8s.ClusterStatusPoolRequired)
975975
if err != nil {
976976
return diag.FromErr(err)
977977
}
@@ -1009,7 +1009,7 @@ func resourceScalewayK8SClusterBetaDelete(ctx context.Context, d *schema.Resourc
10091009
return diag.FromErr(err)
10101010
}
10111011

1012-
err = waitK8SClusterDeleted(k8sAPI, region, clusterID)
1012+
err = waitK8SClusterDeleted(ctx, k8sAPI, region, clusterID)
10131013
if err != nil {
10141014
return diag.FromErr(err)
10151015
}

‎scaleway/resource_k8s_pool_beta.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
9-
k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
9+
"github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
1010
"github.com/scaleway/scaleway-sdk-go/scw"
1111
)
1212

@@ -17,7 +17,7 @@ func resourceScalewayK8SPoolBeta() *schema.Resource {
1717
UpdateContext: resourceScalewayK8SPoolBetaUpdate,
1818
DeleteContext: resourceScalewayK8SPoolBetaDelete,
1919
Importer: &schema.ResourceImporter{
20-
State: schema.ImportStatePassthrough,
20+
StateContext: schema.ImportStatePassthroughContext,
2121
},
2222
SchemaVersion: 0,
2323
Schema: map[string]*schema.Schema{
@@ -213,7 +213,7 @@ func resourceScalewayK8SPoolBetaCreate(ctx context.Context, d *schema.ResourceDa
213213
if cluster.Status == k8s.ClusterStatusPoolRequired {
214214
waitForCluster = true
215215
} else if cluster.Status == k8s.ClusterStatusCreating {
216-
err = waitK8SCluster(k8sAPI, region, cluster.ID, k8s.ClusterStatusReady)
216+
err = waitK8SCluster(ctx, k8sAPI, region, cluster.ID, k8s.ClusterStatusReady)
217217
if err != nil {
218218
return diag.FromErr(err)
219219
}
@@ -227,14 +227,14 @@ func resourceScalewayK8SPoolBetaCreate(ctx context.Context, d *schema.ResourceDa
227227
d.SetId(newRegionalIDString(region, res.ID))
228228

229229
if waitForCluster {
230-
err = waitK8SCluster(k8sAPI, region, cluster.ID, k8s.ClusterStatusReady)
230+
err = waitK8SCluster(ctx, k8sAPI, region, cluster.ID, k8s.ClusterStatusReady)
231231
if err != nil {
232232
return diag.FromErr(err)
233233
}
234234
}
235235

236236
if d.Get("wait_for_pool_ready").(bool) { // wait for the pool to be ready if specified (including all its nodes)
237-
err = waitK8SPoolReady(k8sAPI, region, res.ID)
237+
err = waitK8SPoolReady(ctx, k8sAPI, region, res.ID)
238238
if err != nil {
239239
return diag.FromErr(err)
240240
}
@@ -339,7 +339,7 @@ func resourceScalewayK8SPoolBetaUpdate(ctx context.Context, d *schema.ResourceDa
339339
}
340340

341341
if d.Get("wait_for_pool_ready").(bool) { // wait for the pool to be ready if specified (including all its nodes)
342-
err = waitK8SPoolReady(k8sAPI, region, res.ID)
342+
err = waitK8SPoolReady(ctx, k8sAPI, region, res.ID)
343343
if err != nil {
344344
return diag.FromErr(err)
345345
}

0 commit comments

Comments
 (0)