Skip to content

Commit c7a9893

Browse files
HarasztiaPeterHarasztiaPeter
authored
feat(partner center sell): associations field properly mapped (IBM-Cloud#6247)
* feat(partner center sell): associations field properly mapped Signed-off-by: Peter Harasztia <[email protected]> * feat(partner center sell): doc update Signed-off-by: Peter Harasztia <[email protected]> * feat(partner center sell): fix test and code for catalog product Signed-off-by: Peter Harasztia <[email protected]> * feat(partner center sell): fix code and test for catalog product Signed-off-by: Peter Harasztia <[email protected]> * feat(partner center sell): minor fix Signed-off-by: Peter Harasztia <[email protected]> * feat(partner center sell): update platofrm service sdk package for the new feature Signed-off-by: Peter Harasztia <[email protected]> * feat(partner center sell): resolve conflict Signed-off-by: Peter Harasztia <[email protected]> * feat(partner center sell): resolve conflict Signed-off-by: Peter Harasztia <[email protected]> --------- Signed-off-by: Peter Harasztia <[email protected]>
1 parent 7149041 commit c7a9893

11 files changed

+1620
-83
lines changed

‎examples/ibm-partner-center-sell/main.tf‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,20 @@ resource "ibm_onboarding_catalog_deployment" "onboarding_catalog_deployment_inst
9999
}
100100
value = [ "value" ]
101101
layout = "layout"
102-
associations = { "key" = "anything as a string" }
102+
associations {
103+
plan {
104+
show_for = [ "show_for" ]
105+
options_refresh = true
106+
}
107+
parameters {
108+
name = "name"
109+
show_for = [ "show_for" ]
110+
options_refresh = true
111+
}
112+
location {
113+
show_for = [ "show_for" ]
114+
}
115+
}
103116
validation_url = "validation_url"
104117
options_url = "options_url"
105118
invalidmessage = "invalidmessage"
@@ -368,7 +381,20 @@ resource "ibm_onboarding_catalog_product" "onboarding_catalog_product_instance"
368381
}
369382
value = [ "value" ]
370383
layout = "layout"
371-
associations = { "key" = "anything as a string" }
384+
associations {
385+
plan {
386+
show_for = [ "show_for" ]
387+
options_refresh = true
388+
}
389+
parameters {
390+
name = "name"
391+
show_for = [ "show_for" ]
392+
options_refresh = true
393+
}
394+
location {
395+
show_for = [ "show_for" ]
396+
}
397+
}
372398
validation_url = "validation_url"
373399
options_url = "options_url"
374400
invalidmessage = "invalidmessage"

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/IBM/logs-router-go-sdk v1.0.7
2929
github.com/IBM/mqcloud-go-sdk v0.2.0
3030
github.com/IBM/networking-go-sdk v0.51.5
31-
github.com/IBM/platform-services-go-sdk v0.81.1
31+
github.com/IBM/platform-services-go-sdk v0.81.2
3232
github.com/IBM/project-go-sdk v0.3.5
3333
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5
3434
github.com/IBM/sarama v1.45.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ github.com/IBM/mqcloud-go-sdk v0.2.0 h1:QOWk8ZGk0QfIL0MOGTKzNdM3Qe0Hk+ifAFtNSFQo
149149
github.com/IBM/mqcloud-go-sdk v0.2.0/go.mod h1:VZQKMtqmcdXKhmLhLiPuS/UHMs/5yo2tA/nD83cQt9E=
150150
github.com/IBM/networking-go-sdk v0.51.5 h1:75lKAx17y++hirXK5GcEM23mTRhHnhsv6gmhz70ex1Q=
151151
github.com/IBM/networking-go-sdk v0.51.5/go.mod h1:wyEnRnBnROgGmSn5UrryycIrbBujHKXf0PmI1NSwcjY=
152-
github.com/IBM/platform-services-go-sdk v0.81.1 h1:Ch9wUIigyA3HzW7MQnA1WTHAw+QA6W4bSP3ThgzDpx0=
153-
github.com/IBM/platform-services-go-sdk v0.81.1/go.mod h1:XOowH+JnIih3FA7uilLVM/9VH7XgCmJ4T/i6eZi7gkw=
152+
github.com/IBM/platform-services-go-sdk v0.81.2 h1:ZE52eDNiblpIQrsRf5VySi1y3AH6H/KI3eNNKDKdN/g=
153+
github.com/IBM/platform-services-go-sdk v0.81.2/go.mod h1:XOowH+JnIih3FA7uilLVM/9VH7XgCmJ4T/i6eZi7gkw=
154154
github.com/IBM/project-go-sdk v0.3.5 h1:L+YClFUa14foS0B/hOOY9n7sIdsT5/XQicnXOyJSpyM=
155155
github.com/IBM/project-go-sdk v0.3.5/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo=
156156
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5 h1:NPUhkoOCRuv3OFWt19PmwjXGGTKlvmbuPg9fUrBUNe4=

