Skip to content

Commit 1f304a0

Browse files
chore: resolve some inconsistencies in the stack_definition.json (#100)
1 parent 2bc1510 commit 1f304a0

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

stack_definition.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,11 @@
300300
"value": "plus"
301301
},
302302
{
303-
"name": "watson_governance_plan",
303+
"name": "watsonx_governance_plan",
304304
"value": "do not install"
305305
},
306306
{
307-
"name": "project_name",
307+
"name": "watsonx_project_name",
308308
"value": "ref:../../inputs/prefix"
309309
}
310310
]
@@ -357,10 +357,6 @@
357357
"name": "registry_namespace",
358358
"value": "rag-sample-app"
359359
},
360-
{
361-
"name": "registry_namespace_suffix",
362-
"value": "ref:../../inputs/prefix"
363-
},
364360
{
365361
"name": "ci_app_repo_clone_from_url",
366362
"value": "ref:../../inputs/sample_app_git_url"

tests/pr_test.go

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,37 @@ package tests
22

33
import (
44
"github.com/stretchr/testify/assert"
5+
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/common"
56
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testprojects"
67
"testing"
78
)
89

910
func TestProjectsFullTest(t *testing.T) {
10-
t.Skip("Skipping TestProjectsFullTest enabled after all issues are resolved")
1111
options := testprojects.TestProjectOptionsDefault(&testprojects.TestProjectsOptions{
12-
Testing: t,
13-
Prefix: "rag-stack",
14-
ResourceGroup: "",
12+
Testing: t,
13+
Prefix: "rag-stack",
1514
StackConfigurationOrder: []string{
1615
"1 - Account Infrastructure Base",
1716
"2a - Security Service - Key Management",
1817
"2b - Security Service - Secret Manager",
1918
"2c - Security Service - Security Compliance Center",
2019
"3 - Observability - Logging Monitoring Activity Tracker",
2120
"4 - WatsonX SaaS services",
22-
"5 - RAG Sample App - Code Engine Toolchain Config",
21+
"5 - Sample RAG app - Application Lifecycle Management",
2322
"6 - Sample RAG app configuration",
2423
},
2524
})
2625

26+
privateKey, _, kerr := common.GenerateTempGPGKeyPairBase64()
27+
if kerr != nil {
28+
t.Fatal(kerr)
29+
}
2730
options.StackInputs = map[string]interface{}{
28-
"resource_group_name": options.ResourceGroup,
29-
"ibmcloud_api_key": options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"],
30-
"prefix": options.Prefix,
31+
"resource_group_name": options.ResourceGroup,
32+
"ibmcloud_api_key": options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"],
33+
"prefix": options.Prefix,
34+
"signing_key": privateKey,
35+
"secret_manager_service_plan": "standard",
3136
}
3237

3338
err := options.RunProjectsTest()

0 commit comments

Comments
 (0)