fix poor merge of upstream v2.9.0

.github/workflows/main.yml

@@ -7,7 +7,9 @@ on:
       - '!*'
     # consider only release and pre-release tags
     tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+-ora'
       - 'v[0-9]+.[0-9]+.[0-9]+-ora[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+-ora-rc[0-9]+'
       - 'v[0-9]+.[0-9]+.[0-9]+-ora[0-9]+-rc[0-9]+'
 
 jobs:
@@ -32,20 +34,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
 
-      - name: tests modules
-        run: |
-          go mod vendor
-          if [ ! -z "$(git status --porcelain)" ]; then
-            echo "::error::vendor directory if not synched with go.mod, please run go mod vendor"
-            exit 1
-          fi
-
-          go mod tidy
-          if [ ! -z "$(git status --porcelain)" ]; then
-            echo "::error::modules are not tidy, please run go mod tidy"
-            exit 1
-          fi
-
       - name: tests
         run: |
           go test -v ./...

cloudstack/cloudstack.go

@@ -466,15 +466,6 @@ func getSortedKeysFromMap(m map[string]string) (keys []string) {
 	return keys
 }
 
-// getSortedKeysFromMap returns the keys from m in increasing order.
-func getSortedKeysFromMap(m map[string]string) (keys []string) {
-	for k := range m {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	return
-}
-
 // WithAsyncTimeout takes a custom timeout to be used by the CloudStackClient
 func WithAsyncTimeout(timeout int64) ClientOption {
 	return func(cs *CloudStackClient) {