Skip to content

Commit 64527d9

Browse files
chore(deps): update ci dependencies (#1026)
--------- Co-authored-by: stafaniasaju <stafania.saju@ibm.com>
1 parent 00572f5 commit 64527d9

File tree

4 files changed

+11
-101
lines changed

4 files changed

+11
-101
lines changed

.secrets.baseline

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2025-03-21T14:01:55Z",
6+
"generated_at": "2025-03-24T12:46:53Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -118,7 +118,7 @@
118118
"hashed_secret": "fa501f2ceec739604d621b521446b88d41a7f76b",
119119
"is_secret": false,
120120
"is_verified": false,
121-
"line_number": 88,
121+
"line_number": 71,
122122
"type": "Secret Keyword",
123123
"verified_result": null
124124
}

tests/common-go-assets/cloudinfo-region-power-prefs.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/pr_test.go

Lines changed: 8 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -48,37 +48,20 @@ func TestMain(m *testing.M) {
4848
os.Exit(m.Run())
4949
}
5050

51-
func setupOptionsStandardSolution(t *testing.T, prefix string) *testhelper.TestOptions {
51+
func setupOptionsStandardSolution(t *testing.T, prefix string, powervs_zone string) *testhelper.TestOptions {
5252

5353
options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
54-
Testing: t,
55-
TerraformDir: defaultExampleTerraformDir,
56-
Prefix: prefix,
57-
ResourceGroup: resourceGroup,
58-
Region: "us-south", // specify default region to skip best choice query
59-
DefaultRegion: "dal10",
60-
BestRegionYAMLPath: "./common-go-assets/cloudinfo-region-power-prefs.yaml", // specific to powervs zones
61-
// temporary workaround for BSS backend issue
62-
ImplicitDestroy: []string{
63-
"module.standard.module.landing_zone.module.landing_zone.ibm_resource_group.resource_groups",
64-
},
54+
Testing: t,
55+
TerraformDir: defaultExampleTerraformDir,
56+
Prefix: prefix,
57+
ResourceGroup: resourceGroup,
58+
Region: powervs_zone,
6559
})
6660

67-
// query for best zone to deploy powervs example, based on current connection count
68-
// NOTE: this is why we do not want to run multiple tests in parallel.
69-
options.Region, _ = testhelper.GetBestPowerSystemsRegionO(options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], options.BestRegionYAMLPath, options.DefaultRegion,
70-
testhelper.TesthelperTerraformOptions{CloudInfoService: sharedInfoSvc})
71-
// if for any reason the region is empty at this point, such as error, use default
72-
if len(options.Region) == 0 {
73-
options.Region = options.DefaultRegion
74-
}
75-
7661
options.TerraformVars = map[string]interface{}{
7762
"prefix": options.Prefix,
7863
"powervs_resource_group_name": options.ResourceGroup,
7964
"external_access_ip": "0.0.0.0/0",
80-
// locking into syd05 due to other data center issues
81-
//"powervs_zone": "syd05",
8265
"powervs_zone": options.Region,
8366
"existing_sm_instance_guid": permanentResources["secretsManagerGuid"],
8467
"existing_sm_instance_region": permanentResources["secretsManagerRegion"],
@@ -94,7 +77,7 @@ func setupOptionsStandardSolution(t *testing.T, prefix string) *testhelper.TestO
9477
func TestRunBranchStandardExample(t *testing.T) {
9578
t.Parallel()
9679

97-
options := setupOptionsStandardSolution(t, "pvs-i-b")
80+
options := setupOptionsStandardSolution(t, "pvs-i-b", "osa21")
9881

9982
output, err := options.RunTestConsistency()
10083
assert.Nil(t, err, "This should not have errored")
@@ -103,77 +86,11 @@ func TestRunBranchStandardExample(t *testing.T) {
10386

10487
func TestRunMainStandardExample(t *testing.T) {
10588
t.Parallel()
106-
options := setupOptionsStandardSolution(t, "pvs-i-m")
107-
108-
output, err := options.RunTestUpgrade()
109-
if !options.UpgradeTestSkipped {
110-
assert.Nil(t, err, "This should not have errored")
111-
assert.NotNil(t, output, "Expected some output")
112-
}
113-
}
114-
115-
/*
116-
// quickstart =standard-plus-vsi
117-
func setupOptionsQuickstartSolution(t *testing.T, prefix string) *testhelper.TestOptions {
118-
119-
options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
120-
Testing: t,
121-
TerraformDir: quickstartExampleTerraformDir,
122-
Prefix: prefix,
123-
ResourceGroup: resourceGroup,
124-
Region: "us-south", // specify default region to skip best choice query
125-
DefaultRegion: "dal10",
126-
BestRegionYAMLPath: "./common-go-assets/cloudinfo-region-power-prefs.yaml", // specific to powervs zones
127-
// temporary workaround for BSS backend issue
128-
ImplicitDestroy: []string{
129-
"module.standard.module.landing_zone.module.landing_zone.ibm_resource_group.resource_groups",
130-
},
131-
})
132-
133-
// query for best zone to deploy powervs example, based on current connection count
134-
// NOTE: this is why we do not want to run multiple tests in parallel.
135-
options.Region, _ = testhelper.GetBestPowerSystemsRegionO(options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], options.BestRegionYAMLPath, options.DefaultRegion,
136-
testhelper.TesthelperTerraformOptions{CloudInfoService: sharedInfoSvc})
137-
// if for any reason the region is empty at this point, such as error, use default
138-
if len(options.Region) == 0 {
139-
options.Region = options.DefaultRegion
140-
}
141-
142-
options.TerraformVars = map[string]interface{}{
143-
"prefix": options.Prefix,
144-
"powervs_resource_group_name": options.ResourceGroup,
145-
"external_access_ip": "0.0.0.0/0",
146-
"tshirt_size": map[string]string{
147-
"image": "7300-02-02",
148-
"tshirt_size": "aix_xs",
149-
},
150-
"powervs_zone": options.Region,
151-
"existing_sm_instance_guid": permanentResources["secretsManagerGuid"],
152-
"existing_sm_instance_region": permanentResources["secretsManagerRegion"],
153-
}
154-
155-
return options
156-
}
157-
158-
func TestRunBranchQuickstartExample(t *testing.T) {
159-
t.Parallel()
160-
161-
options := setupOptionsQuickstartSolution(t, "pvs-qs-b")
162-
163-
output, err := options.RunTestConsistency()
164-
assert.Nil(t, err, "This should not have errored")
165-
assert.NotNil(t, output, "Expected some output")
166-
}
167-
168-
func TestRunMainQuickstartExample(t *testing.T) {
169-
t.Parallel()
170-
options := setupOptionsQuickstartSolution(t, "pvs-qs-m")
89+
options := setupOptionsStandardSolution(t, "pvs-i-m", "dal10")
17190

17291
output, err := options.RunTestUpgrade()
17392
if !options.UpgradeTestSkipped {
17493
assert.Nil(t, err, "This should not have errored")
17594
assert.NotNil(t, output, "Expected some output")
17695
}
177-
17896
}
179-
*/

0 commit comments

Comments
 (0)