Fix server power state conflict when deleting server (#275)

* ignore server power state conflict when shutdown/turning off * upgrade gsclient-go v3.14.1
gridscale · Feb 21, 2024 · 4526685 · 4526685
1 parent c5e0dfa
commit 4526685
Show file tree

Hide file tree

Showing 11 changed files with 287 additions and 12 deletions.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/uuid v1.4.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect

diff --git a/go.sum b/go.sum
@@ -45,8 +45,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
-github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gridscale/gsclient-go/v3 v3.14.1 h1:AJkrQuO4TZGxVkZouS1iZ8fZHRqlM97aGFWuGZnkHNE=
 github.com/gridscale/gsclient-go/v3 v3.14.1/go.mod h1:0NjkxHexfHQBbmcN03WBF1G4JhZo3Msai50Zcygv+/8=
 github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=

diff --git a/gridscale/error-handler/skipHTTPErrCode.go b/gridscale/error-handler/skipHTTPErrCode.go
@@ -1,6 +1,10 @@
 package errorhandler
 
-import "github.com/gridscale/gsclient-go/v3"
+import (
+	"strings"
+
+	"github.com/gridscale/gsclient-go/v3"
+)
 
 // SuppressHTTPErrorCodes suppresses the error, if the error
 // is in the list errorCodes.
@@ -13,6 +17,17 @@ func SuppressHTTPErrorCodes(err error, errorCodes ...int) error {
 	return err
 }
 
+// SuppressHTTPErrorCodesWithSubErrString suppresses the error, if the error
+// is in the list errorCodes and contains the subString.
+func SuppressHTTPErrorCodesWithSubErrString(err error, subString string, errorCodes ...int) error {
+	if requestError, ok := err.(gsclient.RequestError); ok {
+		if containsInt(errorCodes, requestError.StatusCode) && strings.Contains(requestError.Error(), subString) {
+			err = nil
+		}
+	}
+	return err
+}
+
 // containsInt check if an int array contains a specific int.
 func containsInt(arr []int, target int) bool {
 	for _, a := range arr {

diff --git a/gridscale/server_concurrency_handler.go b/gridscale/server_concurrency_handler.go
@@ -12,6 +12,8 @@ import (
 	errHandler "github.com/terraform-providers/terraform-provider-gridscale/gridscale/error-handler"
 )
 
+const serverAlreadyInRequestedPowerStateErrSubStr = "already in the requested power state"
+
 type serverStatus struct {
 	//is the server is deleted
 	deleted bool
@@ -74,7 +76,11 @@ func (l *serverStatusList) removeServerSynchronously(ctx context.Context, c *gsc
 			//set the shutdown timeout specifically
 			shutdownCtx, cancel := context.WithTimeout(context.Background(), serverShutdownTimeoutSecs*time.Second)
 			defer cancel()
-			err := c.ShutdownServer(shutdownCtx, id)
+			err := errHandler.SuppressHTTPErrorCodesWithSubErrString(
+				c.ShutdownServer(shutdownCtx, id),
+				serverAlreadyInRequestedPowerStateErrSubStr,
+				http.StatusBadRequest,
+			)
 			//if error is returned and it is not caused by an expired context, returns error
 			if err != nil && err != shutdownCtx.Err() {
 				return err
@@ -89,7 +95,11 @@ func (l *serverStatusList) removeServerSynchronously(ctx context.Context, c *gsc
 				default:
 				}
 				//force the sever to stop
-				err = c.StopServer(ctx, id)
+				err = errHandler.SuppressHTTPErrorCodesWithSubErrString(
+					c.StopServer(ctx, id),
+					serverAlreadyInRequestedPowerStateErrSubStr,
+					http.StatusBadRequest,
+				)
 				if err != nil {
 					return err
 				}

diff --git a/vendor/github.com/google/uuid/CHANGELOG.md b/vendor/github.com/google/uuid/CHANGELOG.md
diff --git a/vendor/github.com/google/uuid/hash.go b/vendor/github.com/google/uuid/hash.go
diff --git a/vendor/github.com/google/uuid/time.go b/vendor/github.com/google/uuid/time.go
diff --git a/vendor/github.com/google/uuid/uuid.go b/vendor/github.com/google/uuid/uuid.go
diff --git a/vendor/github.com/google/uuid/version6.go b/vendor/github.com/google/uuid/version6.go
diff --git a/vendor/github.com/google/uuid/version7.go b/vendor/github.com/google/uuid/version7.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -110,7 +110,7 @@ github.com/google/go-cmp/cmp/internal/diff
 github.com/google/go-cmp/cmp/internal/flags
 github.com/google/go-cmp/cmp/internal/function
 github.com/google/go-cmp/cmp/internal/value
-# github.com/google/uuid v1.4.0
+# github.com/google/uuid v1.6.0
 ## explicit
 github.com/google/uuid
 # github.com/gridscale/gsclient-go/v3 v3.14.1