Skip to content

Commit c175a5d

Browse files
feat(partner center sell): less restriction on global catalog object names (IBM-Cloud#6122)
* feat(partner center sell): less restriction on global catalog object name Signed-off-by: Peter Harasztia <[email protected]> * regex less strict for gc names all changes Signed-off-by: Peter Harasztia <[email protected]> --------- Signed-off-by: Peter Harasztia <[email protected]>
1 parent 26b2ec4 commit c175a5d

9 files changed

+28
-23
lines changed

ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Mozilla Public License v2.0
33

44
/*
5-
* IBM OpenAPI Terraform Generator Version: 3.102.0-615ec964-20250307-203034
5+
* IBM OpenAPI Terraform Generator Version: 3.103.0-e8b84313-20250402-201816
66
*/
77

88
package partnercentersell
@@ -733,7 +733,7 @@ func ResourceIbmOnboardingCatalogDeployment() *schema.Resource {
733733
Type: schema.TypeList,
734734
MaxItems: 1,
735735
Optional: true,
736-
Description: "The global catalog metadata of the deployment.",
736+
Description: "The broker data connected to the deployment.",
737737
Elem: &schema.Resource{
738738
Schema: map[string]*schema.Schema{
739739
"name": &schema.Schema{
@@ -807,7 +807,7 @@ func ResourceIbmOnboardingCatalogDeploymentValidator() *validate.ResourceValidat
807807
Type: validate.TypeString,
808808
Required: true,
809809
Regexp: `^\S*$`,
810-
MinValueLength: 2,
810+
MinValueLength: 1,
811811
MaxValueLength: 128,
812812
},
813813
validate.ValidateSchema{
@@ -816,7 +816,7 @@ func ResourceIbmOnboardingCatalogDeploymentValidator() *validate.ResourceValidat
816816
Type: validate.TypeString,
817817
Required: true,
818818
Regexp: `^\S*$`,
819-
MinValueLength: 2,
819+
MinValueLength: 1,
820820
MaxValueLength: 128,
821821
},
822822
validate.ValidateSchema{
@@ -833,7 +833,7 @@ func ResourceIbmOnboardingCatalogDeploymentValidator() *validate.ResourceValidat
833833
ValidateFunctionIdentifier: validate.ValidateRegexp,
834834
Type: validate.TypeString,
835835
Required: true,
836-
Regexp: `^[a-zA-Z0-9\-.]+$`,
836+
Regexp: `^\S*$`,
837837
},
838838
validate.ValidateSchema{
839839
Identifier: "kind",

ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Mozilla Public License v2.0
33

44
/*
5-
* IBM OpenAPI Terraform Generator Version: 3.102.0-615ec964-20250307-203034
5+
* IBM OpenAPI Terraform Generator Version: 3.103.0-e8b84313-20250402-201816
66
*/
77

88
package partnercentersell
@@ -477,7 +477,7 @@ func ResourceIbmOnboardingCatalogPlanValidator() *validate.ResourceValidator {
477477
Type: validate.TypeString,
478478
Required: true,
479479
Regexp: `^\S*$`,
480-
MinValueLength: 2,
480+
MinValueLength: 1,
481481
MaxValueLength: 128,
482482
},
483483
validate.ValidateSchema{
@@ -494,7 +494,7 @@ func ResourceIbmOnboardingCatalogPlanValidator() *validate.ResourceValidator {
494494
ValidateFunctionIdentifier: validate.ValidateRegexp,
495495
Type: validate.TypeString,
496496
Required: true,
497-
Regexp: `^[a-zA-Z0-9\-.]+$`,
497+
Regexp: `^\S*$`,
498498
},
499499
validate.ValidateSchema{
500500
Identifier: "kind",

ibm/service/partnercentersell/resource_ibm_onboarding_catalog_product.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Mozilla Public License v2.0
33

44
/*
5-
* IBM OpenAPI Terraform Generator Version: 3.102.0-615ec964-20250307-203034
5+
* IBM OpenAPI Terraform Generator Version: 3.103.0-e8b84313-20250402-201816
66
*/
77

88
package partnercentersell
@@ -1213,7 +1213,7 @@ func ResourceIbmOnboardingCatalogProductValidator() *validate.ResourceValidator
12131213
ValidateFunctionIdentifier: validate.ValidateRegexp,
12141214
Type: validate.TypeString,
12151215
Required: true,
1216-
Regexp: `^[a-zA-Z0-9\-.]+$`,
1216+
Regexp: `^\S*$`,
12171217
},
12181218
validate.ValidateSchema{
12191219
Identifier: "kind",

ibm/service/partnercentersell/resource_ibm_onboarding_iam_registration.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Mozilla Public License v2.0
33

44
/*
5-
* IBM OpenAPI Terraform Generator Version: 3.102.0-615ec964-20250307-203034
5+
* IBM OpenAPI Terraform Generator Version: 3.103.0-e8b84313-20250402-201816
66
*/
77

88
package partnercentersell
@@ -1040,7 +1040,7 @@ func ResourceIbmOnboardingIamRegistrationValidator() *validate.ResourceValidator
10401040
ValidateFunctionIdentifier: validate.ValidateRegexp,
10411041
Type: validate.TypeString,
10421042
Required: true,
1043-
Regexp: `^[a-zA-Z0-9\-.]+$`,
1043+
Regexp: `^\S*$`,
10441044
},
10451045
validate.ValidateSchema{
10461046
Identifier: "service_type",

website/docs/r/onboarding_catalog_deployment.html.markdown

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ You can specify the following arguments for this resource.
165165

166166
* `active` - (Required, Boolean) Whether the service is active.
167167
* `catalog_plan_id` - (Required, Forces new resource, String) The unique ID of this global catalog plan.
168-
* Constraints: The maximum length is `128` characters. The minimum length is `2` characters. The value must match regular expression `/^\\S*$/`.
168+
* Constraints: The maximum length is `128` characters. The minimum length is `1` character. The value must match regular expression `/^\\S*$/`.
169169
* `catalog_product_id` - (Required, Forces new resource, String) The unique ID of this global catalog product.
170-
* Constraints: The maximum length is `128` characters. The minimum length is `2` characters. The value must match regular expression `/^\\S*$/`.
170+
* Constraints: The maximum length is `128` characters. The minimum length is `1` character. The value must match regular expression `/^\\S*$/`.
171171
* `disabled` - (Required, Boolean) Determines the global visibility for the catalog entry, and its children. If it is not enabled, all plans are disabled.
172172
* `env` - (Optional, String) The environment to fetch this object from.
173173
* Constraints: The maximum length is `64` characters. The minimum length is `1` character. The value must match regular expression `/^[a-z_.-]+$/`.
@@ -177,7 +177,7 @@ You can specify the following arguments for this resource.
177177
Nested schema for **metadata**:
178178
* `deployment` - (Optional, List) The global catalog metadata of the deployment.
179179
Nested schema for **deployment**:
180-
* `broker` - (Optional, List) The global catalog metadata of the deployment.
180+
* `broker` - (Optional, List) The broker data connected to the deployment.
181181
Nested schema for **broker**:
182182
* `guid` - (Optional, String) Crn or guid of the resource broker.
183183
* Constraints: The maximum length is `2000` characters. The minimum length is `2` characters. The value must match regular expression `/^[ -~\\s]*$/`.
@@ -359,7 +359,7 @@ Nested schema for **metadata**:
359359
* `service_key_supported` - (Optional, Boolean) Indicates service credentials support and controls the Service Credential tab on Resource Details page.
360360
* `unique_api_key` - (Computed, Boolean) Indicates whether the deployment uses a unique API key or not.
361361
* `name` - (Required, String) The programmatic name of this deployment.
362-
* Constraints: The value must match regular expression `/^[a-zA-Z0-9\\-.]+$/`.
362+
* Constraints: The value must match regular expression `/^\\S*$/`.
363363
* `object_id` - (Optional, String) The desired ID of the global catalog object.
364364
* `object_provider` - (Required, List) The provider or owner of the product.
365365
Nested schema for **object_provider**:
@@ -383,6 +383,7 @@ After your resource is created, you can read values from the listed arguments an
383383

384384
* `id` - The unique identifier of the onboarding_catalog_deployment.
385385
* `catalog_deployment_id` - (String) The ID of a global catalog object.
386+
* Constraints: The value must match regular expression `/^\\S*$/`.
386387
* `geo_tags` - (List)
387388
* Constraints: The list items must match regular expression `/./`. The maximum length is `1000` items. The minimum length is `0` items.
388389
* `url` - (String) The global catalog URL of your product.

website/docs/r/onboarding_catalog_plan.html.markdown

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ You can specify the following arguments for this resource.
9999

100100
* `active` - (Required, Boolean) Whether the service is active.
101101
* `catalog_product_id` - (Required, Forces new resource, String) The unique ID of this global catalog product.
102-
* Constraints: The maximum length is `128` characters. The minimum length is `2` characters. The value must match regular expression `/^\\S*$/`.
102+
* Constraints: The maximum length is `128` characters. The minimum length is `1` character. The value must match regular expression `/^\\S*$/`.
103103
* `disabled` - (Required, Boolean) Determines the global visibility for the catalog entry, and its children. If it is not enabled, all plans are disabled.
104104
* `env` - (Optional, String) The environment to fetch this object from.
105105
* Constraints: The maximum length is `64` characters. The minimum length is `1` character. The value must match regular expression `/^[a-z_.-]+$/`.
@@ -189,7 +189,7 @@ Nested schema for **metadata**:
189189
* `terms_url` - (Optional, String) The URL for your product's end user license agreement.
190190
* Constraints: The maximum length is `2083` characters. The minimum length is `0` characters.
191191
* `name` - (Required, String) The programmatic name of this plan.
192-
* Constraints: The value must match regular expression `/^[a-zA-Z0-9\\-.]+$/`.
192+
* Constraints: The value must match regular expression `/^\\S*$/`.
193193
* `object_id` - (Optional, String) The desired ID of the global catalog object.
194194
* `object_provider` - (Required, List) The provider or owner of the product.
195195
Nested schema for **object_provider**:
@@ -215,6 +215,7 @@ After your resource is created, you can read values from the listed arguments an
215215

216216
* `id` - The unique identifier of the onboarding_catalog_plan.
217217
* `catalog_plan_id` - (String) The ID of a global catalog object.
218+
* Constraints: The value must match regular expression `/^\\S*$/`.
218219
* `geo_tags` - (List)
219220
* Constraints: The list items must match regular expression `/./`. The maximum length is `1000` items. The minimum length is `0` items.
220221
* `url` - (String) The global catalog URL of your product.

website/docs/r/onboarding_catalog_product.html.markdown

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ Nested schema for **metadata**:
265265
* `kind` - (Optional, String) The type of the composite child.
266266
* Constraints: Allowable values are: `service`, `platform_service`.
267267
* `name` - (Optional, String) The name of the composite child.
268-
* Constraints: The maximum length is `100` characters. The minimum length is `2` characters. The value must match regular expression `/^[a-zA-Z0-9\\-.]+$/`.
268+
* Constraints: The maximum length is `100` characters. The minimum length is `2` characters. The value must match regular expression `/^\\S*$/`.
269269
* `composite_kind` - (Optional, String) The type of the composite service.
270270
* Constraints: Allowable values are: `service`, `platform_service`.
271271
* `composite_tag` - (Optional, String) The tag used for the composite parent and its children.
@@ -545,7 +545,7 @@ Nested schema for **metadata**:
545545
* `terms_url` - (Optional, String) The URL for your product's end user license agreement.
546546
* Constraints: The maximum length is `2083` characters. The minimum length is `0` characters.
547547
* `name` - (Required, String) The programmatic name of this product.
548-
* Constraints: The value must match regular expression `/^[a-zA-Z0-9\\-.]+$/`.
548+
* Constraints: The value must match regular expression `/^\\S*$/`.
549549
* `object_id` - (Optional, String) The desired ID of the global catalog object.
550550
* `object_provider` - (Required, List) The provider or owner of the product.
551551
Nested schema for **object_provider**:
@@ -569,6 +569,7 @@ After your resource is created, you can read values from the listed arguments an
569569

570570
* `id` - The unique identifier of the onboarding_catalog_product.
571571
* `catalog_product_id` - (String) The ID of a global catalog object.
572+
* Constraints: The value must match regular expression `/^\\S*$/`.
572573
* `geo_tags` - (List)
573574
* Constraints: The list items must match regular expression `/./`. The maximum length is `1000` items. The minimum length is `0` items.
574575
* `group` - (Boolean) Flag for group tile legacy service.

website/docs/r/onboarding_iam_registration.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,9 @@ Nested schema for **display_name**:
301301
* `env` - (Optional, String) The environment to fetch this object from.
302302
* Constraints: The maximum length is `64` characters. The minimum length is `1` character. The value must match regular expression `/^[a-z_.-]+$/`.
303303
* `name` - (Required, String) The IAM registration name, which must be the programmatic name of the product.
304-
* Constraints: The value must match regular expression `/^[a-zA-Z0-9\\-.]+$/`.
304+
* Constraints: The value must match regular expression `/^\\S*$/`.
305305
* `parent_ids` - (Optional, List) The list of parent IDs for product access management.
306-
* Constraints: The list items must match regular expression `/^[a-zA-Z0-9\\-.]+$/`. The maximum length is `100` items. The minimum length is `0` items.
306+
* Constraints: The list items must match regular expression `/^\\S*$/`. The maximum length is `100` items. The minimum length is `0` items.
307307
* `product_id` - (Required, Forces new resource, String) The unique ID of the product.
308308
* Constraints: The maximum length is `71` characters. The minimum length is `71` characters. The value must match regular expression `/^[a-zA-Z0-9]{32}:o:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/`.
309309
* `resource_hierarchy_attribute` - (Optional, List) The resource hierarchy key-value pair for composite services.

website/docs/r/onboarding_product.html.markdown

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,15 @@ After your resource is created, you can read values from the listed arguments an
6464
* `account_id` - (String) The IBM Cloud account ID of the provider.
6565
* `approver_resource_id` - (String) The ID of the approval workflow of your product.
6666
* `global_catalog_offering_id` - (String) The ID of a global catalog object.
67+
* Constraints: The value must match regular expression `/^\\S*$/`.
6768
* `iam_registration_id` - (String) IAM registration identifier.
68-
* Constraints: The maximum length is `512` characters. The minimum length is `2` characters. The value must match regular expression `/^[a-zA-Z0-9\\-.]+$/`.
69+
* Constraints: The maximum length is `512` characters. The minimum length is `2` characters. The value must match regular expression `/^\\S*$/`.
6970
* `private_catalog_id` - (String) The ID of the private catalog that contains the product. Only applicable for software type products.
7071
* Constraints: The value must match regular expression `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`.
7172
* `private_catalog_offering_id` - (String) The ID of the linked private catalog product. Only applicable for software type products.
7273
* Constraints: The value must match regular expression `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`.
7374
* `staging_global_catalog_offering_id` - (String) The ID of a global catalog object.
75+
* Constraints: The value must match regular expression `/^\\S*$/`.
7476

7577

7678
## Import

0 commit comments

Comments
 (0)