From e4b6f30e4e4ea266fb3155893091215dae9459d2 Mon Sep 17 00:00:00 2001 From: akocbek Date: Wed, 29 Oct 2025 16:35:32 +0000 Subject: [PATCH 1/2] fix(deps): update DA to run on terraform v1.12.2 --- common-dev-assets | 2 +- ibm_catalog.json | 4 ++-- tests/pr_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common-dev-assets b/common-dev-assets index ae23e021..3cfd2b62 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit ae23e021950779a9c0612e71ce51d074f14b7543 +Subproject commit 3cfd2b622d864175e7979de6885a65b4fb4ab6db diff --git a/ibm_catalog.json b/ibm_catalog.json index 30a1a7d4..5855f18f 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1310,7 +1310,7 @@ } ], "dependency_version_2": true, - "terraform_version": "1.10.5", + "terraform_version": "1.12.2", "ignore_readme": true }, { @@ -1548,7 +1548,7 @@ } ], "dependency_version_2": true, - "terraform_version": "1.10.5", + "terraform_version": "1.12.2", "ignore_readme": true } ] diff --git a/tests/pr_test.go b/tests/pr_test.go index b58033a3..46d5ad4e 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -35,7 +35,7 @@ const ocpVersion1 = "4.19" // used by TestRunFullyConfigurable, const ocpVersion2 = "4.18" // used by TestCustomSGExample and TestRunCustomsgExample const ocpVersion3 = "4.17" // used by TestRunAdvancedExample and TestCrossKmsSupportExample const ocpVersion4 = "4.16" // used by TestRunAddRulesToSGExample and TestRunBasicExample -const terraformVersion = "terraform_v1.10" // This should match the version in the ibm_catalog.json +const terraformVersion = "terraform_v1.12.2" // This should match the version in the ibm_catalog.json var ( sharedInfoSvc *cloudinfo.CloudInfoService From 07f88c600b445cf5a63f701e45bfd4bfe9cda06b Mon Sep 17 00:00:00 2001 From: akocbek Date: Wed, 29 Oct 2025 20:36:07 +0000 Subject: [PATCH 2/2] fmt go file --- tests/pr_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/pr_test.go b/tests/pr_test.go index 46d5ad4e..d9b9eace 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -31,10 +31,10 @@ const resourceGroup = "geretain-test-base-ocp-vpc" const yamlLocation = "../common-dev-assets/common-go-assets/common-permanent-resources.yaml" // Ensure there is one test per supported OCP version -const ocpVersion1 = "4.19" // used by TestRunFullyConfigurable, TestRunUpgradeFullyConfigurable, TestFSCloudInSchematic and TestRunMultiClusterExample -const ocpVersion2 = "4.18" // used by TestCustomSGExample and TestRunCustomsgExample -const ocpVersion3 = "4.17" // used by TestRunAdvancedExample and TestCrossKmsSupportExample -const ocpVersion4 = "4.16" // used by TestRunAddRulesToSGExample and TestRunBasicExample +const ocpVersion1 = "4.19" // used by TestRunFullyConfigurable, TestRunUpgradeFullyConfigurable, TestFSCloudInSchematic and TestRunMultiClusterExample +const ocpVersion2 = "4.18" // used by TestCustomSGExample and TestRunCustomsgExample +const ocpVersion3 = "4.17" // used by TestRunAdvancedExample and TestCrossKmsSupportExample +const ocpVersion4 = "4.16" // used by TestRunAddRulesToSGExample and TestRunBasicExample const terraformVersion = "terraform_v1.12.2" // This should match the version in the ibm_catalog.json var (