Skip to content

Commit 02f6ae1

Browse files
piyush117piyush117
committed
Merge branch 'main' of https://github.com/terraform-ibm-modules/terraform-ibm-watsonx-ai into da-overview-text
2 parents 62c132a + 65cfec7 commit 02f6ae1

File tree

8 files changed

+34
-46
lines changed

8 files changed

+34
-46
lines changed

‎examples/basic/version.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ terraform {
33
required_providers {
44
ibm = {
55
source = "IBM-Cloud/ibm"
6-
version = ">= 1.66.0"
6+
version = ">= 1.70.1"
77
}
88
restapi = {
99
source = "Mastercard/restapi"
10-
version = "1.20.0"
10+
version = "2.0.1"
1111
}
1212
}
1313
}

‎examples/complete/version.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ terraform {
33
required_providers {
44
ibm = {
55
source = "IBM-Cloud/ibm"
6-
version = ">= 1.66.0"
6+
version = ">= 1.70.1"
77
}
88
restapi = {
99
source = "Mastercard/restapi"
10-
version = "1.20.0"
10+
version = ">= 2.0.1"
1111
}
1212
}
1313
}

‎modules/configure_project/main.tf‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
resource "restapi_object" "configure_project" {
2-
path = local.dataplatform_api
3-
read_path = "${local.dataplatform_api}{id}"
4-
read_method = "GET"
5-
create_path = "${local.dataplatform_api}/transactional/v2/projects?verify_unique_name=true"
6-
create_method = "POST"
7-
id_attribute = "location"
8-
destroy_method = "DELETE"
9-
destroy_path = "${local.dataplatform_api}/transactional{id}"
10-
data = <<-EOT
2+
path = local.dataplatform_api
3+
read_path = "${local.dataplatform_api}{id}"
4+
read_method = "GET"
5+
create_path = "${local.dataplatform_api}/transactional/v2/projects?verify_unique_name=true"
6+
create_method = "POST"
7+
id_attribute = "location"
8+
ignore_all_server_changes = true
9+
destroy_method = "DELETE"
10+
destroy_path = "${local.dataplatform_api}/transactional{id}"
11+
data = <<-EOT
1112
{
1213
"name": "${var.project_name}",
1314
"generator": "terraform-ibm-watsonx-ai",
@@ -36,9 +37,9 @@ resource "restapi_object" "configure_project" {
3637
}
3738
}
3839
EOT
39-
update_method = "PATCH"
40-
update_path = "${local.dataplatform_api}{id}"
41-
update_data = <<-EOT
40+
update_method = "PATCH"
41+
update_path = "${local.dataplatform_api}{id}"
42+
update_data = <<-EOT
4243
{
4344
"name": "${var.project_name}",
4445
"type": "wx",

‎modules/configure_project/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33
required_providers {
44
restapi = {
55
source = "Mastercard/restapi"
6-
version = ">= 1.19.1"
6+
version = ">= 2.0.1, < 3.0.0"
77
}
88
time = {
99
source = "hashicorp/time"

‎modules/storage_delegation/main.tf‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,18 @@ resource "time_sleep" "wait_for_authorization_policy" {
6868
}
6969

7070
resource "restapi_object" "storage_delegation" {
71-
depends_on = [time_sleep.wait_for_authorization_policy]
72-
path = "//${local.dataplatform_ui}/api/rest/v1/storage-delegations"
73-
read_path = "//${local.dataplatform_ui}/api/rest/v1/storage-delegations/{id}"
74-
read_method = "GET"
75-
create_path = "//${local.dataplatform_ui}/api/rest/v1/storage-delegations"
76-
create_method = "POST"
77-
id_attribute = var.cos_instance_guid
78-
object_id = var.cos_instance_guid
79-
destroy_method = "DELETE"
80-
destroy_path = "//${local.dataplatform_ui}/api/rest/v1/storage-delegations/{id}"
81-
data = <<-EOT
71+
depends_on = [time_sleep.wait_for_authorization_policy]
72+
path = "//${local.dataplatform_ui}/api/rest/v1/storage-delegations"
73+
read_path = "//${local.dataplatform_ui}/api/rest/v1/storage-delegations/{id}"
74+
read_method = "GET"
75+
create_path = "//${local.dataplatform_ui}/api/rest/v1/storage-delegations"
76+
create_method = "POST"
77+
id_attribute = var.cos_instance_guid
78+
object_id = var.cos_instance_guid
79+
ignore_all_server_changes = true
80+
destroy_method = "DELETE"
81+
destroy_path = "//${local.dataplatform_ui}/api/rest/v1/storage-delegations/{id}"
82+
data = <<-EOT
8283
{
8384
"cos_instance_id": "${var.cos_instance_guid}",
8485
"kms_key_crn": "${var.cos_kms_key_crn}",

‎modules/storage_delegation/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
restapi = {
66
source = "Mastercard/restapi"
7-
version = ">= 1.19.1"
7+
version = ">= 2.0.1, < 3.0.0"
88
}
99
ibm = {
1010
source = "IBM-Cloud/ibm"

‎renovate.json‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": ["github>terraform-ibm-modules/common-dev-assets:commonRenovateConfig"],
4-
"packageRules": [
5-
{
6-
"description": "Allow the locked in provider version to be updated to the latest for deployable architectures",
7-
"enabled": true,
8-
"matchFileNames": ["solutions/**"],
9-
"matchManagers": ["terraform"],
10-
"matchDepTypes": ["required_provider"],
11-
"rangeStrategy": "bump",
12-
"semanticCommitType": "fix",
13-
"group": true,
14-
"groupName": "required_provider",
15-
"commitMessageExtra": "to latest for the deployable architecture solution"
16-
}
17-
]
3+
"extends": ["github>terraform-ibm-modules/common-dev-assets:commonRenovateConfig"]
184
}

‎solutions/fully-configurable/version.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ terraform {
44
required_providers {
55
ibm = {
66
source = "IBM-Cloud/ibm"
7-
version = "1.80.4"
7+
version = "1.85.0"
88
}
99
restapi = {
1010
source = "Mastercard/restapi"
11-
version = "1.20.0"
11+
version = "2.0.1"
1212
}
1313
time = {
1414
source = "hashicorp/time"

0 commit comments

Comments
 (0)