Merge pull request #287 from kbst/update-cli-versions

Update CLI versions esp. Terraform after upstream issue workaround
kbst · Jul 23, 2022 · a2c5bc0 · a2c5bc0
2 parents cf51f20 + 29c4ea6
commit a2c5bc0
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 72 deletions.
diff --git a/common/configuration/tests/non_string_values/test_object.tf b/common/configuration/tests/non_string_values/test_object.tf
@@ -1,71 +1,5 @@
-variable "test_configuration" {
-  type = map(object({
-    test_string = optional(string)
-    test_list_string = optional(list(string))
-    test_map_string = optional(map(string))
-    test_list_object = optional(list(object({
-      key = string
-    })))
-    test_object = optional(object({
-      key = string
-    }))
-  }))
-  description = "Map with per workspace module configuration."
-  default = {
-    apps = {
-      test_string = "from_apps"
-
-      test_list_string = [
-        "from_apps"
-      ]
-
-      test_map_string = {
-        key = "from_apps"
-      }
-
-      test_list_object = [{
-        key = "from_apps"
-      }]
-
-      test_object = {
-        key = "from_apps"
-      }
-    }
-
-    ops = {
-      test_string = "from_ops"
-
-      test_list_string = [
-        "from_ops"
-      ]
-
-      test_map_string = {
-        key = "from_ops"
-      }
-
-      test_list_object = [{
-        key = "from_ops"
-      }]
-
-      test_object = {
-        key = "from_ops"
-      }
-    }
-
-    loc = {
-      test_list_object = [{
-        key = "from_loc"
-      }]
-    }
-  }
-}
-
 module "mut_object" {
-  source = "../.."
-
-  configuration = var.test_configuration
-
-  base_key = "apps"
+  source = "./wrapper"
 }
 
 resource "test_assertions" "overwrite_object" {

diff --git a/common/configuration/tests/non_string_values/wrapper/main.tf b/common/configuration/tests/non_string_values/wrapper/main.tf
@@ -0,0 +1,77 @@
+terraform {
+  experiments = [module_variable_optional_attrs]
+}
+
+variable "test_configuration" {
+  type = map(object({
+    test_string      = optional(string)
+    test_list_string = optional(list(string))
+    test_map_string  = optional(map(string))
+    test_list_object = optional(list(object({
+      key = string
+    })))
+    test_object = optional(object({
+      key = string
+    }))
+  }))
+  description = "Map with per workspace module configuration."
+  default = {
+    apps = {
+      test_string = "from_apps"
+
+      test_list_string = [
+        "from_apps"
+      ]
+
+      test_map_string = {
+        key = "from_apps"
+      }
+
+      test_list_object = [{
+        key = "from_apps"
+      }]
+
+      test_object = {
+        key = "from_apps"
+      }
+    }
+
+    ops = {
+      test_string = "from_ops"
+
+      test_list_string = [
+        "from_ops"
+      ]
+
+      test_map_string = {
+        key = "from_ops"
+      }
+
+      test_list_object = [{
+        key = "from_ops"
+      }]
+
+      test_object = {
+        key = "from_ops"
+      }
+    }
+
+    loc = {
+      test_list_object = [{
+        key = "from_loc"
+      }]
+    }
+  }
+}
+
+module "mut_object" {
+  source = "../../.."
+
+  configuration = var.test_configuration
+
+  base_key = "apps"
+}
+
+output "merged" {
+  value = module.mut_object.merged
+}
diff --git a/oci/Dockerfile b/oci/Dockerfile
@@ -24,13 +24,13 @@ RUN mkdir -p /opt/bin
 FROM builder AS common-builder
 
 # https://github.com/kubernetes/kubernetes/releases
-ARG KUBECTL_VERSION=v1.23.8
+ARG KUBECTL_VERSION=v1.24.3
 
 # https://github.com/kubernetes-sigs/kustomize/releases
 ARG KUSTOMIZE_VERSION=v4.5.5
 
 # https://www.terraform.io/downloads.html
-ARG TERRAFORM_VERSION=1.1.9
+ARG TERRAFORM_VERSION=1.2.5
 
 RUN echo "KUBECTL_VERSION: ${KUBECTL_VERSION}" \
     && curl -Lo /opt/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl \
@@ -58,7 +58,7 @@ COPY oci/entrypoint oci/entrypoint_user /opt/bin/
 FROM builder AS aws-builder
 
 # https://github.com/aws/aws-cli/blob/v2/CHANGELOG.rst
-ARG AWS_CLI_VERSION=2.7.10
+ARG AWS_CLI_VERSION=2.7.18
 
 RUN mkdir -p /opt/aws/bin
 
@@ -75,7 +75,7 @@ RUN echo "AWS_CLI_VERSION: ${AWS_CLI_VERSION}" \
 FROM builder AS gcp-builder
 
 # https://cloud.google.com/sdk/docs/release-notes
-ARG GOOGLE_CLOUD_SDK_VERSION=391.0.0
+ARG GOOGLE_CLOUD_SDK_VERSION=394.0.0
 
 RUN echo "GOOGLE_CLOUD_SDK_VERSION: ${GOOGLE_CLOUD_SDK_VERSION}" \
     && curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GOOGLE_CLOUD_SDK_VERSION}-linux-x86_64.tar.gz \
@@ -90,7 +90,7 @@ RUN echo "GOOGLE_CLOUD_SDK_VERSION: ${GOOGLE_CLOUD_SDK_VERSION}" \
 FROM builder AS azure-builder
 
 # https://docs.microsoft.com/en-us/cli/azure/release-notes-azure-cli?tabs=azure-cli
-ARG AZURE_CLI_VERSION=2.37.0
+ARG AZURE_CLI_VERSION=2.38.0
 
 RUN apt-get update && apt-get install -y \
     libffi-dev