Skip to content

Commit 3fe8e2c

Browse files
remyleoneremyleone
committed
rename package
1 parent df965c8 commit 3fe8e2c

File tree

176 files changed

+606
-606
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+606
-606
lines changed

‎internal/errs/http_test.go

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎internal/errs/http.go renamed to ‎internal/httperrors/http.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package errs
1+
package httperrors
22

33
import (
44
"errors"
@@ -20,31 +20,31 @@ func IsHTTPCodeError(err error, statusCode int) bool {
2020
return false
2121
}
2222

23-
// Is404Error returns true if err is an HTTP 404 error
24-
func Is404Error(err error) bool {
23+
// Is404 returns true if err is an HTTP 404 error
24+
func Is404(err error) bool {
2525
notFoundError := &scw.ResourceNotFoundError{}
2626
return IsHTTPCodeError(err, http.StatusNotFound) || errors.As(err, &notFoundError)
2727
}
2828

29-
func Is412Error(err error) bool {
29+
func Is412(err error) bool {
3030
preConditionFailedError := &scw.PreconditionFailedError{}
3131
return IsHTTPCodeError(err, http.StatusPreconditionFailed) || errors.As(err, &preConditionFailedError)
3232
}
3333

34-
// Is403Error returns true if err is an HTTP 403 error
35-
func Is403Error(err error) bool {
34+
// Is403 returns true if err is an HTTP 403 error
35+
func Is403(err error) bool {
3636
permissionsDeniedError := &scw.PermissionsDeniedError{}
3737
return IsHTTPCodeError(err, http.StatusForbidden) || errors.As(err, &permissionsDeniedError)
3838
}
3939

40-
// Is409Error return true is err is an HTTP 409 error
41-
func Is409Error(err error) bool {
40+
// Is409 return true is err is an HTTP 409 error
41+
func Is409(err error) bool {
4242
// check transient error
4343
transientStateError := &scw.TransientStateError{}
4444
return IsHTTPCodeError(err, http.StatusConflict) || errors.As(err, &transientStateError)
4545
}
4646

47-
// Is410Error returns true if err is an HTTP 410 error
48-
func Is410Error(err error) bool {
47+
// Is410 returns true if err is an HTTP 410 error
48+
func Is410(err error) bool {
4949
return IsHTTPCodeError(err, http.StatusGone)
5050
}

‎internal/httperrors/http_test.go

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package httperrors_test
2+
3+
import (
4+
"errors"
5+
"net/http"
6+
"testing"
7+
8+
"github.com/scaleway/scaleway-sdk-go/scw"
9+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
10+
"github.com/stretchr/testify/assert"
11+
)
12+
13+
func TestIsHTTPCodeError(t *testing.T) {
14+
assert.True(t, httperrors.IsHTTPCodeError(&scw.ResponseError{StatusCode: http.StatusBadRequest}, http.StatusBadRequest))
15+
assert.False(t, httperrors.IsHTTPCodeError(nil, http.StatusBadRequest))
16+
assert.False(t, httperrors.IsHTTPCodeError(&scw.ResponseError{StatusCode: http.StatusBadRequest}, http.StatusNotFound))
17+
assert.False(t, httperrors.IsHTTPCodeError(errors.New("not an http error"), http.StatusNotFound))
18+
}
19+
20+
func TestIs404Error(t *testing.T) {
21+
assert.True(t, httperrors.Is404(&scw.ResponseError{StatusCode: http.StatusNotFound}))
22+
assert.False(t, httperrors.Is404(nil))
23+
assert.False(t, httperrors.Is404(&scw.ResponseError{StatusCode: http.StatusBadRequest}))
24+
}
25+
26+
func TestIs403Error(t *testing.T) {
27+
assert.True(t, httperrors.Is403(&scw.ResponseError{StatusCode: http.StatusForbidden}))
28+
assert.False(t, httperrors.Is403(nil))
29+
assert.False(t, httperrors.Is403(&scw.ResponseError{StatusCode: http.StatusBadRequest}))
30+
}

‎scaleway/data_source_instance_ip.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
99
"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
1010
"github.com/scaleway/scaleway-sdk-go/scw"
11-
"github.com/scaleway/terraform-provider-scaleway/v2/internal/errs"
11+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1212
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
1313
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
1414
)
@@ -54,7 +54,7 @@ func dataSourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceDat
5454
}, scw.WithContext(ctx))
5555
if err != nil {
5656
// We check for 403 because instance API returns 403 for a deleted IP
57-
if errs.Is404Error(err) || errs.Is403Error(err) {
57+
if httperrors.Is404(err) || httperrors.Is403(err) {
5858
d.SetId("")
5959
return nil
6060
}

‎scaleway/helpers_baremetal.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1111
"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
1212
"github.com/scaleway/scaleway-sdk-go/scw"
13-
"github.com/scaleway/terraform-provider-scaleway/v2/internal/errs"
13+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1414
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
1515
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
1616
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
@@ -254,7 +254,7 @@ func detachAllPrivateNetworkFromBaremetal(ctx context.Context, d *schema.Resourc
254254
}
255255

256256
_, err = waitForBaremetalServerPrivateNetwork(ctx, privateNetworkAPI, zone, serverID, d.Timeout(schema.TimeoutDelete))
257-
if err != nil && !errs.Is404Error(err) {
257+
if err != nil && !httperrors.Is404(err) {
258258
return err
259259
}
260260
return nil

‎scaleway/helpers_instance.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
1717
"github.com/scaleway/scaleway-sdk-go/api/vpc/v2"
1818
"github.com/scaleway/scaleway-sdk-go/scw"
19-
"github.com/scaleway/terraform-provider-scaleway/v2/internal/errs"
19+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
2020
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
2121
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
2222
"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
@@ -397,7 +397,7 @@ func (ph *privateNICsHandler) detach(ctx context.Context, o interface{}, timeout
397397
Timeout: &timeout,
398398
RetryInterval: scw.TimeDurationPtr(defaultInstanceRetryInterval),
399399
})
400-
if err != nil && !errs.Is404Error(err) {
400+
if err != nil && !httperrors.Is404(err) {
401401
return err
402402
}
403403
}
@@ -743,7 +743,7 @@ func instanceServerAdditionalVolumeTemplate(api *InstanceBlockAPI, zone scw.Zone
743743
Size: &vol.Volume.Size,
744744
}, nil
745745
}
746-
if !errs.Is404Error(err) {
746+
if !httperrors.Is404(err) {
747747
return nil, err
748748
}
749749

‎scaleway/helpers_k8s.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1212
"github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
1313
"github.com/scaleway/scaleway-sdk-go/scw"
14-
"github.com/scaleway/terraform-provider-scaleway/v2/internal/errs"
14+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1515
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
1616
"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
1717
"github.com/scaleway/terraform-provider-scaleway/v2/internal/transport"
@@ -122,7 +122,7 @@ func waitK8SClusterStatus(ctx context.Context, k8sAPI *k8s.API, cluster *k8s.Clu
122122
RetryInterval: &retryInterval,
123123
}, scw.WithContext(ctx))
124124
if err != nil {
125-
if status == k8s.ClusterStatusDeleted && errs.Is404Error(err) {
125+
if status == k8s.ClusterStatusDeleted && httperrors.Is404(err) {
126126
return cluster, nil
127127
}
128128
return cluster, err

‎scaleway/helpers_lb.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1"
1818
"github.com/scaleway/scaleway-sdk-go/scw"
1919
validator "github.com/scaleway/scaleway-sdk-go/validation"
20-
"github.com/scaleway/terraform-provider-scaleway/v2/internal/errs"
20+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
2121
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
2222
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
2323
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
@@ -536,12 +536,12 @@ func attachLBPrivateNetworks(ctx context.Context, lbAPI *lbSDK.ZonedAPI, zone sc
536536
StaticConfig: pnConfigs[i].StaticConfig,
537537
DHCPConfig: pnConfigs[i].DHCPConfig,
538538
}, scw.WithContext(ctx))
539-
if err != nil && !errs.Is404Error(err) {
539+
if err != nil && !httperrors.Is404(err) {
540540
return nil, err
541541
}
542542

543543
privateNetworks, err = waitForLBPN(ctx, lbAPI, zone, pn.LB.ID, timeout)
544-
if err != nil && !errs.Is404Error(err) {
544+
if err != nil && !httperrors.Is404(err) {
545545
return nil, err
546546
}
547547

@@ -552,7 +552,7 @@ func attachLBPrivateNetworks(ctx context.Context, lbAPI *lbSDK.ZonedAPI, zone sc
552552
LBID: pn.LB.ID,
553553
PrivateNetworkID: pn.PrivateNetworkID,
554554
}, scw.WithContext(ctx))
555-
if err != nil && !errs.Is404Error(err) {
555+
if err != nil && !httperrors.Is404(err) {
556556
return nil, err
557557
}
558558
tflog.Debug(ctx, fmt.Sprintf("DHCP config: %v", pn.DHCPConfig))

‎scaleway/resource_account_project.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
88
accountV3 "github.com/scaleway/scaleway-sdk-go/api/account/v3"
99
"github.com/scaleway/scaleway-sdk-go/scw"
10-
"github.com/scaleway/terraform-provider-scaleway/v2/internal/errs"
10+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1111
)
1212

1313
func resourceScalewayAccountProject() *schema.Resource {
@@ -82,7 +82,7 @@ func resourceScalewayAccountProjectRead(ctx context.Context, d *schema.ResourceD
8282
ProjectID: d.Id(),
8383
}, scw.WithContext(ctx))
8484
if err != nil {
85-
if errs.Is404Error(err) {
85+
if httperrors.Is404(err) {
8686
d.SetId("")
8787
return nil
8888
}
@@ -132,7 +132,7 @@ func resourceScalewayAccountProjectDelete(ctx context.Context, d *schema.Resourc
132132
err := accountAPI.DeleteProject(&accountV3.ProjectAPIDeleteProjectRequest{
133133
ProjectID: d.Id(),
134134
}, scw.WithContext(ctx))
135-
if err != nil && !errs.Is404Error(err) {
135+
if err != nil && !httperrors.Is404(err) {
136136
return diag.FromErr(err)
137137
}
138138

‎scaleway/resource_account_project_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
99
accountV3 "github.com/scaleway/scaleway-sdk-go/api/account/v3"
1010
"github.com/scaleway/scaleway-sdk-go/scw"
11-
"github.com/scaleway/terraform-provider-scaleway/v2/internal/errs"
11+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1212
"github.com/scaleway/terraform-provider-scaleway/v2/internal/logging"
1313
)
1414

@@ -151,7 +151,7 @@ func testAccCheckScalewayAccountProjectDestroy(tt *TestTools) resource.TestCheck
151151
}
152152

153153
// Unexpected api error we return it
154-
if !errs.Is404Error(err) {
154+
if !httperrors.Is404(err) {
155155
return err
156156
}
157157
}

‎scaleway/resource_apple_silicon_server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
1010
"github.com/scaleway/scaleway-sdk-go/scw"
11-
"github.com/scaleway/terraform-provider-scaleway/v2/internal/errs"
11+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1212
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
1313
)
1414

@@ -117,7 +117,7 @@ func resourceScalewayAppleSiliconServerRead(ctx context.Context, d *schema.Resou
117117
ServerID: ID,
118118
}, scw.WithContext(ctx))
119119
if err != nil {
120-
if errs.Is404Error(err) {
120+
if httperrors.Is404(err) {
121121
d.SetId("")
122122
return nil
123123
}
@@ -174,7 +174,7 @@ func resourceScalewayAppleSiliconServerDelete(ctx context.Context, d *schema.Res
174174
ServerID: ID,
175175
}, scw.WithContext(ctx))
176176

177-
if err != nil && !errs.Is404Error(err) {
177+
if err != nil && !httperrors.Is404(err) {
178178
return diag.FromErr(err)
179179
}
180180

‎scaleway/resource_apple_silicon_server_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
99
applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
1010
"github.com/scaleway/scaleway-sdk-go/scw"
11-
"github.com/scaleway/terraform-provider-scaleway/v2/internal/errs"
11+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1212
"github.com/scaleway/terraform-provider-scaleway/v2/internal/logging"
1313
)
1414

@@ -120,7 +120,7 @@ func testAccCheckScalewayAppleSiliconServerDestroy(tt *TestTools) resource.TestC
120120
}
121121

122122
// Unexpected api error we return it
123-
if !errs.Is404Error(err) {
123+
if !httperrors.Is404(err) {
124124
return err
125125
}
126126
}

‎scaleway/resource_baremetal_server.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
1313
"github.com/scaleway/scaleway-sdk-go/scw"
1414
sdkValidation "github.com/scaleway/scaleway-sdk-go/validation"
15-
"github.com/scaleway/terraform-provider-scaleway/v2/internal/errs"
15+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1616
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
1717
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
1818
)
@@ -380,7 +380,7 @@ func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.Resour
380380
}
381381

382382
_, err = waitForBaremetalServerPrivateNetwork(ctx, baremetalPrivateNetworkAPI, zone, baremetalPrivateNetwork.ServerPrivateNetworks[0].ServerID, d.Timeout(schema.TimeoutCreate))
383-
if err != nil && !errs.Is404Error(err) {
383+
if err != nil && !httperrors.Is404(err) {
384384
return diag.FromErr(err)
385385
}
386386
}
@@ -404,7 +404,7 @@ func resourceScalewayBaremetalServerRead(ctx context.Context, d *schema.Resource
404404
ServerID: zonedID.ID,
405405
}, scw.WithContext(ctx))
406406
if err != nil {
407-
if errs.Is404Error(err) {
407+
if httperrors.Is404(err) {
408408
d.SetId("")
409409
return nil
410410
}
@@ -509,7 +509,7 @@ func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.Resour
509509
}
510510

511511
_, err = waitForBaremetalServerOptions(ctx, baremetalAPI, zonedID.Zone, zonedID.ID, d.Timeout(schema.TimeoutDelete))
512-
if err != nil && !errs.Is404Error(err) {
512+
if err != nil && !httperrors.Is404(err) {
513513
return diag.FromErr(err)
514514
}
515515

@@ -545,7 +545,7 @@ func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.Resour
545545
}
546546

547547
_, err = waitForBaremetalServerPrivateNetwork(ctx, baremetalPrivateNetworkAPI, zone, baremetalPrivateNetwork.ServerPrivateNetworks[0].ServerID, d.Timeout(schema.TimeoutUpdate))
548-
if err != nil && !errs.Is404Error(err) {
548+
if err != nil && !httperrors.Is404(err) {
549549
return diag.FromErr(err)
550550
}
551551
}
@@ -650,14 +650,14 @@ func resourceScalewayBaremetalServerDelete(ctx context.Context, d *schema.Resour
650650
ServerID: zonedID.ID,
651651
}, scw.WithContext(ctx))
652652
if err != nil {
653-
if errs.Is404Error(err) {
653+
if httperrors.Is404(err) {
654654
return nil
655655
}
656656
return diag.FromErr(err)
657657
}
658658

659659
_, err = waitForBaremetalServer(ctx, baremetalAPI, zonedID.Zone, zonedID.ID, d.Timeout(schema.TimeoutDelete))
660-
if err != nil && !errs.Is404Error(err) {
660+
if err != nil && !httperrors.Is404(err) {
661661
return diag.FromErr(err)
662662
}
663663

‎scaleway/resource_baremetal_server_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1010
"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
1111
"github.com/scaleway/scaleway-sdk-go/scw"
12-
"github.com/scaleway/terraform-provider-scaleway/v2/internal/errs"
12+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1313
"github.com/scaleway/terraform-provider-scaleway/v2/internal/logging"
1414
)
1515

@@ -841,7 +841,7 @@ func testAccCheckScalewayBaremetalServerDestroy(tt *TestTools) resource.TestChec
841841
}
842842

843843
// Unexpected api error we return it
844-
if !errs.Is404Error(err) {
844+
if !httperrors.Is404(err) {
845845
return err
846846
}
847847
}

0 commit comments

Comments
 (0)