From e95172e85c07a1f60640f90c97082e49eac68b88 Mon Sep 17 00:00:00 2001 From: HarasztiaPeter Date: Thu, 19 Dec 2024 03:52:59 +0100 Subject: [PATCH] Fix supported patterns and extended tests (#5811) * fix(partner center sell): fix supported attributes option Signed-off-by: Peter Harasztia * fix(partner center sell): extend tests Signed-off-by: Peter Harasztia * fix iam test Signed-off-by: Peter Harasztia * fix merge conflict Signed-off-by: Peter Harasztia --------- Signed-off-by: Peter Harasztia --- examples/ibm-partner-center-sell/main.tf | 2 +- go.mod | 2 +- go.sum | 4 +- ...ource_ibm_onboarding_catalog_deployment.go | 2 +- ..._ibm_onboarding_catalog_deployment_test.go | 116 +++++- .../resource_ibm_onboarding_catalog_plan.go | 2 +- ...source_ibm_onboarding_catalog_plan_test.go | 106 +++++- ...resource_ibm_onboarding_catalog_product.go | 2 +- ...rce_ibm_onboarding_catalog_product_test.go | 220 +++++++++++- ...esource_ibm_onboarding_iam_registration.go | 22 +- ...ce_ibm_onboarding_iam_registration_test.go | 333 +++++++++++++++++- .../resource_ibm_onboarding_product.go | 2 +- .../resource_ibm_onboarding_registration.go | 2 +- ...resource_ibm_onboarding_resource_broker.go | 2 +- .../onboarding_iam_registration.html.markdown | 6 +- 15 files changed, 757 insertions(+), 66 deletions(-) diff --git a/examples/ibm-partner-center-sell/main.tf b/examples/ibm-partner-center-sell/main.tf index e85565de2d..9bc4fc9923 100644 --- a/examples/ibm-partner-center-sell/main.tf +++ b/examples/ibm-partner-center-sell/main.tf @@ -354,7 +354,7 @@ resource "ibm_onboarding_iam_registration" "onboarding_iam_registration_instance options { operators = [ "stringEquals" ] hidden = true - supported_attributes = [ "supported_attributes" ] + supported_patterns = [ "supported_patterns" ] policy_types = [ "access" ] is_empty_value_supported = true is_string_exists_false_value_supported = true diff --git a/go.mod b/go.mod index 5cb28140e7..5f28ac1d48 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/IBM/logs-router-go-sdk v1.0.5 github.com/IBM/mqcloud-go-sdk v0.2.0 github.com/IBM/networking-go-sdk v0.49.0 - github.com/IBM/platform-services-go-sdk v0.70.0 + github.com/IBM/platform-services-go-sdk v0.71.1 github.com/IBM/project-go-sdk v0.3.5 github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5 github.com/IBM/sarama v1.41.2 diff --git a/go.sum b/go.sum index 2951cc3378..15c17f91c9 100644 --- a/go.sum +++ b/go.sum @@ -155,8 +155,8 @@ github.com/IBM/mqcloud-go-sdk v0.2.0 h1:QOWk8ZGk0QfIL0MOGTKzNdM3Qe0Hk+ifAFtNSFQo github.com/IBM/mqcloud-go-sdk v0.2.0/go.mod h1:VZQKMtqmcdXKhmLhLiPuS/UHMs/5yo2tA/nD83cQt9E= github.com/IBM/networking-go-sdk v0.49.0 h1:lPS34u3C0JVrbxH+Ulua76Nwl6Frv8BEfq6LRkyvOv0= github.com/IBM/networking-go-sdk v0.49.0/go.mod h1:G9CKbmPE8gSLjN+ABh4hIZ1bMx076enl5Eekvj6zQnA= -github.com/IBM/platform-services-go-sdk v0.70.0 h1:G/jEzG/8SEEc+ZDXqAsPGPWcWD2UGy99LBhPX5iiD2E= -github.com/IBM/platform-services-go-sdk v0.70.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.5 h1:L+YClFUa14foS0B/hOOY9n7sIdsT5/XQicnXOyJSpyM= github.com/IBM/project-go-sdk v0.3.5/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo= github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5 h1:NPUhkoOCRuv3OFWt19PmwjXGGTKlvmbuPg9fUrBUNe4= diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment.go b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment.go index d885b25af1..00486adbed 100644 --- a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment.go +++ b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment.go @@ -2,7 +2,7 @@ // Licensed under the Mozilla Public License v2.0 /* - * IBM OpenAPI Terraform Generator Version: 3.96.0-d6dec9d7-20241008-212902 + * IBM OpenAPI Terraform Generator Version: 3.97.0-0e90eab1-20241120-170029 */ package partnercentersell diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment_test.go b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment_test.go index 94969554c8..4c533f287c 100644 --- a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment_test.go +++ b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment_test.go @@ -85,6 +85,18 @@ func TestAccIbmOnboardingCatalogDeploymentAllArgs(t *testing.T) { activeUpdate := "false" disabledUpdate := "false" kindUpdate := "deployment" + overviewUiEn := "display_name" + overviewUiEnUpdate := "display_name_2" + rcCompatible := "true" + rcCompatibleUpdate := "false" + iamCompatible := "true" + iamCompatibleUpdate := "false" + deploymentBrokerName := "broker-petra-1" + deploymentBrokerNameUpdate := "broker-petra-2" + bulletTitleName := "title" + bulletTitleNameUpdate := "title-2" + mediaCaption := "Some random minecraft Video" + mediaCaptionUpdate := "Some random minecraft Video 2" resource.Test(t, resource.TestCase{ PreCheck: func() { acc.TestAccPreCheckPartnerCenterSell(t) }, @@ -92,7 +104,7 @@ func TestAccIbmOnboardingCatalogDeploymentAllArgs(t *testing.T) { CheckDestroy: testAccCheckIbmOnboardingCatalogDeploymentDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccCheckIbmOnboardingCatalogDeploymentConfig(productID, catalogProductID, catalogPlanID, env, name, active, disabled, kind, objectId), + Config: testAccCheckIbmOnboardingCatalogDeploymentConfig(productID, catalogProductID, catalogPlanID, env, name, active, disabled, kind, objectId, overviewUiEn, rcCompatible, iamCompatible, deploymentBrokerName, bulletTitleName, mediaCaption), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckIbmOnboardingCatalogDeploymentExists("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", conf), resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "product_id", productID), @@ -103,10 +115,12 @@ func TestAccIbmOnboardingCatalogDeploymentAllArgs(t *testing.T) { resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "active", active), resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "disabled", disabled), resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "kind", kind), + resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "overview_ui.en.display_name", overviewUiEn), + resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "metadata.rc_compatible", rcCompatible), ), }, resource.TestStep{ - Config: testAccCheckIbmOnboardingCatalogDeploymentConfig(productID, catalogProductID, catalogPlanID, envUpdate, nameUpdate, activeUpdate, disabledUpdate, kindUpdate, objectId), + Config: testAccCheckIbmOnboardingCatalogDeploymentUpdateConfig(productID, catalogProductID, catalogPlanID, envUpdate, nameUpdate, activeUpdate, disabledUpdate, kindUpdate, objectId, overviewUiEnUpdate, rcCompatibleUpdate, iamCompatibleUpdate, deploymentBrokerNameUpdate, bulletTitleNameUpdate, mediaCaptionUpdate), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "product_id", productID), resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "catalog_product_id", catalogProductID), @@ -116,6 +130,8 @@ func TestAccIbmOnboardingCatalogDeploymentAllArgs(t *testing.T) { resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "active", activeUpdate), resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "disabled", disabledUpdate), resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "kind", kindUpdate), + resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "overview_ui.en.display_name", overviewUiEnUpdate), + resource.TestCheckResourceAttr("ibm_onboarding_catalog_deployment.onboarding_catalog_deployment_instance", "metadata.rc_compatible", rcCompatibleUpdate), ), }, resource.TestStep{ @@ -153,11 +169,12 @@ func testAccCheckIbmOnboardingCatalogDeploymentConfigBasic(productID string, cat } rc_compatible = false } + } `, productID, catalogProductID, catalogPlanID, name, active, disabled, kind, objectId) } -func testAccCheckIbmOnboardingCatalogDeploymentConfig(productID string, catalogProductID string, catalogPlanID string, env string, name string, active string, disabled string, kind string, objectId string) string { +func testAccCheckIbmOnboardingCatalogDeploymentConfig(productID string, catalogProductID string, catalogPlanID string, env string, name string, active string, disabled string, kind string, objectId string, overviewUiEn string, rcCompatible string, iamCompatible string, deploymentBrokerName string, bulletTitleName string, mediaCaption string) string { return fmt.Sprintf(` resource "ibm_onboarding_catalog_deployment" "onboarding_catalog_deployment_instance" { product_id = "%s" @@ -171,7 +188,7 @@ func testAccCheckIbmOnboardingCatalogDeploymentConfig(productID string, catalogP object_id = "%s" overview_ui { en { - display_name = "display_name" + display_name = "%s" description = "description" long_description = "long_description" } @@ -182,27 +199,106 @@ func testAccCheckIbmOnboardingCatalogDeploymentConfig(productID string, catalogP email = "email@email.com" } metadata { - rc_compatible = true + rc_compatible = "%s" service { rc_provisionable = true - iam_compatible = true + iam_compatible = "%s" + } + deployment { + broker { + name = "%s" + guid = "guid" + } + location = "ams03" + location_url = "https://globalcatalog.test.cloud.ibm.com/api/v1/ams03" + target_crn = "crn:v1:staging:public::ams03:::environment:staging-ams03" } ui { - hidden = true - side_by_side_index = 1.0 + strings { + en { + bullets { + title = "%s" + description = "some1" + } + media { + type = "youtube" + url = "https://www.youtube.com/embed/HtkpMgNFYtE" + caption = "%s" + } + } + } + } + } + } + `, productID, catalogProductID, catalogPlanID, env, name, active, disabled, kind, objectId, overviewUiEn, rcCompatible, iamCompatible, deploymentBrokerName, bulletTitleName, mediaCaption) +} + +func testAccCheckIbmOnboardingCatalogDeploymentUpdateConfig(productID string, catalogProductID string, catalogPlanID string, env string, name string, active string, disabled string, kind string, objectId string, overviewUiEn string, rcCompatible string, iamCompatible string, deploymentBrokerName string, bulletTitleName string, mediaCaption string) string { + return fmt.Sprintf(` + resource "ibm_onboarding_catalog_deployment" "onboarding_catalog_deployment_instance" { + product_id = "%s" + catalog_product_id = "%s" + catalog_plan_id = "%s" + env = "%s" + name = "%s" + active = %s + disabled = %s + kind = "%s" + object_id = "%s" + overview_ui { + en { + display_name = "%s" + description = "description" + long_description = "long_description" + } + } + tags = ["sample", "moreSample"] + object_provider { + name = "name" + email = "email@email.com" + } + metadata { + rc_compatible = "%s" + service { + rc_provisionable = true + iam_compatible = "%s" } deployment { broker { - name = "broker-petra-1" + name = "%s" guid = "guid" } location = "ams03" location_url = "https://globalcatalog.test.cloud.ibm.com/api/v1/ams03" target_crn = "crn:v1:staging:public::ams03:::environment:staging-ams03" } + ui { + strings { + en { + bullets { + title = "%s" + description = "some1" + } + bullets { + title = "newBullet" + description = "some1" + } + media { + type = "youtube" + url = "https://www.youtube.com/embed/HtkpMgNFYtE" + caption = "%s" + } + media { + type = "youtube" + url = "https://www.youtube.com/embed/HtkpMgNFYtE" + caption = "newMedia" + } + } + } + } } } - `, productID, catalogProductID, catalogPlanID, env, name, active, disabled, kind, objectId) + `, productID, catalogProductID, catalogPlanID, env, name, active, disabled, kind, objectId, overviewUiEn, rcCompatible, iamCompatible, deploymentBrokerName, bulletTitleName, mediaCaption) } func testAccCheckIbmOnboardingCatalogDeploymentExists(n string, obj partnercentersellv1.GlobalCatalogDeployment) resource.TestCheckFunc { diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan.go b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan.go index 334e9bd7b4..8b291a7405 100644 --- a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan.go +++ b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan.go @@ -2,7 +2,7 @@ // Licensed under the Mozilla Public License v2.0 /* - * IBM OpenAPI Terraform Generator Version: 3.96.0-d6dec9d7-20241008-212902 + * IBM OpenAPI Terraform Generator Version: 3.97.0-0e90eab1-20241120-170029 */ package partnercentersell diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan_test.go b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan_test.go index c7d144573d..5ddd617c11 100644 --- a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan_test.go +++ b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan_test.go @@ -81,6 +81,18 @@ func TestAccIbmOnboardingCatalogPlanAllArgs(t *testing.T) { activeUpdate := "false" disabledUpdate := "false" kindUpdate := "plan" + overviewUiEn := "display_name" + overviewUiEnUpdate := "display_name_2" + rcCompatible := "true" + rcCompatibleUpdate := "false" + allowInternalUsers := "true" + allowInternalUsersUpdate := "false" + pricingType := "paid" + pricingTypeUpdate := "free" + bulletTitleName := "title" + bulletTitleNameUpdate := "title-2" + mediaCaption := "Some random minecraft Video" + mediaCaptionUpdate := "Some random minecraft Video 2" resource.Test(t, resource.TestCase{ PreCheck: func() { acc.TestAccPreCheckPartnerCenterSell(t) }, @@ -88,7 +100,7 @@ func TestAccIbmOnboardingCatalogPlanAllArgs(t *testing.T) { CheckDestroy: testAccCheckIbmOnboardingCatalogPlanDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccCheckIbmOnboardingCatalogPlanConfig(productID, catalogProductID, env, name, active, disabled, kind, objectId), + Config: testAccCheckIbmOnboardingCatalogPlanConfig(productID, catalogProductID, env, name, active, disabled, kind, objectId, overviewUiEn, rcCompatible, pricingType, allowInternalUsers, bulletTitleName, mediaCaption), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckIbmOnboardingCatalogPlanExists("ibm_onboarding_catalog_plan.onboarding_catalog_plan_instance", conf), resource.TestCheckResourceAttr("ibm_onboarding_catalog_plan.onboarding_catalog_plan_instance", "product_id", productID), @@ -101,7 +113,7 @@ func TestAccIbmOnboardingCatalogPlanAllArgs(t *testing.T) { ), }, resource.TestStep{ - Config: testAccCheckIbmOnboardingCatalogPlanConfig(productID, catalogProductID, envUpdate, nameUpdate, activeUpdate, disabledUpdate, kindUpdate, objectId), + Config: testAccCheckIbmOnboardingCatalogPlanUpdateConfig(productID, catalogProductID, envUpdate, nameUpdate, activeUpdate, disabledUpdate, kindUpdate, objectId, overviewUiEnUpdate, rcCompatibleUpdate, pricingTypeUpdate, allowInternalUsersUpdate, bulletTitleNameUpdate, mediaCaptionUpdate), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("ibm_onboarding_catalog_plan.onboarding_catalog_plan_instance", "product_id", productID), resource.TestCheckResourceAttr("ibm_onboarding_catalog_plan.onboarding_catalog_plan_instance", "catalog_product_id", catalogProductID), @@ -154,7 +166,7 @@ func testAccCheckIbmOnboardingCatalogPlanConfigBasic(productID string, catalogPr `, productID, catalogProductID, name, active, disabled, kind, objectId) } -func testAccCheckIbmOnboardingCatalogPlanConfig(productID string, catalogProductID string, env string, name string, active string, disabled string, kind string, objectId string) string { +func testAccCheckIbmOnboardingCatalogPlanConfig(productID string, catalogProductID string, env string, name string, active string, disabled string, kind string, objectId string, overviewUiEn string, rcCompatible string, pricingType string, allowInternalUsers string, bulletTitleName string, mediaCaption string) string { return fmt.Sprintf(` resource "ibm_onboarding_catalog_plan" "onboarding_catalog_plan_instance" { @@ -168,7 +180,7 @@ func testAccCheckIbmOnboardingCatalogPlanConfig(productID string, catalogProduct object_id = "%s" overview_ui { en { - display_name = "display_name" + display_name = "%s" description = "description" long_description = "long_description" } @@ -179,18 +191,96 @@ func testAccCheckIbmOnboardingCatalogPlanConfig(productID string, catalogProduct email = "email@email.com" } metadata { - rc_compatible = false + rc_compatible = "%s" pricing { - type = "paid" + type = "%s" origin = "global_catalog" } plan { - allow_internal_users = true + allow_internal_users = "%s" + bindable = false + } + ui { + strings { + en { + bullets { + title = "%s" + description = "some1" + } + media { + type = "youtube" + url = "https://www.youtube.com/embed/HtkpMgNFYtE" + caption = "%s" + } + } + } + } + } + } + `, productID, catalogProductID, env, name, active, disabled, kind, objectId, overviewUiEn, rcCompatible, pricingType, allowInternalUsers, bulletTitleName, mediaCaption) +} + +func testAccCheckIbmOnboardingCatalogPlanUpdateConfig(productID string, catalogProductID string, env string, name string, active string, disabled string, kind string, objectId string, overviewUiEn string, rcCompatible string, pricingType string, allowInternalUsers string, bulletTitleName string, mediaCaption string) string { + return fmt.Sprintf(` + + resource "ibm_onboarding_catalog_plan" "onboarding_catalog_plan_instance" { + product_id = "%s" + catalog_product_id = "%s" + env = "%s" + name = "%s" + active = %s + disabled = %s + kind = "%s" + object_id = "%s" + overview_ui { + en { + display_name = "%s" + description = "description" + long_description = "long_description" + } + } + tags = ["tag"] + object_provider { + name = "name" + email = "email@email.com" + } + metadata { + rc_compatible = "%s" + pricing { + type = "%s" + origin = "global_catalog" + } + plan { + allow_internal_users = "%s" bindable = false } + ui { + strings { + en { + bullets { + title = "%s" + description = "some1" + } + bullets { + title = "newBullet" + description = "some1" + } + media { + type = "youtube" + url = "https://www.youtube.com/embed/HtkpMgNFYtE" + caption = "%s" + } + media { + type = "youtube" + url = "https://www.youtube.com/embed/HtkpMgNFYtE" + caption = "newMedia" + } + } + } + } } } - `, productID, catalogProductID, env, name, active, disabled, kind, objectId) + `, productID, catalogProductID, env, name, active, disabled, kind, objectId, overviewUiEn, rcCompatible, pricingType, allowInternalUsers, bulletTitleName, mediaCaption) } func testAccCheckIbmOnboardingCatalogPlanExists(n string, obj partnercentersellv1.GlobalCatalogPlan) resource.TestCheckFunc { diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_product.go b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_product.go index 4f816e1fbd..839bcb89de 100644 --- a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_product.go +++ b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_product.go @@ -2,7 +2,7 @@ // Licensed under the Mozilla Public License v2.0 /* - * IBM OpenAPI Terraform Generator Version: 3.96.0-d6dec9d7-20241008-212902 + * IBM OpenAPI Terraform Generator Version: 3.97.0-0e90eab1-20241120-170029 */ package partnercentersell diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_product_test.go b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_product_test.go index cb8d8e520a..f789698d18 100644 --- a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_product_test.go +++ b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_product_test.go @@ -79,6 +79,20 @@ func TestAccIbmOnboardingCatalogProductAllArgs(t *testing.T) { activeUpdate := "false" disabledUpdate := "false" kindUpdate := "service" + overviewUiEn := "display_name" + overviewUiEnUpdate := "display_name_2" + rcCompatible := "true" + rcCompatibleUpdate := "false" + bulletTitleName := "title" + bulletTitleNameUpdate := "title-2" + mediaCaption := "Some random minecraft Video" + mediaCaptionUpdate := "Some random minecraft Video 2" + compositeChildrenName := "childName" + compositeChildrenNameUpdate := "childName2" + supportDetailsResponseWaitTime := "1.0" + supportDetailsResponseWaitTimeUpdate := "2.0" + supportDetailsAvailabilityTimesDay := "1.0" + supportDetailsAvailabilityTimesDayUpdate := "2.0" resource.Test(t, resource.TestCase{ PreCheck: func() { acc.TestAccPreCheckPartnerCenterSell(t) }, @@ -86,7 +100,22 @@ func TestAccIbmOnboardingCatalogProductAllArgs(t *testing.T) { CheckDestroy: testAccCheckIbmOnboardingCatalogProductDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccCheckIbmOnboardingCatalogProductConfig(productID, env, name, active, disabled, kind, objectId), + Config: testAccCheckIbmOnboardingCatalogProductConfig( + productID, + env, + name, + active, + disabled, + kind, + objectId, + overviewUiEn, + rcCompatible, + bulletTitleName, + mediaCaption, + compositeChildrenName, + supportDetailsResponseWaitTime, + supportDetailsAvailabilityTimesDay, + ), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckIbmOnboardingCatalogProductExists("ibm_onboarding_catalog_product.onboarding_catalog_product_instance", conf), resource.TestCheckResourceAttr("ibm_onboarding_catalog_product.onboarding_catalog_product_instance", "product_id", productID), @@ -98,7 +127,22 @@ func TestAccIbmOnboardingCatalogProductAllArgs(t *testing.T) { ), }, resource.TestStep{ - Config: testAccCheckIbmOnboardingCatalogProductConfig(productID, envUpdate, nameUpdate, activeUpdate, disabledUpdate, kindUpdate, objectId), + Config: testAccCheckIbmOnboardingCatalogProductUpdateConfig( + productID, + envUpdate, + nameUpdate, + activeUpdate, + disabledUpdate, + kindUpdate, + objectId, + overviewUiEnUpdate, + rcCompatibleUpdate, + bulletTitleNameUpdate, + mediaCaptionUpdate, + compositeChildrenNameUpdate, + supportDetailsResponseWaitTimeUpdate, + supportDetailsAvailabilityTimesDayUpdate, + ), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("ibm_onboarding_catalog_product.onboarding_catalog_product_instance", "product_id", productID), resource.TestCheckResourceAttr("ibm_onboarding_catalog_product.onboarding_catalog_product_instance", "env", envUpdate), @@ -141,7 +185,7 @@ func testAccCheckIbmOnboardingCatalogProductConfigBasic(productID string, name s `, productID, name, active, disabled, kind, objectId) } -func testAccCheckIbmOnboardingCatalogProductConfig(productID string, env string, name string, active string, disabled string, kind string, objectId string) string { +func testAccCheckIbmOnboardingCatalogProductConfig(productID string, env string, name string, active string, disabled string, kind string, objectId string, overviewUiEn string, rcCompatible string, bulletTitleName string, mediaCaption string, compositeChildrenName string, supportDetailsResponseWaitTime string, supportDetailsAvailabilityTimesDay string) string { return fmt.Sprintf(` resource "ibm_onboarding_catalog_product" "onboarding_catalog_product_instance" { @@ -154,7 +198,7 @@ func testAccCheckIbmOnboardingCatalogProductConfig(productID string, env string, object_id = "%s" overview_ui { en { - display_name = "display_name" + display_name = "%s" description = "description" long_description = "long_description" } @@ -168,8 +212,21 @@ func testAccCheckIbmOnboardingCatalogProductConfig(productID string, env string, email = "email@email.com" } metadata { - rc_compatible = false + rc_compatible = "%s" ui { + strings { + en { + bullets { + title = "%s" + description = "some1" + } + media { + type = "youtube" + url = "https://www.youtube.com/embed/HtkpMgNFYtE" + caption = "%s" + } + } + } urls { doc_url = "doc_url" terms_url = "terms_url" @@ -182,6 +239,18 @@ func testAccCheckIbmOnboardingCatalogProductConfig(productID string, env string, iam_compatible = false } other { + composite { + children { + name = "%s" + kind = "service" + } + children { + name = "secondChild" + kind = "service" + } + composite_kind = "service" + composite_tag = "composite_tag" + } pc { support { url = "url" @@ -204,13 +273,150 @@ func testAccCheckIbmOnboardingCatalogProductConfig(productID string, env string, support_details { type = "support_site" contact = "contact" + response_wait_time { + value = "%s" + type = "type" + } + availability { + times { + day = "%s" + start_time = "start_time" + end_time = "end_time" + } + times { + day = "2.0" + start_time = "start_time" + end_time = "end_time" + } + timezone = "timezone" + always_available = true + } + } + support_details { + type = "support_site" + contact = "contact" + response_wait_time { + value = "1.0" + type = "type" + } + availability { + times { + day = "1.0" + start_time = "start_time" + end_time = "end_time" + } + timezone = "timezone" + always_available = true + } + } + } + } + } + } + } + `, productID, env, name, active, disabled, kind, objectId, overviewUiEn, rcCompatible, bulletTitleName, mediaCaption, compositeChildrenName, supportDetailsResponseWaitTime, supportDetailsAvailabilityTimesDay) +} + +func testAccCheckIbmOnboardingCatalogProductUpdateConfig(productID string, env string, name string, active string, disabled string, kind string, objectId string, overviewUiEn string, rcCompatible string, bulletTitleName string, mediaCaption string, compositeChildrenName string, supportDetailsResponseWaitTime string, supportDetailsAvailabilityTimesDay string) string { + return fmt.Sprintf(` + + resource "ibm_onboarding_catalog_product" "onboarding_catalog_product_instance" { + product_id = "%s" + env = "%s" + name = "%s" + active = %s + disabled = %s + kind = "%s" + object_id = "%s" + overview_ui { + en { + display_name = "%s" + description = "description" + long_description = "long_description" + } + } + tags = ["tag", "support_community"] + images { + image = "image" + } + object_provider { + name = "name" + email = "email@email.com" + } + metadata { + rc_compatible = "%s" + ui { + strings { + en { + bullets { + title = "%s" + description = "some1" + } + bullets { + title = "newBullet" + description = "some1" + } + media { + type = "youtube" + url = "https://www.youtube.com/embed/HtkpMgNFYtE" + caption = "%s" + } + media { + type = "youtube" + url = "https://www.youtube.com/embed/HtkpMgNFYtE" + caption = "newMedia" + } + } + } + urls { + doc_url = "doc_url" + terms_url = "terms_url" + } + hidden = true + side_by_side_index = 1.0 + } + service { + rc_provisionable = true + iam_compatible = false + } + other { + composite { + children { + name = "%s" + kind = "service" + } + composite_kind = "service" + composite_tag = "composite_tag" + } + pc { + support { + url = "url" + process_i18n = {} + status_url = "status_url" + locations = [ "locations" ] + languages = [ "languages" ] + support_type = "community" + support_escalation { + contact = "contact" + escalation_wait_time { + value = 1.0 + type = "type" + } response_wait_time { value = 1.0 type = "type" } + } + support_details { + type = "support_site" + contact = "contact" + response_wait_time { + value = "%s" + type = "type" + } availability { times { - day = 1.0 + day = "%s" start_time = "start_time" end_time = "end_time" } @@ -223,7 +429,7 @@ func testAccCheckIbmOnboardingCatalogProductConfig(productID string, env string, } } } - `, productID, env, name, active, disabled, kind, objectId) + `, productID, env, name, active, disabled, kind, objectId, overviewUiEn, rcCompatible, bulletTitleName, mediaCaption, compositeChildrenName, supportDetailsResponseWaitTime, supportDetailsAvailabilityTimesDay) } func testAccCheckIbmOnboardingCatalogProductExists(n string, obj partnercentersellv1.GlobalCatalogProduct) resource.TestCheckFunc { diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_iam_registration.go b/ibm/service/partnercentersell/resource_ibm_onboarding_iam_registration.go index d7e82eef93..df11aba167 100644 --- a/ibm/service/partnercentersell/resource_ibm_onboarding_iam_registration.go +++ b/ibm/service/partnercentersell/resource_ibm_onboarding_iam_registration.go @@ -2,7 +2,7 @@ // Licensed under the Mozilla Public License v2.0 /* - * IBM OpenAPI Terraform Generator Version: 3.96.0-d6dec9d7-20241008-212902 + * IBM OpenAPI Terraform Generator Version: 3.97.0-0e90eab1-20241120-170029 */ package partnercentersell @@ -393,7 +393,7 @@ func ResourceIbmOnboardingIamRegistration() *schema.Resource { Optional: true, Description: "Optional opt-in if attribute is hidden from customers (customer can still use it if they found out themselves).", }, - "supported_attributes": &schema.Schema{ + "supported_patterns": &schema.Schema{ Type: schema.TypeList, Optional: true, Description: "The list of supported patterns.", @@ -1767,12 +1767,12 @@ func ResourceIbmOnboardingIamRegistrationMapToSupportedAttributesOptions(modelMa if modelMap["hidden"] != nil { model.Hidden = core.BoolPtr(modelMap["hidden"].(bool)) } - if modelMap["supported_attributes"] != nil { - supportedAttributes := []string{} - for _, supportedAttributesItem := range modelMap["supported_attributes"].([]interface{}) { - supportedAttributes = append(supportedAttributes, supportedAttributesItem.(string)) + if modelMap["supported_patterns"] != nil { + supportedPatterns := []string{} + for _, supportedPatternsItem := range modelMap["supported_patterns"].([]interface{}) { + supportedPatterns = append(supportedPatterns, supportedPatternsItem.(string)) } - model.SupportedAttributes = supportedAttributes + model.SupportedPatterns = supportedPatterns } if modelMap["policy_types"] != nil { policyTypes := []string{} @@ -2248,8 +2248,8 @@ func ResourceIbmOnboardingIamRegistrationSupportedAttributesOptionsToMap(model * if model.Hidden != nil { modelMap["hidden"] = *model.Hidden } - if model.SupportedAttributes != nil { - modelMap["supported_attributes"] = model.SupportedAttributes + if model.SupportedPatterns != nil { + modelMap["supported_patterns"] = model.SupportedPatterns } if model.PolicyTypes != nil { modelMap["policy_types"] = model.PolicyTypes @@ -2823,9 +2823,9 @@ func ResourceIbmOnboardingIamRegistrationSupportedAttributesOptionsAsPatch(patch if _, exists := d.GetOk(path); d.HasChange(path) && !exists { patch["hidden"] = nil } - path = "supported_attributes.0.options.0.supported_attributes" + path = "supported_attributes.0.options.0.supported_patterns" if _, exists := d.GetOk(path); d.HasChange(path) && !exists { - patch["supported_attributes"] = nil + patch["supported_patterns"] = nil } path = "supported_attributes.0.options.0.policy_types" if _, exists := d.GetOk(path); d.HasChange(path) && !exists { diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_iam_registration_test.go b/ibm/service/partnercentersell/resource_ibm_onboarding_iam_registration_test.go index beb4091ca8..bd3847afe0 100644 --- a/ibm/service/partnercentersell/resource_ibm_onboarding_iam_registration_test.go +++ b/ibm/service/partnercentersell/resource_ibm_onboarding_iam_registration_test.go @@ -52,9 +52,23 @@ func TestAccIbmOnboardingIamRegistrationAllArgs(t *testing.T) { serviceType := "platform_service" envUpdate := "current" roleDisplayNameUpdate := fmt.Sprintf("random-%d", acctest.RandIntRange(10, 100)) + iamRegistrationRoleUpdate := fmt.Sprintf("crn:v1:bluemix:public:%s::::serviceRole:%s", acc.PcsIamServiceRegistrationId, roleDisplayNameUpdate) nameUpdate := acc.PcsIamServiceRegistrationId enabledUpdate := "true" serviceTypeUpdate := "service" + actionDescription := "default" + actionDescriptionUpdate := "default_2" + supportedAttributeDisplayName := "default" + supportedAttributeDisplayNameUpdate := "default_2" + supportedAttributeInputDetailsDisplayName := "default" + supportedAttributeInputDetailsDisplayNameUpdate := "default_2" + supportedAuthorizationSubjectsService := "serviceName" + supportedAuthorizationSubjectsServiceUpdate := "serviceName2" + environmentAttributesValues := "public" + environmentAttributesValuesUpdate := "private" + supportedAnonymousAccessesAdditionalPropValue := "additional" + supportedAnonymousAccessesAdditionalPropValueUpdate := "additionals" + // supportedAnonymousAccessesAccId := "account_id_2" resource.Test(t, resource.TestCase{ PreCheck: func() { acc.TestAccPreCheckPartnerCenterSell(t) }, @@ -62,7 +76,22 @@ func TestAccIbmOnboardingIamRegistrationAllArgs(t *testing.T) { CheckDestroy: testAccCheckIbmOnboardingIamRegistrationDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccCheckIbmOnboardingIamRegistrationConfig(productID, env, name, enabled, serviceType, iamRegistrationRole, roleDisplayName, acc.PcsIamServiceRegistrationId), + Config: testAccCheckIbmOnboardingIamRegistrationConfig( + productID, + env, + name, + enabled, + serviceType, + iamRegistrationRole, + roleDisplayName, + acc.PcsIamServiceRegistrationId, + actionDescription, + supportedAttributeDisplayName, + supportedAttributeInputDetailsDisplayName, + supportedAuthorizationSubjectsService, + environmentAttributesValues, + supportedAnonymousAccessesAdditionalPropValue, + ), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckIbmOnboardingIamRegistrationExists("ibm_onboarding_iam_registration.onboarding_iam_registration_instance", conf), resource.TestCheckResourceAttr("ibm_onboarding_iam_registration.onboarding_iam_registration_instance", "product_id", productID), @@ -73,7 +102,22 @@ func TestAccIbmOnboardingIamRegistrationAllArgs(t *testing.T) { ), }, resource.TestStep{ - Config: testAccCheckIbmOnboardingIamRegistrationConfig(productID, envUpdate, nameUpdate, enabledUpdate, serviceTypeUpdate, iamRegistrationRole, roleDisplayNameUpdate, acc.PcsIamServiceRegistrationId), + Config: testAccCheckIbmOnboardingIamRegistrationUpdateConfig( + productID, + envUpdate, + nameUpdate, + enabledUpdate, + serviceTypeUpdate, + iamRegistrationRoleUpdate, + roleDisplayNameUpdate, + acc.PcsIamServiceRegistrationId, + actionDescriptionUpdate, + supportedAttributeDisplayNameUpdate, + supportedAttributeInputDetailsDisplayNameUpdate, + supportedAuthorizationSubjectsServiceUpdate, + environmentAttributesValuesUpdate, + supportedAnonymousAccessesAdditionalPropValueUpdate, + ), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("ibm_onboarding_iam_registration.onboarding_iam_registration_instance", "product_id", productID), resource.TestCheckResourceAttr("ibm_onboarding_iam_registration.onboarding_iam_registration_instance", "env", envUpdate), @@ -106,9 +150,23 @@ func testAccCheckIbmOnboardingIamRegistrationConfigBasic(productID string, name `, productID, name, name) } -func testAccCheckIbmOnboardingIamRegistrationConfig(productID string, env string, name string, enabled string, serviceType string, iamRegistrationRole string, roleDisplayName string, iamRegistrationID string) string { +func testAccCheckIbmOnboardingIamRegistrationConfig( + productID string, + env string, + name string, + enabled string, + serviceType string, + iamRegistrationRole string, + roleDisplayName string, + iamRegistrationID string, + actionDescription string, + supportedAttributeDisplayName string, + supportedAttributeInputDetailsDisplayName string, + supportedAuthorizationSubjectsService string, + environmentAttributesValues string, + supportedAnonymousAccessesAdditionalPropValue string, +) string { return fmt.Sprintf(` - resource "ibm_onboarding_iam_registration" "onboarding_iam_registration_instance" { product_id = "%s" env = "%s" @@ -119,7 +177,7 @@ func testAccCheckIbmOnboardingIamRegistrationConfig(productID string, env string id = "id" roles = [ "%s" ] description { - default = "default" + default = "%s" en = "en" de = "de" es = "es" @@ -171,10 +229,9 @@ func testAccCheckIbmOnboardingIamRegistrationConfig(productID string, env string policy_types = [ "access" ] is_empty_value_supported = true is_string_exists_false_value_supported = true - supported_attributes = [ ] } display_name { - default = "default" + default = "%s" en = "en" de = "de" es = "es" @@ -206,7 +263,7 @@ func testAccCheckIbmOnboardingIamRegistrationConfig(productID string, env string values { value = "testString" display_name { - default = "testString" + default = "%s" en = "testString" de = "testString" es = "testString" @@ -229,7 +286,7 @@ func testAccCheckIbmOnboardingIamRegistrationConfig(productID string, env string } supported_authorization_subjects { attributes { - service_name = "testString" + service_name = "%s" resource_type = "testString" } roles = [ "%s" ] @@ -250,7 +307,7 @@ func testAccCheckIbmOnboardingIamRegistrationConfig(productID string, env string supported_network { environment_attributes { key = "networkType" - values = [ "public" ] + values = [ "%s" ] options { hidden = false } @@ -260,12 +317,256 @@ func testAccCheckIbmOnboardingIamRegistrationConfig(productID string, env string attributes { account_id = "account_id" service_name = "%s" - additional_properties = { "testString" = "additionalProps" } + additional_properties = { "testString" = "%s" } + } + roles = [ "%s" ] + } + } + `, productID, env, name, enabled, serviceType, iamRegistrationRole, actionDescription, name, name, supportedAttributeDisplayName, supportedAttributeInputDetailsDisplayName, supportedAuthorizationSubjectsService, iamRegistrationRole, iamRegistrationRole, roleDisplayName, environmentAttributesValues, iamRegistrationID, supportedAnonymousAccessesAdditionalPropValue, iamRegistrationRole) +} + +func testAccCheckIbmOnboardingIamRegistrationUpdateConfig( + productID string, + env string, + name string, + enabled string, + serviceType string, + iamRegistrationRole string, + roleDisplayName string, + iamRegistrationID string, + actionDescription string, + supportedAttributeDisplayName string, + supportedAttributeInputDetailsDisplayName string, + supportedAuthorizationSubjectsService string, + environmentAttributesValues string, + supportedAnonymousAccessesAdditionalPropValue string, +) string { + roleDisplayName2 := fmt.Sprintf("random-2-%d", acctest.RandIntRange(10, 100)) + iamRegistrationRole2 := fmt.Sprintf("crn:v1:bluemix:public:%s::::serviceRole:%s", iamRegistrationID, roleDisplayName2) + + return fmt.Sprintf(` + resource "ibm_onboarding_iam_registration" "onboarding_iam_registration_instance" { + product_id = "%s" + env = "%s" + name = "%s" + enabled = %s + service_type = "%s" + actions { + id = "id" + roles = [ "%s", "%s" ] + description { + default = "%s" + en = "en" + de = "de" + es = "es" + fr = "fr" + it = "it" + ja = "ja" + ko = "ko" + pt_br = "pt_br" + zh_tw = "zh_tw" + zh_cn = "zh_cn" + } + display_name { + default = "default" + en = "en" + de = "de" + es = "es" + fr = "fr" + it = "it" + ja = "ja" + ko = "ko" + pt_br = "pt_br" + zh_tw = "zh_tw" + zh_cn = "zh_cn" + } + options { + hidden = true + } + } + actions { + id = "idtwo" + roles = [ "%s" ] + description { + default = "default" + en = "en" + de = "de" + es = "es" + fr = "fr" + it = "it" + ja = "ja" + ko = "ko" + pt_br = "pt_br" + zh_tw = "zh_tw" + zh_cn = "zh_cn" + } + display_name { + default = "default" + en = "en" + de = "de" + es = "es" + fr = "fr" + it = "it" + ja = "ja" + ko = "ko" + pt_br = "pt_br" + zh_tw = "zh_tw" + zh_cn = "zh_cn" + } + options { + hidden = true + } + } + additional_policy_scopes = ["%s", "%s.some"] + display_name { + default = "%s" + en = "en" + de = "de" + es = "es" + fr = "fr" + it = "it" + ja = "ja" + ko = "ko" + pt_br = "pt_br" + zh_tw = "zh_tw" + zh_cn = "zh_cn" + } + parent_ids = ["05ca8653-de25-49fa-a14d-aaa5d373bc22"] + supported_attributes { + key = "testString" + options { + operators = [ "stringEquals" ] + hidden = false + policy_types = [ "access" ] + is_empty_value_supported = true + is_string_exists_false_value_supported = true + } + display_name { + default = "%s" + en = "en" + de = "de" + es = "es" + fr = "fr" + it = "it" + ja = "ja" + ko = "ko" + pt_br = "pt_br" + zh_tw = "zh_tw" + zh_cn = "zh_cn" + } + description { + default = "default" + en = "en" + de = "de" + es = "es" + fr = "fr" + it = "it" + ja = "ja" + ko = "ko" + pt_br = "pt_br" + zh_tw = "zh_tw" + zh_cn = "zh_cn" + } + ui { + input_type = "selector" + input_details { + type = "gst" + values { + value = "testString" + display_name { + default = "%s" + en = "testString" + de = "testString" + es = "testString" + fr = "testString" + it = "testString" + ja = "testString" + ko = "testString" + pt_br = "testString" + zh_tw = "testString" + zh_cn = "testString" + } + } + gst { + query = "query" + value_property_name = "teststring" + input_option_label = "{name} - {instance_id}" + } + } + } + } + supported_attributes { + key = "some-attribute" + display_name { + default = "some-attribute" + } + description { + default = "some-attribute" + } + ui { + input_type = "string" + } + } + supported_authorization_subjects { + attributes { + service_name = "%s" + resource_type = "testString" + } + roles = [ "%s" ] + } + supported_roles { + id = "%s" + description { + default = "desc" + } + display_name { + default = "%s" + } + options { + access_policy = true + policy_type = [ "access" ] + } + } + supported_roles { + id = "%s" + description { + default = "default" + } + display_name { + default = "%s" + } + options { + access_policy = true + policy_type = [ "access" ] + } + } + supported_network { + environment_attributes { + key = "networkType" + values = [ "%s" ] + options { + hidden = true + } + } + } + supported_anonymous_accesses { + attributes { + account_id = "account_id" + service_name = "%s" + additional_properties = { "testString" = "%s" } + } + roles = [ "%s" ] + } + supported_anonymous_accesses { + attributes { + account_id = "account_id" + service_name = "%s" + additional_properties = { "testString" = "something" } } roles = [ "%s" ] } } - `, productID, env, name, enabled, serviceType, iamRegistrationRole, name, name, iamRegistrationRole, iamRegistrationRole, roleDisplayName, iamRegistrationID, iamRegistrationRole) + `, productID, env, name, enabled, serviceType, iamRegistrationRole, iamRegistrationRole2, iamRegistrationRole, iamRegistrationRole, name, name, name, supportedAttributeDisplayName, supportedAttributeInputDetailsDisplayName, supportedAuthorizationSubjectsService, iamRegistrationRole, iamRegistrationRole, roleDisplayName, iamRegistrationRole2, roleDisplayName2, environmentAttributesValues, iamRegistrationID, supportedAnonymousAccessesAdditionalPropValue, iamRegistrationRole, iamRegistrationID, iamRegistrationRole) } func testAccCheckIbmOnboardingIamRegistrationExists(n string, obj partnercentersellv1.IamServiceRegistration) resource.TestCheckFunc { @@ -667,7 +968,7 @@ func TestResourceIbmOnboardingIamRegistrationIamServiceRegistrationSupportedAttr supportedAttributesOptionsModel := new(partnercentersellv1.SupportedAttributesOptions) supportedAttributesOptionsModel.Operators = []string{"stringEquals"} supportedAttributesOptionsModel.Hidden = core.BoolPtr(true) - supportedAttributesOptionsModel.SupportedAttributes = []string{"testString"} + supportedAttributesOptionsModel.SupportedPatterns = []string{"testString"} supportedAttributesOptionsModel.PolicyTypes = []string{"access"} supportedAttributesOptionsModel.IsEmptyValueSupported = core.BoolPtr(true) supportedAttributesOptionsModel.IsStringExistsFalseValueSupported = core.BoolPtr(true) @@ -776,7 +1077,7 @@ func TestResourceIbmOnboardingIamRegistrationSupportedAttributesOptionsToMap(t * model := new(partnercentersellv1.SupportedAttributesOptions) model.Operators = []string{"stringEquals"} model.Hidden = core.BoolPtr(true) - model.SupportedAttributes = []string{"testString"} + model.SupportedPatterns = []string{"testString"} model.PolicyTypes = []string{"access"} model.IsEmptyValueSupported = core.BoolPtr(true) model.IsStringExistsFalseValueSupported = core.BoolPtr(true) @@ -1568,7 +1869,7 @@ func TestResourceIbmOnboardingIamRegistrationMapToIamServiceRegistrationSupporte supportedAttributesOptionsModel := new(partnercentersellv1.SupportedAttributesOptions) supportedAttributesOptionsModel.Operators = []string{"stringEquals"} supportedAttributesOptionsModel.Hidden = core.BoolPtr(true) - supportedAttributesOptionsModel.SupportedAttributes = []string{"testString"} + supportedAttributesOptionsModel.SupportedPatterns = []string{"testString"} supportedAttributesOptionsModel.PolicyTypes = []string{"access"} supportedAttributesOptionsModel.IsEmptyValueSupported = core.BoolPtr(true) supportedAttributesOptionsModel.IsStringExistsFalseValueSupported = core.BoolPtr(true) @@ -1734,7 +2035,7 @@ func TestResourceIbmOnboardingIamRegistrationMapToSupportedAttributesOptions(t * model := new(partnercentersellv1.SupportedAttributesOptions) model.Operators = []string{"stringEquals"} model.Hidden = core.BoolPtr(true) - model.SupportedAttributes = []string{"testString"} + model.SupportedPatterns = []string{"testString"} model.PolicyTypes = []string{"access"} model.IsEmptyValueSupported = core.BoolPtr(true) model.IsStringExistsFalseValueSupported = core.BoolPtr(true) diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_product.go b/ibm/service/partnercentersell/resource_ibm_onboarding_product.go index 5ae93ee55f..05ee3cf898 100644 --- a/ibm/service/partnercentersell/resource_ibm_onboarding_product.go +++ b/ibm/service/partnercentersell/resource_ibm_onboarding_product.go @@ -2,7 +2,7 @@ // Licensed under the Mozilla Public License v2.0 /* - * IBM OpenAPI Terraform Generator Version: 3.96.0-d6dec9d7-20241008-212902 + * IBM OpenAPI Terraform Generator Version: 3.97.0-0e90eab1-20241120-170029 */ package partnercentersell diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_registration.go b/ibm/service/partnercentersell/resource_ibm_onboarding_registration.go index 1add595d62..6a181f5f2f 100644 --- a/ibm/service/partnercentersell/resource_ibm_onboarding_registration.go +++ b/ibm/service/partnercentersell/resource_ibm_onboarding_registration.go @@ -2,7 +2,7 @@ // Licensed under the Mozilla Public License v2.0 /* - * IBM OpenAPI Terraform Generator Version: 3.96.0-d6dec9d7-20241008-212902 + * IBM OpenAPI Terraform Generator Version: 3.97.0-0e90eab1-20241120-170029 */ package partnercentersell diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_resource_broker.go b/ibm/service/partnercentersell/resource_ibm_onboarding_resource_broker.go index 4879222cc9..044c9ae42b 100644 --- a/ibm/service/partnercentersell/resource_ibm_onboarding_resource_broker.go +++ b/ibm/service/partnercentersell/resource_ibm_onboarding_resource_broker.go @@ -2,7 +2,7 @@ // Licensed under the Mozilla Public License v2.0 /* - * IBM OpenAPI Terraform Generator Version: 3.96.0-d6dec9d7-20241008-212902 + * IBM OpenAPI Terraform Generator Version: 3.97.0-0e90eab1-20241120-170029 */ package partnercentersell diff --git a/website/docs/r/onboarding_iam_registration.html.markdown b/website/docs/r/onboarding_iam_registration.html.markdown index 2e2b4df185..9e81090c0e 100644 --- a/website/docs/r/onboarding_iam_registration.html.markdown +++ b/website/docs/r/onboarding_iam_registration.html.markdown @@ -82,7 +82,7 @@ resource "ibm_onboarding_iam_registration" "onboarding_iam_registration_instance options { operators = [ "stringEquals" ] hidden = true - supported_attributes = [ "supported_attributes" ] + supported_patterns = [ "supported_patterns" ] policy_types = [ "access" ] is_empty_value_supported = true is_string_exists_false_value_supported = true @@ -202,7 +202,6 @@ resource "ibm_onboarding_iam_registration" "onboarding_iam_registration_instance } options { access_policy = true - additional_properties_for_access_policy = { "key" = "inner" } policy_type = [ "access" ] account_type = "enterprise" } @@ -395,7 +394,7 @@ Nested schema for **supported_attributes**: * `value` - (Optional, List) Hierarchy description value. Nested schema for **value**: * `key` - (Optional, String) Key. - * `supported_attributes` - (Optional, List) The list of supported patterns. + * `supported_patterns` - (Optional, List) The list of supported patterns. * Constraints: The maximum length is `100` items. The minimum length is `0` items. * `ui` - (Optional, List) The user interface. Nested schema for **ui**: @@ -530,7 +529,6 @@ Nested schema for **supported_roles**: * `access_policy` - (Required, Boolean) Optional opt-in to require access control on the role. * `account_type` - (Optional, String) Optional opt-in to require checking account type when applying the role. * Constraints: Allowable values are: `enterprise`. - * `additional_properties_for_access_policy` - (Optional, Map) Additional properties for access policy. * `policy_type` - (Optional, List) Optional opt-in to require checking policy type when applying the role. * Constraints: Allowable list items are: `access`, `authorization`, `authorization-delegated`. The list items must match regular expression `/^[ -~\\s]*$/`. The maximum length is `100` items. The minimum length is `0` items.