fix: TF12 module_variable_optional_attrs compatibility

Signed-off-by: Devon Crouse <devon.crouse@oracle.com>
oracle-terraform-modules · Aug 17, 2023 · f1dddd3 · f1dddd3
1 parent 8b8a35e
commit f1dddd3
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 19 deletions.
diff --git a/.github/workflows/mdbook.yaml b/.github/workflows/mdbook.yaml
@@ -1,9 +1,7 @@
 name: Publish Documentation
 on:
   push:
-    branches:
-      - "5.x"
-      - "5.x-*"
+    branches: ["5.x"]
   workflow_dispatch:
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages

diff --git a/.github/workflows/rms.yaml b/.github/workflows/rms.yaml
@@ -0,0 +1,62 @@
+name: Publish Terraform OCI OKE RMS Stacks
+on:
+  push:
+    branches:
+      - "5.x-tf12"
+  workflow_dispatch:
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "rms"
+  cancel-in-progress: false
+
+jobs:
+  network-only:
+    environment:
+      name: rms
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Create archive
+        working-directory: ./examples/rms
+        run: zip -r tfoke-rms-network-only.zip ./oke-network-only
+      - uses: actions/upload-artifact@v3
+        with:
+          name: tfoke-rms-network-only.zip
+          path: ./examples/rms/tfoke-rms-network-only.zip
+          retention-days: 90
+          if-no-files-found: error
+
+  cluster-only:
+    environment:
+      name: rms
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Create archive
+        working-directory: ./examples/rms
+        run: zip -r tfoke-rms-cluster-only.zip ./oke-cluster-only
+      - uses: actions/upload-artifact@v3
+        with:
+          name: tfoke-rms-cluster-only.zip
+          path: ./examples/rms/tfoke-rms-cluster-only.zip
+          retention-days: 90
+          if-no-files-found: error
+
+  workers-only:
+    environment:
+      name: rms
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Create archive
+        working-directory: ./examples/rms
+        run: zip -r tfoke-rms-workers-only.zip ./oke-workers-only
+      - uses: actions/upload-artifact@v3
+        with:
+          name: tfoke-rms-workers-only.zip
+          path: ./examples/rms/tfoke-rms-workers-only.zip
+          retention-days: 90
+          if-no-files-found: error
+
diff --git a/docs/src/guide/rms_instance.md b/docs/src/guide/rms_instance.md
@@ -1,4 +1,4 @@
-[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://objectstorage.ap-osaka-1.oraclecloud.com/p/VYW4Rc8Q57asWu1DeqUrLkBZ7CMuNe6TsQdCfIsBUEMSLtH6a3zVD5zEwteRYlLW/n/hpc_limited_availability/b/tfoke/o/oke-workers-only.zip&zipUrlVariables={"worker_pool_mode":"Instances","worker_pool_name":"oke-instances"})
+[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://objectstorage.ap-osaka-1.oraclecloud.com/p/VYW4Rc8Q57asWu1DeqUrLkBZ7CMuNe6TsQdCfIsBUEMSLtH6a3zVD5zEwteRYlLW/n/hpc_limited_availability/b/tfoke/o/oke-workers-only.zip&zipUrlVariables={"worker_pool_mode":"Instance","worker_pool_name":"oke-instances"})
 
 <p>
 A set of self-managed Compute Instances for custom user-provisioned worker nodes not managed by an OCI pool, but individually by Terraform.

diff --git a/examples/rms/oke-cluster-only/main.tf b/examples/rms/oke-cluster-only/main.tf
@@ -7,7 +7,7 @@ data "oci_secrets_secretbundle" "ocir" {
 }
 
 module "oke" {
-  source         = "github.com/oracle-terraform-modules/terraform-oci-oke.git?ref=5.x&depth=1"
+  source         = "github.com/oracle-terraform-modules/terraform-oci-oke.git?ref=5.x-tf12&depth=1"
   providers      = { oci.home = oci.home }
   tenancy_id     = var.tenancy_ocid
   compartment_id = var.compartment_ocid

diff --git a/examples/rms/oke-network-only/main.tf b/examples/rms/oke-network-only/main.tf
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 module "oke" {
-  source         = "github.com/oracle-terraform-modules/terraform-oci-oke.git?ref=5.x&depth=1"
+  source         = "github.com/oracle-terraform-modules/terraform-oci-oke.git?ref=5.x&-tf12depth=1"
   providers      = { oci.home = oci.home }
   tenancy_id     = var.tenancy_ocid
   compartment_id = var.compartment_ocid

diff --git a/examples/rms/oke-workers-only/main.tf b/examples/rms/oke-workers-only/main.tf
@@ -12,7 +12,7 @@ locals {
 }
 
 module "oke" {
-  source    = "github.com/oracle-terraform-modules/terraform-oci-oke.git?ref=5.x&depth=1"
+  source    = "github.com/oracle-terraform-modules/terraform-oci-oke.git?ref=5.x-tf12&depth=1"
   providers = { oci.home = oci.home }
 
   # Identity
@@ -53,7 +53,7 @@ module "oke" {
   worker_pool_size = var.worker_pool_size
   worker_pool_mode = lookup({
     "Node Pool"       = "node-pool"
-    "Instances"       = "instances"
+    "Instance"       = "instances"
     "Instance Pool"   = "instance-pool",
     "Cluster Network" = "cluster-network",
   }, var.worker_pool_mode, "node-pool")
@@ -75,7 +75,7 @@ module "oke" {
     format("%v", var.worker_pool_name) = {
       description = lookup({
         "Node Pool"       = "OKE-managed Node Pool"
-        "Instances"       = "Self-managed Instances"
+        "Instance"       = "Self-managed Instances"
         "Instance Pool"   = "Self-managed Instance Pool"
         "Cluster Network" = "Self-managed Cluster Network"
       }, var.worker_pool_mode, "")

diff --git a/examples/rms/oke-workers-only/output.tf b/examples/rms/oke-workers-only/output.tf
@@ -27,8 +27,5 @@ output "worker_image_id" { value = local.worker_image_id }
 output "autoscale" { value = var.autoscale }
 
 output "worker_pool_ids" {
-  value = concat(
-    values(coalesce(module.oke.worker_pool_ids, {})),
-    values(coalesce(module.oke.worker_instance_ids, {})),
-  )
+  value = try(values(coalesce(module.oke.worker_pool_ids, {})), null)
 }
diff --git a/examples/rms/oke-workers-only/schema.yaml b/examples/rms/oke-workers-only/schema.yaml
@@ -249,7 +249,7 @@ variables:
     description: Type of Oracle Cloud Compute resources for the created worker nodes.
     type: enum
     default: Instance Pool
-    enum: [Node Pool, Instances, Instance Pool, Cluster Network]
+    enum: [Node Pool, Instance, Instance Pool, Cluster Network]
     required: true
   worker_pool_size:
     title: Number of worker nodes

diff --git a/examples/rms/oke-workers-only/variables.tf b/examples/rms/oke-workers-only/variables.tf
@@ -38,11 +38,11 @@ variable "kubernetes_version" {
 
 # Worker pools
 variable "worker_pool_mode" {
-  default = "Instances"
+  default = "Instance"
   type    = string
   validation {
-    condition     = contains(["Node Pool", "Instances", "Instance Pool", "Cluster Network"], var.worker_pool_mode)
-    error_message = "Accepted values are Node Pool, Instances, Instance Pool, or Cluster Network"
+    condition     = contains(["Node Pool", "Instance", "Instance Pool", "Cluster Network"], var.worker_pool_mode)
+    error_message = "Accepted values are Node Pool, Instance, Instance Pool, or Cluster Network"
   }
 }
 variable "worker_pool_size" {

diff --git a/modules/bastion/versions.tf b/modules/bastion/versions.tf
@@ -2,6 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 terraform {
+  experiments      = [module_variable_optional_attrs]
   required_version = ">= 1.2.0"
 
   required_providers {

diff --git a/modules/extensions/versions.tf b/modules/extensions/versions.tf
@@ -2,6 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 terraform {
+  experiments      = [module_variable_optional_attrs]
   required_version = ">= 1.2.0"
 
   required_providers {

diff --git a/modules/operator/versions.tf b/modules/operator/versions.tf
@@ -2,6 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 terraform {
+  experiments      = [module_variable_optional_attrs]
   required_version = ">= 1.2.0"
 
   required_providers {

diff --git a/modules/utilities/versions.tf b/modules/utilities/versions.tf
@@ -2,6 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 terraform {
+  experiments      = [module_variable_optional_attrs]
   required_version = ">= 1.2.0"
 
   required_providers {

diff --git a/modules/workers/versions.tf b/modules/workers/versions.tf
@@ -2,7 +2,8 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 terraform {
-  required_version = ">= 1.3.0"
+  experiments      = [module_variable_optional_attrs]
+  required_version = ">= 1.2.0"
 
   required_providers {
     cloudinit = {

diff --git a/versions.tf b/versions.tf
@@ -2,7 +2,8 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 terraform {
-  required_version = ">= 1.3.0"
+  experiments      = [module_variable_optional_attrs]
+  required_version = ">= 1.2.0"
 
   required_providers {
     cloudinit = {