‎ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment.go‎

Lines changed: 310 additions & 16 deletions
Large diffs are not rendered by default.

‎ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment_test.go‎

Lines changed: 458 additions & 25 deletions
Large diffs are not rendered by default.

‎ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ func ResourceIbmOnboardingCatalogPlanMapToGlobalCatalogPlanMetadataPrototypePatc
916916
}
917917
model.Plan = PlanModel
918918
}
919-
if modelMap["other"] != nil && len(modelMap["other"].([]interface{})) > 0 {
919+
if modelMap["other"] != nil && len(modelMap["other"].([]interface{})) > 0 && modelMap["other"].([]interface{})[0] != nil {
920920
OtherModel, err := ResourceIbmOnboardingCatalogPlanMapToGlobalCatalogPlanMetadataOther(modelMap["other"].([]interface{})[0].(map[string]interface{}))
921921
if err != nil {
922922
return model, err
@@ -1126,7 +1126,7 @@ func ResourceIbmOnboardingCatalogPlanMapToGlobalCatalogPlanMetadataPlan(modelMap
11261126

11271127
func ResourceIbmOnboardingCatalogPlanMapToGlobalCatalogPlanMetadataOther(modelMap map[string]interface{}) (*partnercentersellv1.GlobalCatalogPlanMetadataOther, error) {
11281128
model := &partnercentersellv1.GlobalCatalogPlanMetadataOther{}
1129-
if modelMap["resource_controller"] != nil && len(modelMap["resource_controller"].([]interface{})) > 0 {
1129+
if modelMap["resource_controller"] != nil && len(modelMap["resource_controller"].([]interface{})) > 0 && modelMap["resource_controller"].([]interface{})[0] != nil {
11301130
ResourceControllerModel, err := ResourceIbmOnboardingCatalogPlanMapToGlobalCatalogPlanMetadataOtherResourceController(modelMap["resource_controller"].([]interface{})[0].(map[string]interface{}))
11311131
if err != nil {
11321132
return model, err

‎ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestAccIbmOnboardingCatalogPlanBasic(t *testing.T) {
2424
var conf partnercentersellv1.GlobalCatalogPlan
2525
productID := acc.PcsOnboardingProductWithCatalogProduct
2626
catalogProductID := acc.PcsOnboardingCatalogProductId
27-
objectId := fmt.Sprintf("test-object-id-terraform-2-%d", acctest.RandIntRange(10, 100))
27+
objectId := fmt.Sprintf("test-object-id-terraform-3-%d", acctest.RandIntRange(10, 100))
2828
name := "test-plan-name-terraform"
2929
active := "true"
3030
disabled := "false"
@@ -70,7 +70,7 @@ func TestAccIbmOnboardingCatalogPlanAllArgs(t *testing.T) {
7070
var conf partnercentersellv1.GlobalCatalogPlan
7171
productID := acc.PcsOnboardingProductWithCatalogProduct
7272
catalogProductID := acc.PcsOnboardingCatalogProductId
73-
objectId := fmt.Sprintf("test-object-id-terraform-2-%d", acctest.RandIntRange(10, 100))
73+
objectId := fmt.Sprintf("test-object-id-terraform-3-%d", acctest.RandIntRange(10, 100))
7474
env := "current"
7575
name := "test-plan-name-terraform"
7676
active := "true"

0 commit comments

Comments
 (0)