diff --git a/ibm_catalog.json b/ibm_catalog.json index bd205e79..c61996e8 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -226,6 +226,12 @@ { "key": "existing_en_crn" }, + { + "key": "en_source_name" + }, + { + "key": "en_source_description" + }, { "key": "scc_instance_tags" }, @@ -377,51 +383,40 @@ "key": "namespace" }, { - "key": "cluster_name" + "key": "cluster_id", + "custom_config": { + "type": "cluster_var", + "grouping": "deployment", + "original_grouping": "deployment" + } + }, + { + "key": "cluster_resource_group_id", + "custom_config": { + "type": "resource_group", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "identifier": "rg_id" + } + } }, { "key": "access_key" }, { "key": "region", - "options": [ - { - "displayname": "Dallas (us-south)", - "value": "us-south" - }, - { - "displayname": "Frankfurt (eu-de)", - "value": "eu-de" - }, - { - "displayname": "London (eu-gb)", - "value": "eu-gb" - }, - { - "displayname": "Osaka (jp-osa)", - "value": "jp-osa" - }, - { - "displayname": "Sao Paulo (br-sao)", - "value": "br-sao" - }, - { - "displayname": "Sydney (au-syd)", - "value": "au-syd" - }, - { - "displayname": "Tokyo (jp-tok)", - "value": "jp-tok" - }, - { - "displayname": "Toronto (ca-tor)", - "value": "ca-tor" - }, - { - "displayname": "Washington (us-east)", - "value": "us-east" - } - ] + "type": "string", + "custom_config": { + "type": "region", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "showKinds": [ + "region" + ] + } + } }, { "key": "endpoint_type", diff --git a/solutions/agents/main.tf b/solutions/agents/main.tf index c28e03d8..05411b6d 100644 --- a/solutions/agents/main.tf +++ b/solutions/agents/main.tf @@ -6,7 +6,7 @@ module "scc_wp_agent" { source = "terraform-ibm-modules/scc-workload-protection-agent/ibm" version = "1.3.17" access_key = var.access_key - cluster_name = var.cluster_name + cluster_name = var.is_vpc_cluster ? data.ibm_container_vpc_cluster.cluster[0].name : data.ibm_container_cluster.cluster[0].name region = var.region endpoint_type = var.endpoint_type name = var.name @@ -41,6 +41,4 @@ module "scc_wp_agent" { cluster_scanner_imagesbomextractor_requests_memory = var.cluster_scanner_imagesbomextractor_requests_memory cluster_scanner_imagesbomextractor_limits_cpu = var.cluster_scanner_imagesbomextractor_limits_cpu cluster_scanner_imagesbomextractor_limits_memory = var.cluster_scanner_imagesbomextractor_limits_memory - - } diff --git a/solutions/agents/provider.tf b/solutions/agents/provider.tf index 11358be4..18eefa10 100644 --- a/solutions/agents/provider.tf +++ b/solutions/agents/provider.tf @@ -8,8 +8,9 @@ provider "ibm" { } provider "kubernetes" { - host = data.ibm_container_cluster_config.cluster_config.host - token = data.ibm_container_cluster_config.cluster_config.token + host = data.ibm_container_cluster_config.cluster_config.host + token = data.ibm_container_cluster_config.cluster_config.token + cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config.ca_certificate } provider "helm" { @@ -22,20 +23,21 @@ provider "helm" { data "ibm_container_vpc_cluster" "cluster" { count = var.is_vpc_cluster ? 1 : 0 - name = var.cluster_name + name = var.cluster_id wait_till = var.wait_till wait_till_timeout = var.wait_till_timeout } data "ibm_container_cluster" "cluster" { count = var.is_vpc_cluster ? 0 : 1 - name = var.cluster_name + name = var.cluster_id wait_till = var.wait_till wait_till_timeout = var.wait_till_timeout } data "ibm_container_cluster_config" "cluster_config" { - cluster_name_id = var.is_vpc_cluster ? data.ibm_container_vpc_cluster.cluster[0].name : data.ibm_container_cluster.cluster[0].name - config_dir = "${path.module}/kubeconfig" - endpoint_type = var.cluster_endpoint_type + cluster_name_id = var.is_vpc_cluster ? data.ibm_container_vpc_cluster.cluster[0].id : data.ibm_container_cluster.cluster[0].id + config_dir = "${path.module}/kubeconfig" + endpoint_type = var.cluster_endpoint_type + resource_group_id = var.cluster_resource_group_id } diff --git a/solutions/agents/variables.tf b/solutions/agents/variables.tf index 7c33cafd..95bbb0f0 100644 --- a/solutions/agents/variables.tf +++ b/solutions/agents/variables.tf @@ -24,9 +24,14 @@ variable "namespace" { default = "ibm-scc-wp" } -variable "cluster_name" { +variable "cluster_id" { type = string - description = "The cluster name to add the Workload Protection agent to." + description = "The cluster ID to add the Workload Protection agent to." +} + +variable "cluster_resource_group_id" { + type = string + description = "The resource group ID of the cluster." } variable "access_key" { diff --git a/solutions/agents/version.tf b/solutions/agents/version.tf index f985acb1..8f505a35 100644 --- a/solutions/agents/version.tf +++ b/solutions/agents/version.tf @@ -5,7 +5,7 @@ terraform { # Lock DA into an exact provider version - renovate automation will keep it updated ibm = { source = "ibm-cloud/ibm" - version = "1.71.2" + version = "1.71.3" } helm = { source = "hashicorp/helm" diff --git a/solutions/instances/README.md b/solutions/instances/README.md index 6f5210ba..326ea730 100644 --- a/solutions/instances/README.md +++ b/solutions/instances/README.md @@ -18,7 +18,7 @@ This solution supports provisioning and configuring the following infrastructure | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3.0 | -| [ibm](#requirement\_ibm) | 1.71.2 | +| [ibm](#requirement\_ibm) | 1.71.3 | | [time](#requirement\_time) | 0.12.1 | ### Modules @@ -27,7 +27,7 @@ This solution supports provisioning and configuring the following infrastructure |------|--------|---------| | [buckets](#module\_buckets) | terraform-ibm-modules/cos/ibm//modules/buckets | 8.15.1 | | [cos](#module\_cos) | terraform-ibm-modules/cos/ibm//modules/fscloud | 8.15.1 | -| [create\_profile\_attachment](#module\_create\_profile\_attachment) | terraform-ibm-modules/scc/ibm//modules/attachment | 1.8.21 | +| [create\_profile\_attachment](#module\_create\_profile\_attachment) | terraform-ibm-modules/scc/ibm//modules/attachment | 1.8.22 | | [existing\_cos\_crn\_parser](#module\_existing\_cos\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.1.0 | | [existing\_en\_crn\_parser](#module\_existing\_en\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.1.0 | | [existing\_kms\_crn\_parser](#module\_existing\_kms\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.1.0 | @@ -35,21 +35,21 @@ This solution supports provisioning and configuring the following infrastructure | [existing\_scc\_crn\_parser](#module\_existing\_scc\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.1.0 | | [kms](#module\_kms) | terraform-ibm-modules/kms-all-inclusive/ibm | 4.16.11 | | [resource\_group](#module\_resource\_group) | terraform-ibm-modules/resource-group/ibm | 1.1.6 | -| [scc](#module\_scc) | terraform-ibm-modules/scc/ibm | 1.8.21 | +| [scc](#module\_scc) | terraform-ibm-modules/scc/ibm | 1.8.22 | | [scc\_wp](#module\_scc\_wp) | terraform-ibm-modules/scc-workload-protection/ibm | 1.4.2 | ### Resources | Name | Type | |------|------| -| [ibm_en_subscription_email.email_subscription](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.2/docs/resources/en_subscription_email) | resource | -| [ibm_en_topic.en_topic](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.2/docs/resources/en_topic) | resource | -| [ibm_iam_authorization_policy.cos_kms_policy](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.2/docs/resources/iam_authorization_policy) | resource | +| [ibm_en_subscription_email.email_subscription](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.3/docs/resources/en_subscription_email) | resource | +| [ibm_en_topic.en_topic](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.3/docs/resources/en_topic) | resource | +| [ibm_iam_authorization_policy.cos_kms_policy](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.3/docs/resources/iam_authorization_policy) | resource | | [time_sleep.wait_for_authorization_policy](https://registry.terraform.io/providers/hashicorp/time/0.12.1/docs/resources/sleep) | resource | | [time_sleep.wait_for_scc](https://registry.terraform.io/providers/hashicorp/time/0.12.1/docs/resources/sleep) | resource | -| [ibm_en_destinations.en_destinations](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.2/docs/data-sources/en_destinations) | data source | -| [ibm_iam_account_settings.iam_account_settings](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.2/docs/data-sources/iam_account_settings) | data source | -| [ibm_resource_group.group](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.2/docs/data-sources/resource_group) | data source | +| [ibm_en_destinations.en_destinations](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.3/docs/data-sources/en_destinations) | data source | +| [ibm_iam_account_settings.iam_account_settings](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.3/docs/data-sources/iam_account_settings) | data source | +| [ibm_resource_group.group](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.3/docs/data-sources/resource_group) | data source | ### Inputs @@ -61,6 +61,8 @@ This solution supports provisioning and configuring the following infrastructure | [cos\_instance\_name](#input\_cos\_instance\_name) | The name for the Object Storage instance. If a prefix input variable is specified, the prefix is added to the name in the `-` format. | `string` | `"base-security-services-cos"` | no | | [cos\_instance\_tags](#input\_cos\_instance\_tags) | The list of tags to add to the Object Storage instance. Applies only if not specifying an existing instance. | `list(string)` | `[]` | no | | [cos\_region](#input\_cos\_region) | The region for the Object Storage instance. | `string` | `"us-south"` | no | +| [en\_source\_description](#input\_en\_source\_description) | Optional description to give for the Event Notifications integration source. Only used if a value is passed for `en_instance_crn`. | `string` | `null` | no | +| [en\_source\_name](#input\_en\_source\_name) | The source name to use for the Event Notifications integration. Required if a value is passed for `en_instance_crn`. | `string` | `null` | no | | [existing\_activity\_tracker\_crn](#input\_existing\_activity\_tracker\_crn) | The CRN of an Activity Tracker instance to send Security and Compliance Object Storage bucket events to. If no value passed, events are sent to the instance associated to the container's location unless otherwise specified in the Activity Tracker Event Routing service configuration. Ignored if using existing Object Storage bucket. | `string` | `null` | no | | [existing\_cos\_instance\_crn](#input\_existing\_cos\_instance\_crn) | The CRN of an existing Object Storage instance. If not specified, an instance is created. | `string` | `null` | no | | [existing\_en\_crn](#input\_existing\_en\_crn) | The CRN of an Event Notification instance. Used to integrate with Security and Compliance Center. | `string` | `null` | no | diff --git a/solutions/instances/main.tf b/solutions/instances/main.tf index 30c15eec..e05e09fd 100644 --- a/solutions/instances/main.tf +++ b/solutions/instances/main.tf @@ -9,6 +9,8 @@ locals { validate_cos_inputs = var.existing_scc_cos_bucket_name != null && var.existing_scc_cos_kms_key_crn != null ? tobool("A value should not be passed for 'existing_scc_cos_kms_key_crn' when passing a value for 'existing_scc_cos_bucket_name'. A key is only needed when creating a new COS bucket.") : true # tflint-ignore: terraform_unused_declarations validate_auth_inputs = !var.skip_scc_cos_auth_policy && var.existing_cos_instance_crn == null && var.existing_scc_cos_bucket_name != null ? tobool("A value must be passed for 'existing_cos_instance_crn' in order to create auth policy.") : true + # tflint-ignore: terraform_unused_declarations + validate_en_integration = var.existing_en_crn != null && var.en_source_name == null ? tobool("When passing a value for 'existing_en_crn', a value must also be passed for 'en_source_name'.") : false } ####################################################################################################################### @@ -232,7 +234,7 @@ moved { module "scc" { source = "terraform-ibm-modules/scc/ibm" existing_scc_instance_crn = var.existing_scc_instance_crn - version = "1.8.21" + version = "1.8.22" resource_group_id = module.resource_group.resource_group_id region = local.scc_instance_region instance_name = local.scc_instance_name @@ -240,6 +242,8 @@ module "scc" { cos_bucket = local.cos_bucket_name cos_instance_crn = local.cos_instance_crn en_instance_crn = var.existing_en_crn + en_source_name = var.en_source_name + en_source_description = var.en_source_description skip_cos_iam_authorization_policy = var.skip_scc_cos_auth_policy resource_tags = var.scc_instance_tags attach_wp_to_scc_instance = var.provision_scc_workload_protection && var.existing_scc_instance_crn == null @@ -297,7 +301,7 @@ data "ibm_iam_account_settings" "iam_account_settings" {} module "create_profile_attachment" { source = "terraform-ibm-modules/scc/ibm//modules/attachment" - version = "1.8.21" + version = "1.8.22" for_each = { for idx, profile_attachment in var.profile_attachments : profile_attachment => idx diff --git a/solutions/instances/variables.tf b/solutions/instances/variables.tf index 11e19cc7..b593993a 100644 --- a/solutions/instances/variables.tf +++ b/solutions/instances/variables.tf @@ -215,6 +215,18 @@ variable "existing_en_crn" { description = "The CRN of an Event Notification instance. Used to integrate with Security and Compliance Center." } +variable "en_source_name" { + type = string + default = null + description = "The source name to use for the Event Notifications integration. Required if a value is passed for `en_instance_crn`." +} + +variable "en_source_description" { + type = string + default = null + description = "Optional description to give for the Event Notifications integration source. Only used if a value is passed for `en_instance_crn`." +} + variable "scc_instance_tags" { type = list(string) description = "The list of tags to add to the Security and Compliance Center instance." diff --git a/solutions/instances/version.tf b/solutions/instances/version.tf index 181a1279..67e97cf3 100644 --- a/solutions/instances/version.tf +++ b/solutions/instances/version.tf @@ -4,7 +4,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.71.2" + version = "1.71.3" } time = { source = "hashicorp/time" diff --git a/tests/go.mod b/tests/go.mod index 4aca086c..d5d8d814 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,13 +1,13 @@ module github.com/terraform-ibm-modules/terraform-ibm-scc-da -go 1.22.0 +go 1.22.4 toolchain go1.23.3 require ( github.com/gruntwork-io/terratest v0.47.2 - github.com/stretchr/testify v1.9.0 - github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.41.4 + github.com/stretchr/testify v1.10.0 + github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.42.2 ) require ( @@ -19,11 +19,11 @@ require ( dario.cat/mergo v1.0.0 // indirect github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect github.com/IBM-Cloud/power-go-client v1.8.3 // indirect - github.com/IBM/cloud-databases-go-sdk v0.7.0 // indirect + github.com/IBM/cloud-databases-go-sdk v0.7.1 // indirect github.com/IBM/go-sdk-core/v5 v5.18.1 // indirect - github.com/IBM/platform-services-go-sdk v0.71.0 // indirect + github.com/IBM/platform-services-go-sdk v0.71.1 // indirect github.com/IBM/project-go-sdk v0.3.6 // indirect - github.com/IBM/schematics-go-sdk v0.3.0 // indirect + github.com/IBM/schematics-go-sdk v0.4.0 // indirect github.com/IBM/vpc-go-sdk v1.0.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/ProtonMail/go-crypto v1.0.0 // indirect @@ -103,7 +103,7 @@ require ( go.opentelemetry.io/otel/trace v1.16.0 // indirect golang.org/x/crypto v0.29.0 // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.30.0 // indirect golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/sync v0.9.0 // indirect golang.org/x/sys v0.27.0 // indirect diff --git a/tests/go.sum b/tests/go.sum index 946691af..00cd563c 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -193,18 +193,17 @@ github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be h1:USOcBHkYQ4 github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be/go.mod h1:/7hMjdZA6fEpd/dQAOEABxKEwN0t72P3PlpEDu0Y7bE= github.com/IBM-Cloud/power-go-client v1.8.3 h1:QsBuIS6KvKsiEpe0yiHYKhWgXlqkcJ7XqFHtATj8Yh4= github.com/IBM-Cloud/power-go-client v1.8.3/go.mod h1:UDyXeIKEp6r7yWUXYu3r0ZnFSlNZ2YeQTHwM2Tmlgv0= -github.com/IBM/cloud-databases-go-sdk v0.7.0 h1:prvLebKD1kcIk81D6yRhOr/TWp1VQJGLhGAasQr7RtA= -github.com/IBM/cloud-databases-go-sdk v0.7.0/go.mod h1:JYucI1PdwqbAd8XGdDAchxzxRP7bxOh1zUnseovHKsc= +github.com/IBM/cloud-databases-go-sdk v0.7.1 h1:5kK4/3NUsGxZzmuUe+1ftajpOQbeDVh5VeemrPgROP4= +github.com/IBM/cloud-databases-go-sdk v0.7.1/go.mod h1:JYucI1PdwqbAd8XGdDAchxzxRP7bxOh1zUnseovHKsc= github.com/IBM/go-sdk-core/v5 v5.9.2/go.mod h1:YlOwV9LeuclmT/qi/LAK2AsobbAP42veV0j68/rlZsE= -github.com/IBM/go-sdk-core/v5 v5.10.2/go.mod h1:WZPFasUzsKab/2mzt29xPcfruSk5js2ywAPwW4VJjdI= github.com/IBM/go-sdk-core/v5 v5.18.1 h1:wdftQO8xejECTWTKF3FGXyW0McKxxDAopH7MKwA187c= github.com/IBM/go-sdk-core/v5 v5.18.1/go.mod h1:3ywpylZ41WhWPusqtpJZWopYlt2brebcphV7mA2JncU= -github.com/IBM/platform-services-go-sdk v0.71.0 h1:8miTTzH42EO+HslEOc8YWpL+RlJjgezM88R1SxL3fWY= -github.com/IBM/platform-services-go-sdk v0.71.0/go.mod h1:1yvG28ExlZ09gfBPH7flAQ6eZf7kYA4hbEEyYlbT97Y= +github.com/IBM/platform-services-go-sdk v0.71.1 h1:EyqSctlLVqj092yU6K9hyTyx7JIpzhE192n6eG+Daac= +github.com/IBM/platform-services-go-sdk v0.71.1/go.mod h1:ApFkvqw7NaluWJ5Uq+afdM/2jQqo5ILc0SzKSVobYNw= github.com/IBM/project-go-sdk v0.3.6 h1:DRiANKnAePevFsIKSvR89SUaMa2xsd7YKK71Ka1eqKI= github.com/IBM/project-go-sdk v0.3.6/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo= -github.com/IBM/schematics-go-sdk v0.3.0 h1:Vwxw85SONflakiBsNHAfViKLyp9zJiH5/hh6SewOP5Q= -github.com/IBM/schematics-go-sdk v0.3.0/go.mod h1:Tw2OSAPdpC69AxcwoyqcYYaGTTW6YpERF9uNEU+BFRQ= +github.com/IBM/schematics-go-sdk v0.4.0 h1:x01f/tPquYJYLQzJLGuxWfCbV/EdSMXRikOceNy/JLM= +github.com/IBM/schematics-go-sdk v0.4.0/go.mod h1:Xe7R7xgwmXBHu09w2CbBe8lkWZaYxNQo19bS4dpLrUA= github.com/IBM/vpc-go-sdk v1.0.2 h1:WhI1Cb8atA8glUdFg0SEUh9u8afjnKHxZAj9onQBi04= github.com/IBM/vpc-go-sdk v1.0.2/go.mod h1:42NO/XCXsyrYqpvtxoX5xwSEv/jBU1MKEoyaYkIUico= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= @@ -309,7 +308,6 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre github.com/go-openapi/analysis v0.21.5 h1:3tHfEBh6Ia8eKc4M7khOGjPOAlWKJ10d877Cr9teujI= github.com/go-openapi/analysis v0.21.5/go.mod h1:25YcZosX9Lwz2wBsrFrrsL8bmjjXdlyP6zsr2AMy29M= github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk= github.com/go-openapi/errors v0.22.0 h1:c4xY/OLxUBSTiepAg3j/MHuAv5mJhnf53LLMWFB+u/w= github.com/go-openapi/errors v0.22.0/go.mod h1:J3DmZScxCDufmIMsdOuDHxJbdOGC0xtUynjIx092vXE= @@ -324,7 +322,6 @@ github.com/go-openapi/runtime v0.26.0/go.mod h1:QgRGeZwrUcSHdeh4Ka9Glvo0ug1LC5Wy github.com/go-openapi/spec v0.20.12 h1:cgSLbrsmziAP2iais+Vz7kSazwZ8rsUZd6TUzdDgkVI= github.com/go-openapi/spec v0.20.12/go.mod h1:iSCgnBcwbMW9SfzJb8iYynXvcY6C/QFrI7otzF7xGM4= github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= -github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= github.com/go-openapi/strfmt v0.21.7/go.mod h1:adeGTkxE44sPyLk0JV235VQAO/ZXUr8KAzYjclFs3ew= github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c= github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4= @@ -466,7 +463,6 @@ github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVH github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= -github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= @@ -547,7 +543,6 @@ github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= @@ -568,7 +563,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.0/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= github.com/onsi/gomega v1.21.1/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc= @@ -584,8 +578,9 @@ github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRah github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= -github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= +github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= +github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= @@ -620,10 +615,10 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.41.4 h1:Rsgrd3ZO023VGQwNnY1aA0M4Sgxf37hNA1L/y4XTSTE= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.41.4/go.mod h1:dPckfHTc/3woV5F1sKd+rot/4Xvwzkq/DHOJqGs8weo= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.42.2 h1:msLzutNg5j4ZhxqnB7XWLltKOuWXbwSK4h3gvDESGiA= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.42.2/go.mod h1:2Ym23sX1x0WSpp64RbVMfkdL9SCUSnQIcO8JV8xvyZo= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmccombs/hcl2json v0.5.0 h1:cT2sXStOzKL06c8ZTf9vh+0N8GKGzV7+9RUaY5/iUP8= github.com/tmccombs/hcl2json v0.5.0/go.mod h1:B0ZpBthAKbQur6yZRKrtaqDmYLCvgnwHOBApE0faCpU= @@ -648,7 +643,6 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t github.com/zclconf/go-cty v1.15.0 h1:tTCRWxsexYUmtt/wVxgDClUe+uQusuI443uL6e+5sXQ= github.com/zclconf/go-cty v1.15.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= -go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8= go.mongodb.org/mongo-driver v1.11.3/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80= go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= @@ -800,8 +794,8 @@ golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= diff --git a/tests/pr_test.go b/tests/pr_test.go index a7096ba0..6a011e54 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -105,7 +105,8 @@ func TestAgentsInSchematics(t *testing.T) { options.TerraformVars = []testschematic.TestSchematicTerraformVar{ {Name: "ibmcloud_api_key", Value: options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], DataType: "string", Secure: true}, {Name: "access_key", Value: terraform.Output(t, existingTerraformOptions, "access_key"), DataType: "string"}, - {Name: "cluster_name", Value: terraform.Output(t, existingTerraformOptions, "workload_cluster_name"), DataType: "string"}, + {Name: "cluster_id", Value: terraform.Output(t, existingTerraformOptions, "workload_cluster_id"), DataType: "string"}, + {Name: "cluster_resource_group_id", Value: terraform.Output(t, existingTerraformOptions, "cluster_resource_group_id"), DataType: "string"}, {Name: "region", Value: region, DataType: "string"}, {Name: "endpoint_type", Value: "private", DataType: "string"}, {Name: "name", Value: options.Prefix, DataType: "string"}, @@ -251,6 +252,7 @@ func TestRunExistingResourcesInstances(t *testing.T) { "existing_cos_instance_crn": terraform.Output(t, existingTerraformOptions, "cos_crn"), "management_endpoint_type_for_bucket": "public", "existing_en_crn": terraform.Output(t, existingTerraformOptions, "en_crn"), + "en_source_name": prefix, // needs to be unique per EN instance }, }) diff --git a/tests/resources/existing-resources/agents/version.tf b/tests/resources/existing-resources/agents/version.tf index e128ec26..04ed1d11 100644 --- a/tests/resources/existing-resources/agents/version.tf +++ b/tests/resources/existing-resources/agents/version.tf @@ -3,7 +3,7 @@ terraform { required_providers { ibm = { source = "ibm-cloud/ibm" - version = ">= 1.51.0" + version = ">= 1.71.3" } } } diff --git a/tests/resources/existing-resources/instances/version.tf b/tests/resources/existing-resources/instances/version.tf index e128ec26..04ed1d11 100644 --- a/tests/resources/existing-resources/instances/version.tf +++ b/tests/resources/existing-resources/instances/version.tf @@ -3,7 +3,7 @@ terraform { required_providers { ibm = { source = "ibm-cloud/ibm" - version = ">= 1.51.0" + version = ">= 1.71.3" } } } diff --git a/tests/scripts/pre-validation-deploy-slz-roks-and-scc-wp-instances.sh b/tests/scripts/pre-validation-deploy-slz-roks-and-scc-wp-instances.sh index 5b82e73d..2286df94 100755 --- a/tests/scripts/pre-validation-deploy-slz-roks-and-scc-wp-instances.sh +++ b/tests/scripts/pre-validation-deploy-slz-roks-and-scc-wp-instances.sh @@ -27,25 +27,25 @@ TF_VARS_FILE="terraform.tfvars" terraform apply -input=false -auto-approve -var-file=${TF_VARS_FILE} || exit 1 region_var_name="region" - cluster_name_var_name="cluster_name" - cluster_name_value=$(terraform output -state=terraform.tfstate -raw workload_cluster_name) + cluster_id_var_name="cluster_id" + cluster_id_value=$(terraform output -state=terraform.tfstate -raw workload_cluster_id) cluster_resource_group_id_var_name="cluster_resource_group_id" cluster_resource_group_id_value=$(terraform output -state=terraform.tfstate -raw cluster_resource_group_id) access_key_var_name="access_key" access_key_value=$(terraform output -state=terraform.tfstate -raw access_key) - echo "Appending '${cluster_name_var_name}' and '${region_var_name}' input variable values to ${JSON_FILE}.." + echo "Appending '${cluster_id_var_name}' and '${region_var_name}' input variable values to ${JSON_FILE}.." cd "${cwd}" jq -r --arg region_var_name "${region_var_name}" \ --arg region_var_value "${REGION}" \ - --arg cluster_name_var_name "${cluster_name_var_name}" \ - --arg cluster_name_value "${cluster_name_value}" \ + --arg cluster_id_var_name "${cluster_id_var_name}" \ + --arg cluster_id_value "${cluster_id_value}" \ --arg cluster_resource_group_id_var_name "${cluster_resource_group_id_var_name}" \ --arg cluster_resource_group_id_value "${cluster_resource_group_id_value}" \ --arg access_key_var_name "${access_key_var_name}" \ --arg access_key_value "${access_key_value}" \ - '. + {($region_var_name): $region_var_value, ($cluster_name_var_name): $cluster_name_value, ($cluster_resource_group_id_var_name): $cluster_resource_group_id_value, ($access_key_var_name): $access_key_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1 + '. + {($region_var_name): $region_var_value, ($cluster_id_var_name): $cluster_id_value, ($cluster_resource_group_id_var_name): $cluster_resource_group_id_value, ($access_key_var_name): $access_key_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1 echo "Pre-validation complete successfully" )