Skip to content

Commit 906b668

Browse files
andreainnocentiandreainnocenti
authored
feat: changed default plans and allowed regions (#22)
* changed default plans and allowed regions * changed default plans and allowed regions * fixed test * fixed test
1 parent 2bb51ba commit 906b668

File tree

9 files changed

+66
-97
lines changed

9 files changed

+66
-97
lines changed

‎.catalog-onboard-pipeline.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,16 @@ apiVersion: v1
33
offerings:
44
- name: deploy-arch-ibm-watsonx-ai-saas
55
kind: solution
6-
catalog_id: b5c105a0-04ac-4418-ab2a-3696f7f1d96d
7-
offering_id: 268199b0-46f8-4717-83ce-600e292c5361
6+
catalog_id: 8bfb1293-8b85-4d3f-a89f-015d0a0719df
7+
offering_id: e8ad6597-8c1a-466a-8bb7-243a109daaa8
88
variations:
99
- name: standard
1010
mark_ready: true
1111
install_type: fullstack
12+
validation_type: projects
13+
project_id: "4b85a2bb-6051-42dd-81ce-b2dd9d3dcaba"
14+
target_account_name: "watson-da-account"
15+
destroy_resources_on_failure: false
16+
destroy_workspace_on_failure: false
17+
import_only: false
18+
validation_rg: validation

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ statement instead the previous block.
151151
| <a name="input_watson_assistant_plan"></a> [watson\_assistant\_plan](#input\_watson\_assistant\_plan) | Resource plan used to provision the watsonx Assistance instance. | `string` | `"do not install"` | no |
152152
| <a name="input_watson_discovery_plan"></a> [watson\_discovery\_plan](#input\_watson\_discovery\_plan) | Resource plan used to provision the Watson Discovery instance. | `string` | `"do not install"` | no |
153153
| <a name="input_watson_governance_plan"></a> [watson\_governance\_plan](#input\_watson\_governance\_plan) | Resource plan used to provision the watsonx Governance instance. | `string` | `"do not install"` | no |
154-
| <a name="input_watson_machine_learning_plan"></a> [watson\_machine\_learning\_plan](#input\_watson\_machine\_learning\_plan) | Resource plan used to provision the Watson Machine Learning instance. | `string` | `"lite"` | no |
155-
| <a name="input_watson_studio_plan"></a> [watson\_studio\_plan](#input\_watson\_studio\_plan) | Resource plan used to provision the Watson Studio instance. | `string` | `"free-v1"` | no |
154+
| <a name="input_watson_machine_learning_plan"></a> [watson\_machine\_learning\_plan](#input\_watson\_machine\_learning\_plan) | Resource plan used to provision the Watson Machine Learning instance. | `string` | `"v2-standard"` | no |
155+
| <a name="input_watson_studio_plan"></a> [watson\_studio\_plan](#input\_watson\_studio\_plan) | Resource plan used to provision the Watson Studio instance. | `string` | `"professional-v1"` | no |
156156

157157
### Outputs
158158

‎catalogValidationValues.json.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
22
"ibmcloud_api_key": $VALIDATION_APIKEY,
3+
"use_existing_resource_group": true,
4+
"resource_prefix": $PREFIX,
5+
"resource_group_name": "validation",
6+
"region": "us-south",
37
}

‎examples/basic/main.tf

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ resource "random_string" "unique_identifier" {
1111

1212

1313
module "watson_saas" {
14-
source = "../.."
15-
ibmcloud_api_key = var.ibmcloud_api_key
16-
resource_prefix = "example-basic-test"
17-
resource_group_name = local.unique_identifier
18-
project_name = "project-basic-test"
14+
source = "../.."
15+
ibmcloud_api_key = var.ibmcloud_api_key
16+
resource_prefix = "example-basic-test"
17+
use_existing_resource_group = "false"
18+
resource_group_name = local.unique_identifier
19+
project_name = "project-basic-test"
1920
}

‎examples/basic/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ variable "location" {
99
description = "Used with the Terraform IBM-Cloud/ibm provider as well as resource creation."
1010
type = string
1111
validation {
12-
condition = contains(["au-syd", "br-sao", "ca-tor", "eu-de", "eu-gb", "jp-osa", "jp-tok", "us-east", "us-south"], var.location)
13-
error_message = "The IBM Cloud location to use must be one of: au-syd, br-sao, ca-tor, eu-de, eu-gb, jp-osa, jp-tok, us-east, or us-south"
12+
condition = contains(["eu-de", "us-south"], var.location)
13+
error_message = "The IBM Cloud location to use must be one of: eu-de or us-south"
1414
}
1515
}

‎examples/complete/main.tf

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ resource "random_string" "unique_identifier" {
1111

1212

1313
module "watson_saas" {
14-
source = "../.."
15-
ibmcloud_api_key = var.ibmcloud_api_key
16-
resource_group_name = local.unique_identifier
17-
resource_prefix = "example-complete-test"
18-
project_name = "project-complete-test"
19-
watson_discovery_plan = "plus"
20-
watson_assistant_plan = "plus"
21-
watson_governance_plan = "standard-v2"
22-
location = "eu-de"
14+
source = "../.."
15+
ibmcloud_api_key = var.ibmcloud_api_key
16+
use_existing_resource_group = "false"
17+
resource_group_name = local.unique_identifier
18+
resource_prefix = "example-complete-test"
19+
project_name = "project-complete-test"
20+
watson_discovery_plan = "plus"
21+
watson_assistant_plan = "plus"
22+
watson_governance_plan = "essentials"
23+
location = "us-south"
2324
}

‎examples/complete/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ variable "location" {
99
description = "Used with the Terraform IBM-Cloud/ibm provider as well as resource creation."
1010
type = string
1111
validation {
12-
condition = contains(["au-syd", "br-sao", "ca-tor", "eu-de", "eu-gb", "jp-osa", "jp-tok", "us-east", "us-south"], var.location)
13-
error_message = "The IBM Cloud location to use must be one of: au-syd, br-sao, ca-tor, eu-de, eu-gb, jp-osa, jp-tok, us-east, or us-south"
12+
condition = contains(["eu-de", "us-south"], var.location)
13+
error_message = "The IBM Cloud location to use must be one of: eu-de or us-south"
1414
}
1515
}

‎ibm_catalog.json

Lines changed: 20 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -77,41 +77,13 @@
7777
"type": "string",
7878
"default_value": "us-south",
7979
"options": [
80-
{
81-
"displayname": "au-syd",
82-
"value": "au-syd"
83-
},
84-
{
85-
"displayname": "br-sao",
86-
"value": "br-sao"
87-
},
88-
{
89-
"displayname": "ca-tor",
90-
"value": "ca-tor"
91-
},
9280
{
9381
"displayname": "eu-de",
9482
"value": "eu-de"
9583
},
96-
{
97-
"displayname": "eu-gb",
98-
"value": "eu-gb"
99-
},
100-
{
101-
"displayname": "jp-osa",
102-
"value": "jp-osa"
103-
},
104-
{
105-
"displayname": "jp-tok",
106-
"value": "jp-tok"
107-
},
10884
{
10985
"displayname": "us-south",
11086
"value": "us-south"
111-
},
112-
{
113-
"displayname": "us-east",
114-
"value": "us-east"
11587
}
11688
],
11789
"custom_config": {
@@ -135,22 +107,18 @@
135107
{
136108
"key": "watson_machine_learning_plan",
137109
"type": "string",
138-
"default_value": "lite",
110+
"default_value": "v2-standard",
139111
"options": [
140112
{
141-
"displayname": "lite",
113+
"displayname": "Lite",
142114
"value": "lite"
143115
},
144116
{
145-
"displayname": "professional",
146-
"value": "professional"
147-
},
148-
{
149-
"displayname": "v2-professional",
117+
"displayname": "Standard",
150118
"value": "v2-professional"
151119
},
152120
{
153-
"displayname": "v2-standard",
121+
"displayname": "Essentials",
154122
"value": "v2-standard"
155123
}
156124
],
@@ -161,27 +129,15 @@
161129
{
162130
"key": "watson_studio_plan",
163131
"type": "string",
164-
"default_value": "free-v1",
132+
"default_value": "professional-v1",
165133
"options": [
166134
{
167-
"displayname": "free-v1",
135+
"displayname": "Lite",
168136
"value": "free-v1"
169137
},
170138
{
171-
"displayname": "professional-v1",
139+
"displayname": "Professional",
172140
"value": "professional-v1"
173-
},
174-
{
175-
"displayname": "standard-v1",
176-
"value": "standard-v1"
177-
},
178-
{
179-
"displayname": "sqo-enterprise-v2",
180-
"value": "sqo-enterprise-v2"
181-
},
182-
{
183-
"displayname": "enterprise-v2",
184-
"value": "enterprise-v2"
185141
}
186142
],
187143
"custom_config": {
@@ -198,15 +154,15 @@
198154
"value": "do not install"
199155
},
200156
{
201-
"displayname": "plus",
157+
"displayname": "Plus",
202158
"value": "plus"
203159
},
204160
{
205-
"displayname": "enterprise",
161+
"displayname": "Enterprise",
206162
"value": "enterprise"
207163
},
208164
{
209-
"displayname": "premium",
165+
"displayname": "Premium",
210166
"value": "premium"
211167
}
212168
],
@@ -224,20 +180,24 @@
224180
"value": "do not install"
225181
},
226182
{
227-
"displayname": "free",
183+
"displayname": "Lite",
228184
"value": "free"
229185
},
230186
{
231-
"displayname": "plus-trial",
187+
"displayname": "Trial",
232188
"value": "plus-trial"
233189
},
234190
{
235-
"displayname": "plus",
191+
"displayname": "Plus",
236192
"value": "plus"
237193
},
238194
{
239-
"displayname": "enterprise",
195+
"displayname": "Enterprise",
240196
"value": "enterprise"
197+
},
198+
{
199+
"displayname": "Enterprise with data isolation",
200+
"value": "enterprisedataisolation"
241201
}
242202
],
243203
"custom_config": {
@@ -254,15 +214,11 @@
254214
"value": "do not install"
255215
},
256216
{
257-
"displayname": "lite",
217+
"displayname": "Lite",
258218
"value": "lite"
259219
},
260220
{
261-
"displayname": "standard-v2",
262-
"value": "standard-v2"
263-
},
264-
{
265-
"displayname": "essentials",
221+
"displayname": "Essentials",
266222
"value": "essentials"
267223
}
268224
],

‎variables.tf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ variable "location" {
99
description = "Used with the Terraform IBM-Cloud/ibm provider as well as resource creation."
1010
type = string
1111
validation {
12-
condition = contains(["au-syd", "br-sao", "ca-tor", "eu-de", "eu-gb", "jp-osa", "jp-tok", "us-east", "us-south"], var.location)
13-
error_message = "The IBM Cloud location to use must be one of: au-syd, br-sao, ca-tor, eu-de, eu-gb, jp-osa, jp-tok, us-east, or us-south"
12+
condition = contains(["eu-de", "us-south"], var.location)
13+
error_message = "The IBM Cloud location to use must be one of: eu-de or us-south"
1414
}
1515
}
1616

@@ -47,22 +47,22 @@ variable "cos_plan" {
4747
}
4848

4949
variable "watson_machine_learning_plan" {
50-
default = "lite"
50+
default = "v2-standard"
5151
description = "Resource plan used to provision the Watson Machine Learning instance."
5252
type = string
5353
validation {
54-
condition = contains(["lite", "professional", "v2-professional", "v2-standard"], var.watson_machine_learning_plan)
55-
error_message = "The plan to use must be one of: lite, professional, v2-professional or v2-standard"
54+
condition = contains(["lite", "v2-professional", "v2-standard"], var.watson_machine_learning_plan)
55+
error_message = "The plan to use must be one of: lite, v2-professional or v2-standard"
5656
}
5757
}
5858

5959
variable "watson_studio_plan" {
60-
default = "free-v1"
60+
default = "professional-v1"
6161
description = "Resource plan used to provision the Watson Studio instance."
6262
type = string
6363
validation {
64-
condition = contains(["free-v1", "professional-v1", "standard-v1", "sqo-enterprise-v2", "enterprise-v2"], var.watson_studio_plan)
65-
error_message = "The plan to use must be one of: free-v1, professional-v1, standard-v1, sqo-enterprise-v2 or enterprise-v2"
64+
condition = contains(["free-v1", "professional-v1"], var.watson_studio_plan)
65+
error_message = "The plan to use must be one of: free-v1 or professional-v1"
6666
}
6767
}
6868

@@ -92,8 +92,9 @@ variable "watson_assistant_plan" {
9292
var.watson_assistant_plan == "plus-trial",
9393
var.watson_assistant_plan == "plus",
9494
var.watson_assistant_plan == "enterprise",
95+
var.watson_assistant_plan == "enterprisedataisolation",
9596
])
96-
error_message = "The plan to use must be one of: free, trial, plus-trial or enterprise"
97+
error_message = "The plan to use must be one of: free, trial, plus-trial, enterprise or enterprisedataisolation"
9798
}
9899
}
99100

@@ -105,10 +106,9 @@ variable "watson_governance_plan" {
105106
condition = anytrue([
106107
var.watson_governance_plan == "do not install",
107108
var.watson_governance_plan == "lite",
108-
var.watson_governance_plan == "standard-v2",
109109
var.watson_governance_plan == "essentials",
110110
])
111-
error_message = "The plan to use must be one of: lite, standard-v2 or essentials"
111+
error_message = "The plan to use must be one of: lite or essentials"
112112
}
113113
}
114114

0 commit comments

Comments
 (0)