From 874e94a1d52723f1cce7f866740560351ffff7a7 Mon Sep 17 00:00:00 2001
From: Timo Furrer <tfurrer@gitlab.com>
Date: Thu, 22 Feb 2024 13:48:16 +0100
Subject: [PATCH] Support OpenTofu 1.6.2

---
 .gitlab-ci.yml                    | 4 ++--
 README.md                         | 4 ++--
 templates/apply.yml               | 4 ++--
 templates/custom-command.yml      | 4 ++--
 templates/destroy.yml             | 4 ++--
 templates/fmt.yml                 | 4 ++--
 templates/full-pipeline.yml       | 4 ++--
 templates/job-templates.yml       | 4 ++--
 templates/plan.yml                | 4 ++--
 templates/validate-plan-apply.yml | 4 ++--
 templates/validate-plan.yml       | 4 ++--
 templates/validate.yml            | 4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 983e270..34c12c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,16 +45,16 @@ stages:
 .opentofu-versions:
   parallel:
     matrix:
+      - OPENTOFU_VERSION: '1.6.2'
       - OPENTOFU_VERSION: '1.6.1'
       - OPENTOFU_VERSION: '1.6.0'
-      - OPENTOFU_VERSION: '1.6.0-rc1'
 
 variables:
   # Pipeline configuration
   DOCKER_DIND_IMAGE: "docker:25.0.3-dind"
 
   # OpenTofu variables
-  LATEST_OPENTOFU_VERSION: '1.6.1'
+  LATEST_OPENTOFU_VERSION: '1.6.2'
 
   # OpenTofu image build variables:
   PLATFORMS: linux/amd64,linux/arm64
diff --git a/README.md b/README.md
index c6a8038..9f538bd 100644
--- a/README.md
+++ b/README.md
@@ -180,7 +180,7 @@ Have a look at the individual template spec to learn about the available inputs.
 | `stage_deploy` | `deploy` | Defines the deploy stage. This stage includes the `apply` job. |
 | `stage_cleanup` | `cleanup` | Defines the cleanup stage. This stage includes the `destroy` and `delete-state` jobs. |
 | `version` | `latest` | Version of this component. Has to be the same as the one in the component include entry. |
-| `opentofu_version` | `1.6.1` | OpenTofu version that should be used. Must be one of `1.6.1`, `1.6.0`, `1.6.0-rc1`. |
+| `opentofu_version` | `1.6.2` | OpenTofu version that should be used. Must be one of `1.6.2`, `1.6.1`, `1.6.0`. |
 | `image_registry_base` | `$CI_REGISTRY/components/opentofu` | Host URI to the job images. Will be combined with `image_name` to construct the actual image URI. |
 | `image_name` | `gitlab-opentofu` | Image name for the job images. Hosted under `image_registry_base`. |
 | `root_dir` | `${CI_PROJECT_DIR}` | Root directory for the OpenTofu project. |
@@ -192,9 +192,9 @@ Have a look at the individual template spec to learn about the available inputs.
 
 The following OpenTofu versions are available with this component via the `opentofu_version` input:
 
