Skip to content
This repository was archived by the owner on Dec 17, 2024. It is now read-only.

Commit 170cd9b

Browse files
authored
fix: updated members to latest versions locators<br>- renamed DA members<br>- added code engine member<br>-update Elasticsearch specs<br>- updated to create SCC attachment based on the AI Security Guardrails 2.0 profile<br>- updated SCC DA to use prefix<br>- existing_en_instance_crn input has been renamed to existing_event_notification_instance_crn<br>- diagram updates<br>- variation has been renamed from Basic to Basic (Deploy on Code Engine)(#31)
1 parent ef8db74 commit 170cd9b

File tree

9 files changed

+135
-1079
lines changed

9 files changed

+135
-1079
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ The automation is configured to deploy a Trial version of Secret Manager by defa
152152
Here are the limitations of the Trial version:
153153
* **Account limitation**: Only one Trial instance of Secret Manager can be deployed at a time in a given account.
154154
* **Deployment error**: You will encounter an error in the Secret Manager deployment step if there is already a Trial instance deployed in the same account.
155-
* **Re-deployment failure**: If the automation provisions a Trial version of Secrets Manager, and is un-deployed and then re-deployed again with the Trial version in the same account, the "5a - Security Service - Secret Manager" deployment will fail. This is because you can only have one Trial version of Secrets Manager in an account, and even after deletion, the prior Trial version of Secrets Manager needs to be removed from the "reclamation" state as well.
155+
* **Re-deployment failure**: If the automation provisions a Trial version of Secrets Manager, and is un-deployed and then re-deployed again with the Trial version in the same account, the "Essential Security - Secrets Manager" deployment will fail. This is because you can only have one Trial version of Secrets Manager in an account, and even after deletion, the prior Trial version of Secrets Manager needs to be removed from the "reclamation" state as well.
156156

157157

158158
**What are reclamations?**

ibm_catalog.json

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@
5757
"support_details": "This product is in the community registry, as such support is handled through the originated repo. If you experience issues please open an issue in that repository [https://github.com/terraform-ibm-modules/stack-retrieval-augmented-generation/issues](https://github.com/terraform-ibm-modules/stack-retrieval-augmented-generation/issues). Please note this product is not supported via the IBM Cloud Support Center.",
5858
"flavors": [
5959
{
60-
"label": "Basic",
60+
"label": "Basic (Deploy on Code Engine)",
6161
"name": "basic",
6262
"working_directory": "solutions/basic",
6363
"compliance": {
6464
"authority": "scc-v3",
6565
"profiles": [
6666
{
67-
"profile_name": "AI ICT Guardrails",
67+
"profile_name": "AI Security Guardrails 2.0",
6868
"profile_version": "1.0.0"
6969
}
7070
]
@@ -143,14 +143,14 @@
143143
{
144144
"service_name": "databases-for-elasticsearch",
145145
"role_crns": [
146-
"crn:v1:bluemix:public:iam::::role:Editor"
146+
"crn:v1:bluemix:public:iam::::role:Editor"
147147
]
148148
},
149149
{
150150
"service_name": "event-notifications",
151151
"role_crns": [
152-
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
153-
"crn:v1:bluemix:public:iam::::role:Editor"
152+
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
153+
"crn:v1:bluemix:public:iam::::role:Editor"
154154
]
155155
}
156156
],
@@ -180,19 +180,19 @@
180180
"diagrams": [
181181
{
182182
"diagram": {
183-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-retrieval-augmented-generation/main/reference-architecture/RAG Pattern v2-part-2.svg",
183+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/dev-rag/main/reference-architecture/rag-pattern.svg",
184184
"caption": "Reference architecture",
185185
"type": "image/svg+xml",
186-
"thumbnail_url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-retrieval-augmented-generation/main/reference-architecture/RAG Pattern v2-part-2.svg"
186+
"thumbnail_url": "https://raw.githubusercontent.com/terraform-ibm-modules/dev-rag/main/reference-architecture/rag-pattern.svg"
187187
},
188188
"description": "Reference architecture"
189189
},
190190
{
191191
"diagram": {
192-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-retrieval-augmented-generation/main/reference-architecture/rag-stack.svg",
192+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/dev-rag/main/reference-architecture/rag-stack.svg",
193193
"caption": "Solution components",
194194
"type": "image/svg+xml",
195-
"thumbnail_url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-retrieval-augmented-generation/main/reference-architecture/rag-stack.svg"
195+
"thumbnail_url": "https://raw.githubusercontent.com/terraform-ibm-modules/dev-rag/main/reference-architecture/rag-stack.svg"
196196
},
197197
"description": "Solution components"
198198
}
@@ -246,13 +246,13 @@
246246
"key": "resource_group_name",
247247
"type": "string",
248248
"default_value": "rag-services",
249-
"description": "The name of the resource group that is created by this solution. The actual name is prefixed with the value of the input 'prefix'. All resources created by this solution are deployed in this resource group. ",
249+
"description": "The name of the resource group that is created by this solution. The actual name is prefixed with the value of the input 'prefix'. All resources created by this solution are deployed in this resource group.",
250250
"required": false
251251
}, {
252252
"key": "existing_resource_group_name",
253253
"type": "string",
254254
"default_value": "__NULL__",
255-
"description": "The name of an existing resource group that is used by this solution. Prefix is NOT used for existing resource group. All resources created by this solution are deployed in this resource group. ",
255+
"description": "The name of an existing resource group that is used by this solution, takes precedence over resource_group_name. Prefix is NOT used for existing resource group. All resources created by this solution are deployed in this resource group.",
256256
"required": false
257257
},
258258
{
@@ -307,29 +307,12 @@
307307
"required": false
308308
},
309309
{
310-
"key": "existing_en_instance_crn",
310+
"key": "existing_event_notification_instance_crn",
311311
"type": "string",
312312
"default_value": "__NULL__",
313313
"description": "The CRN of an existing event notification instance to use in this solution. If not set, a new event notification instance is provisioned.",
314314
"required": false
315315
},
316-
{
317-
"key": "elasticsearch_plan",
318-
"type": "string",
319-
"default_value": "enterprise",
320-
"description": "The pricing plan for the Databases for Elasticsearch instance.",
321-
"required": false,
322-
"options": [
323-
{
324-
"displayname": "Enterprise",
325-
"value": "enterprise"
326-
},
327-
{
328-
"displayname": "Platinum",
329-
"value": "platinum"
330-
}
331-
]
332-
},
333316
{
334317
"key": "existing_discovery_instance",
335318
"type": "string",
@@ -366,7 +349,7 @@
366349
"required": false
367350
},
368351
{
369-
"key": "existing_db_instance_crn",
352+
"key": "existing_elasticsearch_instance_crn",
370353
"type": "string",
371354
"default_value": "__NULL__",
372355
"description": "The CRN of an existing elasticsearch instance to use in this solution. If not set, a new elasticsearch instance is provisioned.",
@@ -376,19 +359,19 @@
376359
"outputs": [
377360
{
378361
"key": "elasticsearch_hostname",
379-
"description": "Elasticsearch instance hostname."
362+
"description": "The hostname of the Elasticsearch instance."
380363
},
381364
{
382365
"key": "elasticsearch_port",
383-
"description": "Elasticsearch instance port."
366+
"description": "The port of the Elasticsearch instance."
384367
},
385368
{
386369
"key": "elasticsearch_service_credentials_json",
387-
"description": "Elasticsearch instance service credentials json map."
370+
"description": "The service credentials of the Elasticsearch instance."
388371
},
389372
{
390373
"key": "elasticsearch_crn",
391-
"description": "Elasticsearch instance crn."
374+
"description": "The CRN of the Elasticsearch instance."
392375
},
393376
{
394377
"key": "watsonx_project_url",

reference-architecture/RAG Pattern v2-part-2.svg

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

reference-architecture/rag-pattern.svg

Lines changed: 4 additions & 0 deletions
Loading

reference-architecture/rag-stack.svg

Lines changed: 1 addition & 1 deletion
Loading

sample_deploy_config.json

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

0 commit comments

Comments
 (0)