Skip to content

Commit d171891

Browse files
feat: Init (#1)
* add repo settings * add catalog onboarding * add stack * Update settings.yml disable admin enforcement * fix json * update release pipeline
1 parent 602c6ae commit d171891

File tree

9 files changed

+105
-18
lines changed

9 files changed

+105
-18
lines changed

.catalog-onboard-pipeline.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
apiVersion: v1
3+
offerings:
4+
- name: Mock-Stack
5+
kind: solution
6+
catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
7+
offering_id: 5f33db8b-9758-4099-80c3-8683b9475946
8+
variations:
9+
- name: Standard
10+
mark_ready: false
11+
install_type: fullstack
12+
format_kind: stack
13+
validation_type: projects
14+
scc:
15+
instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
16+
region: us-south

.github/settings.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ repository:
1515
# By changing this field, you rename the repository.
1616

1717
# Uncomment this name property and set the name to the current repo name.
18-
# name: ""
18+
name: "stack-ibm-mock"
1919

2020
# The description is displayed under the repository name on the
2121
# organization page and in the 'About' section of the repository.
2222

2323
# Uncomment this description property
2424
# and update the description to the current repo description.
25-
# description: ""
25+
description: "Sample mock stack for testing"
2626

2727
# Use a comma-separated list of topics to set on the repo (ensure not to use any caps in the topic string).
2828
topics: terraform, ibm-cloud, terraform-stack, ibm-cloud-stack
29+
branches:
30+
- name: main
31+
protection:
32+
enforce_admins: false

.releaserc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
["@semantic-release/git", {
99
"assets": "false"
1010
}],
11-
["@semantic-release/exec", {
12-
"successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV"
13-
}]
11+
["@semantic-release/exec", {
12+
"successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV",
13+
"publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=v${nextRelease.version}"
14+
}]
1415
]
1516
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"ibmcloud_api_key": $VALIDATION_APIKEY,
3+
"resource_group_name": $RG_NAME
4+
}

ibm_catalog.json

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,39 @@
11
{
22
"products": [
33
{
4-
"label": "stack-template",
5-
"name": "stack-template",
4+
"label": "Mock-Stack",
5+
"name": "Mock-Stack",
66
"product_kind": "solution",
77
"tags": [
88
"converged_infra"
99
],
1010
"offering_icon_url": "https://globalcatalog.cloud.ibm.com/api/v1/1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc/artifacts/solution.svg",
1111
"flavors": [
1212
{
13-
"compliance": {},
14-
"architecture": {}
13+
"label": "Standard",
14+
"name": "standard",
15+
"architecture": {
16+
"diagrams": [
17+
{
18+
"diagram": {
19+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-retrieval-augmented-generation/main/reference-architecture/RAG%20Pattern%20v2-part-2.svg",
20+
"caption": "sd",
21+
"type": "image/svg+xml",
22+
"thumbnail_url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-retrieval-augmented-generation/main/reference-architecture/RAG%20Pattern%20v2-part-2.svg"
23+
},
24+
"description": "ds"
25+
}
26+
]
27+
},
28+
"configuration": [
29+
{
30+
"key": "resource_group_name",
31+
"type": "string",
32+
"default_value": "Default",
33+
"required": false
34+
}
35+
],
36+
"install_type": "fullstack"
1537
}
1638
]
1739
}

reference-architectures/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# reference-architectures
2+
3+
Add reference architecture documentation and diagrams here.

stack_definition.json

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,20 @@
1313
"hidden": false
1414
}
1515
],
16+
"outputs": [
17+
{
18+
"name": "1a-primary-da",
19+
"value": "ref:../../members/1a-primary-da/outputs/resource_group"
20+
},
21+
{
22+
"name": "1b-primary-da",
23+
"value": "ref:../../members/1a-primary-da/outputs/resource_group"
24+
},
25+
{
26+
"name": "secondary-da",
27+
"value": "ref:../../members/secondary-da/outputs/resource_group"
28+
}
29+
],
1630
"members": [
1731
{
1832
"inputs": [
@@ -37,8 +51,8 @@
3751
"value": "ref:../../inputs/ibmcloud_api_key"
3852
}
3953
],
40-
"name": "primary-da",
41-
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.a8887a40-ff3f-4ee8-bcfe-bcfd55360074"
54+
"name": "1a-primary-da",
55+
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.2f03cf1d-3bc8-44fd-bff7-f4345f4b2337"
4256
},
4357
{
4458
"inputs": [
@@ -54,6 +68,32 @@
5468
"name": "testing",
5569
"value": "__NULL__"
5670
},
71+
{
72+
"name": "prefix",
73+
"value": "primary"
74+
},
75+
{
76+
"name": "ibmcloud_api_key",
77+
"value": "ref:../../inputs/ibmcloud_api_key"
78+
}
79+
],
80+
"name": "1b-primary-da",
81+
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.2f03cf1d-3bc8-44fd-bff7-f4345f4b2337"
82+
},
83+
{
84+
"inputs": [
85+
{
86+
"name": "resource_group",
87+
"value": "ref:../../members/1a-primary-da/outputs/resource_group"
88+
},
89+
{
90+
"name": "resource_tags",
91+
"value": "[]"
92+
},
93+
{
94+
"name": "testing",
95+
"value": "__NULL__"
96+
},
5797
{
5898
"name": "prefix",
5999
"value": "secondary"
@@ -64,7 +104,7 @@
64104
}
65105
],
66106
"name": "secondary-da",
67-
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.a8887a40-ff3f-4ee8-bcfe-bcfd55360074"
107+
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.2f03cf1d-3bc8-44fd-bff7-f4345f4b2337"
68108
}
69109
]
70110
}

tests/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/terraform-ibm-modules/stack-ibm-template
1+
module github.com/terraform-ibm-modules/stack-ibm-mock
22

33
go 1.21
44

tests/pr_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@ import (
1111
func TestProjectsFullTest(t *testing.T) {
1212

1313
options := testprojects.TestProjectOptionsDefault(&testprojects.TestProjectsOptions{
14-
Testing: t,
15-
StackConfigurationOrder: []string{
16-
"primary-da",
17-
"secondary-da",
18-
},
14+
Testing: t,
15+
ParallelDeploy: true,
1916
})
2017
options.StackMemberInputs = map[string]map[string]interface{}{
2118
"primary-da": {

0 commit comments

Comments
 (0)