Merge pull request #16 from linode/fix/fix-obj-keys

Fix obj key generation, rollback terraform provider to 2.5.1
linode · Aug 22, 2023 · 7bb2a26 · 7bb2a26
2 parents 255469e + 29d4d26
commit 7bb2a26
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 178 deletions.
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/config/instance/config.go b/config/instance/config.go
@@ -9,7 +9,6 @@ func Configure(p *config.Provider) {
 		// this resource, which would be "linode"
 		r.ShortGroup = "instance"
 		r.UseAsync = true
-
 		r.LateInitializer = config.LateInitializer{
 			IgnoredFields: []string{"disk", "config"},
 		}

diff --git a/config/provider-metadata.yaml b/config/provider-metadata.yaml
@@ -39,7 +39,7 @@ resources:
               dependencies:
                 linode_database_mysql.my-db: |-
                     {
-                      "engine_id": "mysql/8.0.30",
+                      "engine_id": "mysql/8.0.26",
                       "label": "mydatabase",
                       "region": "us-southeast",
                       "type": "g6-nanode-1"
@@ -65,7 +65,7 @@ resources:
             - name: foobar
               manifest: |-
                 {
-                  "engine_id": "mysql/8.0.30",
+                  "engine_id": "mysql/8.0.26",
                   "label": "mydatabase",
                   "region": "us-southeast",
                   "type": "g6-nanode-1"
@@ -78,7 +78,7 @@ resources:
                   ],
                   "cluster_size": 3,
                   "encrypted": true,
-                  "engine_id": "mysql/8.0.30",
+                  "engine_id": "mysql/8.0.26",
                   "label": "mydatabase",
                   "region": "us-southeast",
                   "replication_type": "asynch",
@@ -102,7 +102,7 @@ resources:
             created: '- When this Managed Database was created.'
             encrypted: '- (Optional) Whether the Managed Databases is encrypted. (default false)'
             engine: '- The Managed Database engine. (e.g. mysql)'
-            engine_id: '- (Required) The Managed Database engine in engine/version format. (e.g. mysql/8.0.30)'
+            engine_id: '- (Required) The Managed Database engine in engine/version format. (e.g. mysql/8.0.26)'
             host_primary: '- The primary host for the Managed Database.'
             host_secondary: '- The secondary/private network host for the Managed Database.'
             id: '- The ID of the Managed Database.'

diff --git a/config/schema.json b/config/schema.json
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

diff --git a/package/crds/image.linode.upbound.io_images.yaml b/package/crds/image.linode.upbound.io_images.yaml
@@ -67,9 +67,6 @@ spec:
                 type: string
               forProvider:
                 properties:
-                  cloudInit:
-                    description: Whether this image supports cloud-init.
-                    type: boolean
                   description:
                     description: A detailed description of this Image. A detailed
                       description of this Image.
@@ -441,14 +438,6 @@ spec:
             properties:
               atProvider:
                 properties:
-                  capabilities:
-                    description: The capabilities of this Image.
-                    items:
-                      type: string
-                    type: array
-                  cloudInit:
-                    description: Whether this image supports cloud-init.
-                    type: boolean
                   created:
                     description: When this Image was created. When this Image was
                       created.