From db9e05b326783dd2c038cfcd4867ef08740ab263 Mon Sep 17 00:00:00 2001 From: stackit-pipeline <142982727+stackit-pipeline@users.noreply.github.com> Date: Mon, 2 Oct 2023 10:29:46 +0200 Subject: [PATCH] Update module github.com/stackitcloud/stackit-sdk-go/services/ske to v0.2.0 (#60) * Update module github.com/stackitcloud/stackit-sdk-go/services/ske to v0.2.0 * Fix ske acc test --------- Co-authored-by: Renovate Bot Co-authored-by: Vicente Pinto --- go.mod | 3 ++- go.sum | 6 ++++-- stackit/internal/services/ske/ske_acc_test.go | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 26cc5336..fb3a18be 100644 --- a/go.mod +++ b/go.mod @@ -21,8 +21,9 @@ require ( github.com/stackitcloud/stackit-sdk-go/services/postgresql v0.3.0 github.com/stackitcloud/stackit-sdk-go/services/redis v0.3.0 github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.3.0 + github.com/stackitcloud/stackit-sdk-go/services/redis v0.2.0 + github.com/stackitcloud/stackit-sdk-go/services/ske v0.2.0 github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.2.0 - github.com/stackitcloud/stackit-sdk-go/services/ske v0.1.1 golang.org/x/mod v0.12.0 ) diff --git a/go.sum b/go.sum index 2badfc6e..7fbb9ce0 100644 --- a/go.sum +++ b/go.sum @@ -143,10 +143,12 @@ github.com/stackitcloud/stackit-sdk-go/services/redis v0.3.0 h1:9HgICoHeq0XeT1Ge github.com/stackitcloud/stackit-sdk-go/services/redis v0.3.0/go.mod h1:OzuVC+kPkhAoGxdUkIRD+CbFGWG0Ye6kfZOv7octFN4= github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.3.0 h1:wcuc7REdvO+InxExkfaZ5azu+FKstfOlSj3m9ZCs4XI= github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.3.0/go.mod h1:9vkwymnk8LDeIUKgtNrE6K+w3Rh/x6USvA0Tw6l+r/k= +github.com/stackitcloud/stackit-sdk-go/services/redis v0.2.0 h1:pAX6rmvs/Z1BV+2Tl5PD8/940zr4QWe5xNpPCuCzsp8= +github.com/stackitcloud/stackit-sdk-go/services/redis v0.2.0/go.mod h1:7n6KxrNErscuXKGvXK93qEqd9jg9X9IT4tSGR2TsSg8= +github.com/stackitcloud/stackit-sdk-go/services/ske v0.2.0 h1:5jAVhaLHd4ayVOCJyn5Ebpmtk4ZEIr2fYXT+cOrqjLk= +github.com/stackitcloud/stackit-sdk-go/services/ske v0.2.0/go.mod h1:pVb/CaolkqaicGbHpXWUOXk5+s731TpXbx6RMyYjV1Q= github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.2.0 h1:0N50oBc5AG6T3r7kR6TofrCyhWk0ZKaktRzVSYys9KM= github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.2.0/go.mod h1:P9ZpI/G/LG0+enyEdr7zpsaikD5J085Np6IWK6dzBEk= -github.com/stackitcloud/stackit-sdk-go/services/ske v0.1.1 h1:BbsW0o37owWyVWmtH1MJPIVPxuH8adMd3jr4KSP81QI= -github.com/stackitcloud/stackit-sdk-go/services/ske v0.1.1/go.mod h1:3v4L7c97l4MY4ZZzqVKZ4ESFHOC0Wm/ckxGepAxcQWk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= diff --git a/stackit/internal/services/ske/ske_acc_test.go b/stackit/internal/services/ske/ske_acc_test.go index 8b7c8709..c8532f1a 100644 --- a/stackit/internal/services/ske/ske_acc_test.go +++ b/stackit/internal/services/ske/ske_acc_test.go @@ -11,6 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/stackitcloud/stackit-sdk-go/core/config" + oapiError "github.com/stackitcloud/stackit-sdk-go/core/oapierror" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/ske" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" @@ -517,11 +518,11 @@ func testAccCheckSKEDestroy(s *terraform.State) error { for _, projectId := range projectsToDestroy { _, err := client.GetProject(ctx, projectId).Execute() if err != nil { - oapiErr, ok := err.(*ske.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped + oapiErr, ok := err.(*oapiError.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped if !ok { return fmt.Errorf("could not convert error to GenericOpenApiError in acc test destruction, %w", err) } - if oapiErr.StatusCode() == http.StatusNotFound || oapiErr.StatusCode() == http.StatusForbidden { + if oapiErr.StatusCode == http.StatusNotFound || oapiErr.StatusCode == http.StatusForbidden { // Already gone continue }