From d8b2d65f6b8baf5fea0db454db8b93cdc77eae4a Mon Sep 17 00:00:00 2001 From: Keith Harvey Date: Fri, 16 Jun 2023 07:21:16 +0100 Subject: [PATCH 1/3] Resman - bump GH TF version to coincide with module requirements (#1) Bootstrap was bumped in #1414 --- fast/stages/1-resman/templates/workflow-github.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fast/stages/1-resman/templates/workflow-github.yaml b/fast/stages/1-resman/templates/workflow-github.yaml index 41c51411de..9fe63d2377 100644 --- a/fast/stages/1-resman/templates/workflow-github.yaml +++ b/fast/stages/1-resman/templates/workflow-github.yaml @@ -30,7 +30,7 @@ env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock TF_PROVIDERS_FILE: ${tf_providers_file} TF_VAR_FILES: ${tf_var_files == [] ? "''" : join("\n ", tf_var_files)} - TF_VERSION: 1.3.2 + TF_VERSION: 1.4.4 jobs: fast-pr: From a07be4c907e4ab101976ca73ebca2cd816593680 Mon Sep 17 00:00:00 2001 From: Keith Harvey Date: Fri, 16 Jun 2023 07:55:15 +0100 Subject: [PATCH 2/3] Bump TF version in all workflow files --- fast/assets/templates/workflow-github.yaml | 2 +- fast/assets/templates/workflow-sourcerepo.yaml | 2 +- .../0-bootstrap-tenant/templates/workflow-github.yaml | 2 +- .../1-resman-tenant/templates/workflow-github.yaml | 2 +- .../1-resman-tenant/templates/workflow-sourcerepo.yaml | 2 +- fast/stages/0-bootstrap/templates/workflow-sourcerepo.yaml | 2 +- fast/stages/1-resman/templates/workflow-sourcerepo.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fast/assets/templates/workflow-github.yaml b/fast/assets/templates/workflow-github.yaml index 8a946d84c8..2ae456d933 100644 --- a/fast/assets/templates/workflow-github.yaml +++ b/fast/assets/templates/workflow-github.yaml @@ -30,7 +30,7 @@ env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock TF_PROVIDERS_FILE: ${tf_providers_file} TF_VAR_FILES: ${tf_var_files == [] ? "''" : join("\n ", tf_var_files)} - TF_VERSION: 1.3.2 + TF_VERSION: 1.4.4 jobs: fast-pr: diff --git a/fast/assets/templates/workflow-sourcerepo.yaml b/fast/assets/templates/workflow-sourcerepo.yaml index 446c9c9605..6dd15e8cf5 100644 --- a/fast/assets/templates/workflow-sourcerepo.yaml +++ b/fast/assets/templates/workflow-sourcerepo.yaml @@ -95,4 +95,4 @@ substitutions: _FAST_OUTPUTS_BUCKET: ${outputs_bucket} _TF_PROVIDERS_FILE: ${tf_providers_file} _TF_VAR_FILES: ${tf_var_files == [] ? "''" : join("\n ", tf_var_files)} - _TF_VERSION: 1.3.2 + _TF_VERSION: 1.4.4 diff --git a/fast/stages-multitenant/0-bootstrap-tenant/templates/workflow-github.yaml b/fast/stages-multitenant/0-bootstrap-tenant/templates/workflow-github.yaml index 364ee8f467..9a1c81a1c3 100644 --- a/fast/stages-multitenant/0-bootstrap-tenant/templates/workflow-github.yaml +++ b/fast/stages-multitenant/0-bootstrap-tenant/templates/workflow-github.yaml @@ -32,7 +32,7 @@ env: TF_PROVIDERS_FILE: ${tf_providers_file} %{~ endif ~} TF_VAR_FILES: ${tf_var_files == [] ? "''" : join("\n ", tf_var_files)} - TF_VERSION: 1.3.2 + TF_VERSION: 1.4.4 jobs: fast-pr: diff --git a/fast/stages-multitenant/1-resman-tenant/templates/workflow-github.yaml b/fast/stages-multitenant/1-resman-tenant/templates/workflow-github.yaml index e966990921..3f456bec1b 100644 --- a/fast/stages-multitenant/1-resman-tenant/templates/workflow-github.yaml +++ b/fast/stages-multitenant/1-resman-tenant/templates/workflow-github.yaml @@ -30,7 +30,7 @@ env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock TF_PROVIDERS_FILE: ${tf_providers_file} TF_VAR_FILES: ${tf_var_files == [] ? "''" : join("\n ", tf_var_files)} - TF_VERSION: 1.3.2 + TF_VERSION: 1.4.4 jobs: fast-pr: diff --git a/fast/stages-multitenant/1-resman-tenant/templates/workflow-sourcerepo.yaml b/fast/stages-multitenant/1-resman-tenant/templates/workflow-sourcerepo.yaml index 446c9c9605..6dd15e8cf5 100644 --- a/fast/stages-multitenant/1-resman-tenant/templates/workflow-sourcerepo.yaml +++ b/fast/stages-multitenant/1-resman-tenant/templates/workflow-sourcerepo.yaml @@ -95,4 +95,4 @@ substitutions: _FAST_OUTPUTS_BUCKET: ${outputs_bucket} _TF_PROVIDERS_FILE: ${tf_providers_file} _TF_VAR_FILES: ${tf_var_files == [] ? "''" : join("\n ", tf_var_files)} - _TF_VERSION: 1.3.2 + _TF_VERSION: 1.4.4 diff --git a/fast/stages/0-bootstrap/templates/workflow-sourcerepo.yaml b/fast/stages/0-bootstrap/templates/workflow-sourcerepo.yaml index 446c9c9605..6dd15e8cf5 100644 --- a/fast/stages/0-bootstrap/templates/workflow-sourcerepo.yaml +++ b/fast/stages/0-bootstrap/templates/workflow-sourcerepo.yaml @@ -95,4 +95,4 @@ substitutions: _FAST_OUTPUTS_BUCKET: ${outputs_bucket} _TF_PROVIDERS_FILE: ${tf_providers_file} _TF_VAR_FILES: ${tf_var_files == [] ? "''" : join("\n ", tf_var_files)} - _TF_VERSION: 1.3.2 + _TF_VERSION: 1.4.4 diff --git a/fast/stages/1-resman/templates/workflow-sourcerepo.yaml b/fast/stages/1-resman/templates/workflow-sourcerepo.yaml index 446c9c9605..6dd15e8cf5 100644 --- a/fast/stages/1-resman/templates/workflow-sourcerepo.yaml +++ b/fast/stages/1-resman/templates/workflow-sourcerepo.yaml @@ -95,4 +95,4 @@ substitutions: _FAST_OUTPUTS_BUCKET: ${outputs_bucket} _TF_PROVIDERS_FILE: ${tf_providers_file} _TF_VAR_FILES: ${tf_var_files == [] ? "''" : join("\n ", tf_var_files)} - _TF_VERSION: 1.3.2 + _TF_VERSION: 1.4.4 From c4b973136caaeedf10bc245c81f86a7cbca8b93c Mon Sep 17 00:00:00 2001 From: Keith Harvey Date: Fri, 16 Jun 2023 07:58:57 +0100 Subject: [PATCH 3/3] bump TF version in missed workflow file --- .../0-bootstrap-tenant/templates/workflow-sourcerepo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fast/stages-multitenant/0-bootstrap-tenant/templates/workflow-sourcerepo.yaml b/fast/stages-multitenant/0-bootstrap-tenant/templates/workflow-sourcerepo.yaml index e171c45e75..9d22399da4 100644 --- a/fast/stages-multitenant/0-bootstrap-tenant/templates/workflow-sourcerepo.yaml +++ b/fast/stages-multitenant/0-bootstrap-tenant/templates/workflow-sourcerepo.yaml @@ -97,4 +97,4 @@ substitutions: _FAST_OUTPUTS_BUCKET: ${outputs_bucket} _TF_PROVIDERS_FILE: ${tf_providers_file} _TF_VAR_FILES: ${tf_var_files == [] ? "''" : join("\n ", tf_var_files)} - _TF_VERSION: 1.3.2 + _TF_VERSION: 1.4.4