Fix obj key generation, rollback terraform provider to 2.5.1

linode · Aug 22, 2023 · 70e7326 · 70e7326
1 parent 255469e
commit 70e7326
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 187 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -2,7 +2,7 @@ run:
   deadline: 10m
 
   skip-files:
-  - "zz_\\..+\\.go$"
+    - "zz_\\..+\\.go$"
 
 output:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
@@ -27,9 +27,9 @@ linters-settings:
     # report about shadowed variables
     check-shadowing: false
 
-  golint:
-    # minimal confidence for issues, default is 0.8
-    min-confidence: 0.8
+  revive:
+    # confidence for issues, default is 0.8
+    confidence: 0.8
 
   gofmt:
     # simplify code: gofmt with `-s` option, true by default
@@ -38,7 +38,7 @@ linters-settings:
   goimports:
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes
-    local-prefixes: github.com/upbound/upjet-provider-template
+    local-prefixes: github.com/upbound/provider-aws
 
   gocyclo:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)
@@ -113,7 +113,7 @@ linters:
     - goimports
     - gofmt  # We enable this as well as goimports for its simplify mode.
     - prealloc
-    - golint
+    - revive
     - unconvert
     - misspell
     - nakedret
@@ -136,7 +136,7 @@ issues:
         - gosec
         - scopelint
         - unparam
-    
+
     # Ease some gocritic warnings on test files.
     - path: _test\.go
       text: "(unnamedResult|exitAfterDefer)"
@@ -148,31 +148,31 @@ issues:
     # rather than using a pointer.
     - text: "(hugeParam|rangeValCopy):"
       linters:
-      - gocritic
+        - gocritic
 
     # This "TestMain should call os.Exit to set exit code" warning is not clever
     # enough to notice that we call a helper method that calls os.Exit.
     - text: "SA3000:"
       linters:
-      - staticcheck
+        - staticcheck
 
     - text: "k8s.io/api/core/v1"
       linters:
-      - goimports
+        - goimports
 
     # This is a "potential hardcoded credentials" warning. It's triggered by
     # any variable with 'secret' in the same, and thus hits a lot of false
     # positives in Kubernetes land where a Secret is an object type.
     - text: "G101:"
       linters:
-      - gosec
-      - gas
+        - gosec
+        - gas
 
     # This is an 'errors unhandled' warning that duplicates errcheck.
     - text: "G104:"
       linters:
-      - gosec
-      - gas
+        - gosec
+        - gas
 
   # Independently from option `exclude` we use default exclude patterns,
   # it can be disabled by this option. To list all
@@ -192,4 +192,4 @@ issues:
   max-per-linter: 0
 
   # Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
-  max-same-issues: 0
+  max-same-issues: 0
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ PROJECT_REPO := github.com/linode/$(PROJECT_NAME)
 
 export TERRAFORM_VERSION := 1.3.3
 export TERRAFORM_PROVIDER_SOURCE := linode/linode
-export TERRAFORM_PROVIDER_VERSION := 2.5.2
+export TERRAFORM_PROVIDER_VERSION := 2.5.1
 export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-linode
 export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-linode_v$(TERRAFORM_PROVIDER_VERSION)
 export TERRAFORM_PROVIDER_REPO := https://github.com/linode/terraform-provider-linode

diff --git a/apis/database/v1alpha1/zz_mysql_types.go b/apis/database/v1alpha1/zz_mysql_types.go
diff --git a/apis/image/v1alpha1/zz_generated.deepcopy.go b/apis/image/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/image/v1alpha1/zz_image_types.go b/apis/image/v1alpha1/zz_image_types.go
diff --git a/apis/instance/v1alpha1/zz_generated.deepcopy.go b/apis/instance/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/instance/v1alpha1/zz_instance_types.go b/apis/instance/v1alpha1/zz_instance_types.go
diff --git a/apis/instance/v1alpha1/zz_ip_types.go b/apis/instance/v1alpha1/zz_ip_types.go
diff --git a/apis/objectstorage/v1alpha1/zz_key_types.go b/apis/objectstorage/v1alpha1/zz_key_types.go
diff --git a/examples-generated/database/accesscontrols.yaml b/examples-generated/database/accesscontrols.yaml
@@ -25,7 +25,7 @@ metadata:
   name: my-db
 spec:
   forProvider:
-    engineId: mysql/8.0.30
+    engineId: mysql/8.0.26
     label: mydatabase
     region: us-southeast
     type: g6-nanode-1

diff --git a/examples-generated/database/mysql.yaml b/examples-generated/database/mysql.yaml
@@ -8,7 +8,7 @@ metadata:
   name: foobar
 spec:
   forProvider:
-    engineId: mysql/8.0.30
+    engineId: mysql/8.0.26
     label: mydatabase
     region: us-southeast
     type: g6-nanode-1

diff --git a/package/crds/database.linode.upbound.io_mysqls.yaml b/package/crds/database.linode.upbound.io_mysqls.yaml
@@ -89,8 +89,8 @@ spec:
                     type: boolean
                   engineId:
                     description: The Managed Database engine in engine/version format.
-                      (e.g. mysql/8.0.30) The Managed Database engine in engine/version
-                      format. (e.g. mysql/8.0.30)
+                      (e.g. mysql/8.0.26) The Managed Database engine in engine/version
+                      format. (e.g. mysql/8.0.26)
                     type: string
                   label:
                     description: A unique, user-defined string referring to the Managed
@@ -383,8 +383,8 @@ spec:
                     type: string
                   engineId:
                     description: The Managed Database engine in engine/version format.
-                      (e.g. mysql/8.0.30) The Managed Database engine in engine/version
-                      format. (e.g. mysql/8.0.30)
+                      (e.g. mysql/8.0.26) The Managed Database engine in engine/version
+                      format. (e.g. mysql/8.0.26)
                     type: string
                   hostPrimary:
                     description: The primary host for the Managed Database. The primary