From a8d25619f9aa62fe1c73707c942e668dc44244c7 Mon Sep 17 00:00:00 2001
From: Timo Furrer <tfurrer@gitlab.com>
Date: Mon, 29 Jan 2024 15:09:07 +0100
Subject: [PATCH] Rephrase backports notes
---
backports/.Base.latest.gitlab-ci.yml | 5 +++--
backports/OpenTofu/Base.latest.gitlab-ci.yml | 7 ++++---
templates/plan.yml | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/backports/.Base.latest.gitlab-ci.yml b/backports/.Base.latest.gitlab-ci.yml
index 5e7066f..9cee4fc 100644
--- a/backports/.Base.latest.gitlab-ci.yml
+++ b/backports/.Base.latest.gitlab-ci.yml
@@ -2,11 +2,12 @@
# https://gitlab.com/components/opentofu
# It is generated with the `make backports` command from that project.
#
-# Please make sure to use the component when your project is hosted on GitLab.com
+# Please make sure to use the component (https://gitlab.com/components/opentofu)
+# when your project is hosted on GitLab.com
# or when you are willing to mirror the component project into your self-managed
# instance and use it from there.
#
-# Attention: This template will be removed in favor of the OpenTofu CI/CD component as soon as components
+# Attention: This template will be removed in favor of the OpenTofu CI/CD component following components
# are available for self-managed instances.
#
# This specific template is located at:
diff --git a/backports/OpenTofu/Base.latest.gitlab-ci.yml b/backports/OpenTofu/Base.latest.gitlab-ci.yml
index 4e978fc..2ca5904 100644
--- a/backports/OpenTofu/Base.latest.gitlab-ci.yml
+++ b/backports/OpenTofu/Base.latest.gitlab-ci.yml
@@ -2,11 +2,12 @@
# https://gitlab.com/components/opentofu
# It is generated with the `make backports` command from that project.
#
-# Please make sure to use the component when your project is hosted on GitLab.com
+# Please make sure to use the component (https://gitlab.com/components/opentofu)
+# when your project is hosted on GitLab.com
# or when you are willing to mirror the component project into your self-managed
# instance and use it from there.
#
-# Attention: This template will be removed in favor of the OpenTofu CI/CD component as soon as components
+# Attention: This template will be removed in favor of the OpenTofu CI/CD component following components
# are available for self-managed instances.
#
# This specific template is located at:
@@ -88,7 +89,7 @@ opentofu:use-component-instead-of-template:
'.opentofu:plan':
stage: build
- environment:
+ environment:
name: $TF_STATE_NAME
action: prepare
resource_group: $TF_STATE_NAME
diff --git a/templates/plan.yml b/templates/plan.yml
index 061d4c5..6cc5b6c 100644
--- a/templates/plan.yml
+++ b/templates/plan.yml
@@ -47,7 +47,7 @@ spec:
'$[[ inputs.as ]]':
stage: $[[ inputs.stage ]]
- environment:
+ environment:
name: $[[ inputs.state_name ]]
action: prepare
resource_group: $[[ inputs.state_name ]]
--
GitLab