+- [`1.6.2`](https://github.com/opentofu/opentofu/releases/tag/v1.6.2)
 - [`1.6.1`](https://github.com/opentofu/opentofu/releases/tag/v1.6.1)
 - [`1.6.0`](https://github.com/opentofu/opentofu/releases/tag/v1.6.0)
-- [`1.6.0-rc1`](https://github.com/opentofu/opentofu/releases/tag/v1.6.0-rc1)
 
 ### Variables
 
diff --git a/templates/apply.yml b/templates/apply.yml
index 9896c11..71cfdf9 100644
--- a/templates/apply.yml
+++ b/templates/apply.yml
@@ -16,12 +16,12 @@ spec:
       description: 'Version of this component. Has to be the same as the one in the component include entry.'
 
     opentofu_version:
-      default: '1.6.1'
+      default: '1.6.2'
       options:
         - '$OPENTOFU_VERSION'
+        - '1.6.2'
         - '1.6.1'
         - '1.6.0'
-        - '1.6.0-rc1'
       description: 'OpenTofu version that should be used.'
 
     # Images
diff --git a/templates/custom-command.yml b/templates/custom-command.yml
index 9afefe2..5bdcc6b 100644
--- a/templates/custom-command.yml
+++ b/templates/custom-command.yml
@@ -16,12 +16,12 @@ spec:
       description: 'Version of this component. Has to be the same as the one in the component include entry.'
 
     opentofu_version:
-      default: '1.6.1'
+      default: '1.6.2'
       options:
         - '$OPENTOFU_VERSION'
+        - '1.6.2'
         - '1.6.1'
         - '1.6.0'
-        - '1.6.0-rc1'
       description: 'OpenTofu version that should be used.'
 
     # Images
diff --git a/templates/destroy.yml b/templates/destroy.yml
index 95c49a3..144f7e3 100644
--- a/templates/destroy.yml
+++ b/templates/destroy.yml
@@ -16,12 +16,12 @@ spec:
       description: 'Version of this component. Has to be the same as the one in the component include entry.'
 
     opentofu_version:
-      default: '1.6.1'
+      default: '1.6.2'
       options:
         - '$OPENTOFU_VERSION'
+        - '1.6.2'
         - '1.6.1'
         - '1.6.0'
-        - '1.6.0-rc1'
       description: 'OpenTofu version that should be used.'
 
     # Images
diff --git a/templates/fmt.yml b/templates/fmt.yml
index 01bf85d..e139f92 100644
--- a/templates/fmt.yml
+++ b/templates/fmt.yml
@@ -16,12 +16,12 @@ spec:
       description: 'Version of this component. Has to be the same as the one in the component include entry.'
 
     opentofu_version:
-      default: '1.6.1'
+      default: '1.6.2'
       options:
         - '$OPENTOFU_VERSION'
+        - '1.6.2'
         - '1.6.1'
         - '1.6.0'
-        - '1.6.0-rc1'
       description: 'OpenTofu version that should be used.'
 
     # Images
diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml
index cebc9dc..a2ae99f 100644
--- a/templates/full-pipeline.yml
+++ b/templates/full-pipeline.yml
@@ -22,12 +22,12 @@ spec:
       description: 'Version of this component. Has to be the same as the one in the component include entry.'
 
     opentofu_version:
-      default: '1.6.1'
+      default: '1.6.2'
       options:
         - '$OPENTOFU_VERSION'
+        - '1.6.2'
         - '1.6.1'
         - '1.6.0'
-        - '1.6.0-rc1'
       description: 'OpenTofu version that should be used.'
 
     # Images
diff --git a/templates/job-templates.yml b/templates/job-templates.yml
index b67f9fb..7a77ef5 100644
--- a/templates/job-templates.yml
+++ b/templates/job-templates.yml
@@ -22,12 +22,12 @@ spec:
       description: 'Version of this component. Has to be the same as the one in the component include entry.'
 
     opentofu_version:
-      default: '1.6.1'
+      default: '1.6.2'
       options:
         - '$OPENTOFU_VERSION'
+        - '1.6.2'
         - '1.6.1'
         - '1.6.0'
-        - '1.6.0-rc1'
       description: 'OpenTofu version that should be used.'
 
     # Images
diff --git a/templates/plan.yml b/templates/plan.yml
index 5f8aea3..9a7d46f 100644
--- a/templates/plan.yml
+++ b/templates/plan.yml
@@ -16,12 +16,12 @@ spec:
       description: 'Version of this component. Has to be the same as the one in the component include entry.'
 
     opentofu_version:
-      default: '1.6.1'
+      default: '1.6.2'
       options:
         - '$OPENTOFU_VERSION'
+        - '1.6.2'
         - '1.6.1'
         - '1.6.0'
-        - '1.6.0-rc1'
       description: 'OpenTofu version that should be used.'
 
     # Images
diff --git a/templates/validate-plan-apply.yml b/templates/validate-plan-apply.yml
index f37014c..acc5bf1 100644
--- a/templates/validate-plan-apply.yml
+++ b/templates/validate-plan-apply.yml
@@ -19,12 +19,12 @@ spec:
       description: 'Version of this component. Has to be the same as the one in the component include entry.'
 
     opentofu_version:
-      default: '1.6.1'
+      default: '1.6.2'
       options:
         - '$OPENTOFU_VERSION'
+        - '1.6.2'
         - '1.6.1'
         - '1.6.0'
-        - '1.6.0-rc1'
       description: 'OpenTofu version that should be used.'
 
     # Images
diff --git a/templates/validate-plan.yml b/templates/validate-plan.yml
index d3274eb..903360a 100644
--- a/templates/validate-plan.yml
+++ b/templates/validate-plan.yml
@@ -16,12 +16,12 @@ spec:
       description: 'Version of this component. Has to be the same as the one in the component include entry.'
 
     opentofu_version:
-      default: '1.6.1'
+      default: '1.6.2'
       options:
         - '$OPENTOFU_VERSION'
+        - '1.6.2'
         - '1.6.1'
         - '1.6.0'
-        - '1.6.0-rc1'
       description: 'OpenTofu version that should be used.'
 
     # Images
diff --git a/templates/validate.yml b/templates/validate.yml
index 75558a8..3fe2b46 100644
--- a/templates/validate.yml
+++ b/templates/validate.yml
@@ -16,12 +16,12 @@ spec:
       description: 'Version of this component. Has to be the same as the one in the component include entry.'
 
     opentofu_version:
-      default: '1.6.1'
+      default: '1.6.2'
       options:
         - '$OPENTOFU_VERSION'
+        - '1.6.2'
         - '1.6.1'
         - '1.6.0'
-        - '1.6.0-rc1'
       description: 'OpenTofu version that should be used.'
 
     # Images
-- 
GitLab