Used 3.2.0 sdk locally to update resources. (#84)

* Used 3.2.0 sdk locally to update resources. * Updated from v0.0.2 to v0.0.3 for go-commercelayer-sdk * updated terraform resources for adyen gateway + payment method
incentro-ecx · Feb 1, 2023 · 09901ee · 09901ee
1 parent 579fc55
commit 09901ee
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 73 deletions.
diff --git a/commercelayer/resource_address.go b/commercelayer/resource_address.go
@@ -222,7 +222,7 @@ func resourceAddressCreateFunc(ctx context.Context, d *schema.ResourceData, i in
 
 	geocoderId := stringRef(relationships["geocoder_id"])
 	if geocoderId != nil {
-		addressCreate.Data.Relationships.Geocoder = &commercelayer.AddressDataRelationshipsGeocoder{
+		addressCreate.Data.Relationships.Geocoder = &commercelayer.AddressCreateDataRelationshipsGeocoder{
 			Data: commercelayer.AddressDataRelationshipsGeocoderData{
 				Type: stringRef(geocoderType),
 				Id:   stringRef(geocoderId),
@@ -286,7 +286,7 @@ func resourceAddressUpdateFunc(ctx context.Context, d *schema.ResourceData, i in
 
 	geocoderId := stringRef(relationships["geocoder_id"])
 	if geocoderId != nil {
-		addressUpdate.Data.Relationships.Geocoder = &commercelayer.AddressDataRelationshipsGeocoder{
+		addressUpdate.Data.Relationships.Geocoder = &commercelayer.AddressCreateDataRelationshipsGeocoder{
 			Data: commercelayer.AddressDataRelationshipsGeocoderData{
 				Type: stringRef(geocoderType),
 				Id:   geocoderId,

diff --git a/commercelayer/resource_delivery_lead_time.go b/commercelayer/resource_delivery_lead_time.go
@@ -132,15 +132,16 @@ func resourceDeliveryLeadTimesCreateFunc(ctx context.Context, d *schema.Resource
 				Metadata:        keyValueRef(attributes["metadata"]),
 			},
 			Relationships: &commercelayer.DeliveryLeadTimeCreateDataRelationships{
-				StockLocation: commercelayer.DeliveryLeadTimeDataRelationshipsStockLocation{
+				StockLocation: commercelayer.DeliveryLeadTimeCreateDataRelationshipsStockLocation{
 					Data: commercelayer.DeliveryLeadTimeDataRelationshipsStockLocationData{
 						Type: stringRef(stockLocationType),
 						Id:   stringRef(relationships["stock_location_id"]),
 					}},
-				ShippingMethod: commercelayer.DeliveryLeadTimeDataRelationshipsShippingMethod{Data: commercelayer.DeliveryLeadTimeDataRelationshipsShippingMethodData{
-					Type: stringRef(shippingMethodType),
-					Id:   stringRef(relationships["shipping_method_id"]),
-				}},
+				ShippingMethod: commercelayer.DeliveryLeadTimeCreateDataRelationshipsShippingMethod{
+					Data: commercelayer.DeliveryLeadTimeDataRelationshipsShippingMethodData{
+						Type: stringRef(shippingMethodType),
+						Id:   stringRef(relationships["shipping_method_id"]),
+					}},
 			},
 		},
 	}
@@ -185,15 +186,16 @@ func resourceDeliveryLeadTimesUpdateFunc(ctx context.Context, d *schema.Resource
 				Metadata:        keyValueRef(attributes["metadata"]),
 			},
 			Relationships: &commercelayer.DeliveryLeadTimeUpdateDataRelationships{
-				StockLocation: &commercelayer.DeliveryLeadTimeDataRelationshipsStockLocation{
+				StockLocation: &commercelayer.DeliveryLeadTimeCreateDataRelationshipsStockLocation{
 					Data: commercelayer.DeliveryLeadTimeDataRelationshipsStockLocationData{
 						Type: stringRef(stockLocationType),
 						Id:   stringRef(relationships["stock_location_id"]),
 					}},
-				ShippingMethod: &commercelayer.DeliveryLeadTimeDataRelationshipsShippingMethod{Data: commercelayer.DeliveryLeadTimeDataRelationshipsShippingMethodData{
-					Type: stringRef(shippingMethodType),
-					Id:   stringRef(relationships["shipping_method_id"]),
-				}},
+				ShippingMethod: &commercelayer.DeliveryLeadTimeCreateDataRelationshipsShippingMethod{
+					Data: commercelayer.DeliveryLeadTimeDataRelationshipsShippingMethodData{
+						Type: stringRef(shippingMethodType),
+						Id:   stringRef(relationships["shipping_method_id"]),
+					}},
 			},
 		},
 	}

diff --git a/commercelayer/resource_inventory_return_location.go b/commercelayer/resource_inventory_return_location.go
@@ -127,13 +127,13 @@ func resourceInventoryReturnLocationCreateFunc(ctx context.Context, d *schema.Re
 				Metadata:        keyValueRef(attributes["metadata"]),
 			},
 			Relationships: &commercelayer.InventoryReturnLocationCreateDataRelationships{
-				StockLocation: commercelayer.DeliveryLeadTimeDataRelationshipsStockLocation{
+				StockLocation: commercelayer.DeliveryLeadTimeCreateDataRelationshipsStockLocation{
 					Data: commercelayer.DeliveryLeadTimeDataRelationshipsStockLocationData{
 						Type: stringRef(stockLocationType),
 						Id:   stringRef(relationships["stock_location_id"]),
 					},
 				},
-				InventoryModel: commercelayer.InventoryReturnLocationDataRelationshipsInventoryModel{
+				InventoryModel: commercelayer.InventoryReturnLocationCreateDataRelationshipsInventoryModel{
 					Data: commercelayer.InventoryReturnLocationDataRelationshipsInventoryModelData{
 						Type: stringRef(inventoryModelType),
 						Id:   stringRef(relationships["inventory_model_id"]),
@@ -180,14 +180,14 @@ func resourceInventoryReturnLocationUpdateFunc(ctx context.Context, d *schema.Re
 				ReferenceOrigin: stringRef(attributes["reference_origin"]),
 				Metadata:        keyValueRef(attributes["metadata"]),
 			},
-			Relationships: &commercelayer.InventoryReturnLocationDataRelationships{
-				StockLocation: &commercelayer.DeliveryLeadTimeDataRelationshipsStockLocation{
+			Relationships: &commercelayer.InventoryReturnLocationUpdateDataRelationships{
+				StockLocation: &commercelayer.DeliveryLeadTimeCreateDataRelationshipsStockLocation{
 					Data: commercelayer.DeliveryLeadTimeDataRelationshipsStockLocationData{
 						Type: stringRef(stockLocationType),
 						Id:   stringRef(relationships["stock_location_id"]),
 					},
 				},
-				InventoryModel: &commercelayer.InventoryReturnLocationDataRelationshipsInventoryModel{
+				InventoryModel: &commercelayer.InventoryReturnLocationCreateDataRelationshipsInventoryModel{
 					Data: commercelayer.InventoryReturnLocationDataRelationshipsInventoryModelData{
 						Type: stringRef(inventoryModelType),
 						Id:   stringRef(relationships["inventory_model_id"]),

diff --git a/commercelayer/resource_inventory_stock_location.go b/commercelayer/resource_inventory_stock_location.go
@@ -136,13 +136,13 @@ func resourceInventoryStockLocationCreateFunc(ctx context.Context, d *schema.Res
 				Metadata:        keyValueRef(attributes["metadata"]),
 			},
 			Relationships: &commercelayer.InventoryReturnLocationCreateDataRelationships{
-				StockLocation: commercelayer.DeliveryLeadTimeDataRelationshipsStockLocation{
+				StockLocation: commercelayer.DeliveryLeadTimeCreateDataRelationshipsStockLocation{
 					Data: commercelayer.DeliveryLeadTimeDataRelationshipsStockLocationData{
 						Type: stringRef(stockLocationType),
 						Id:   stringRef(relationships["stock_location_id"]),
 					},
 				},
-				InventoryModel: commercelayer.InventoryReturnLocationDataRelationshipsInventoryModel{
+				InventoryModel: commercelayer.InventoryReturnLocationCreateDataRelationshipsInventoryModel{
 					Data: commercelayer.InventoryReturnLocationDataRelationshipsInventoryModelData{
 						Type: stringRef(inventoryModelType),
 						Id:   stringRef(relationships["inventory_model_id"]),
@@ -190,14 +190,14 @@ func resourceInventoryStockLocationUpdateFunc(ctx context.Context, d *schema.Res
 				ReferenceOrigin: stringRef(attributes["reference_origin"]),
 				Metadata:        keyValueRef(attributes["metadata"]),
 			},
-			Relationships: &commercelayer.InventoryReturnLocationDataRelationships{
-				StockLocation: &commercelayer.DeliveryLeadTimeDataRelationshipsStockLocation{
+			Relationships: &commercelayer.InventoryReturnLocationUpdateDataRelationships{
+				StockLocation: &commercelayer.DeliveryLeadTimeCreateDataRelationshipsStockLocation{
 					Data: commercelayer.DeliveryLeadTimeDataRelationshipsStockLocationData{
 						Type: stringRef(stockLocationType),
 						Id:   stringRef(relationships["stock_location_id"]),
 					},
 				},
-				InventoryModel: &commercelayer.InventoryReturnLocationDataRelationshipsInventoryModel{
+				InventoryModel: &commercelayer.InventoryReturnLocationCreateDataRelationshipsInventoryModel{
 					Data: commercelayer.InventoryReturnLocationDataRelationshipsInventoryModelData{
 						Type: stringRef(inventoryModelType),
 						Id:   stringRef(relationships["inventory_model_id"]),

diff --git a/commercelayer/resource_market.go b/commercelayer/resource_market.go
@@ -159,19 +159,19 @@ func resourceMarketCreateFunc(ctx context.Context, d *schema.ResourceData, i int
 				Metadata:          keyValueRef(attributes["metadata"]),
 			},
 			Relationships: &commercelayer.MarketCreateDataRelationships{
-				Merchant: commercelayer.MarketDataRelationshipsMerchant{
+				Merchant: commercelayer.MarketCreateDataRelationshipsMerchant{
 					Data: commercelayer.MarketDataRelationshipsMerchantData{
 						Type: stringRef(merchantType),
 						Id:   stringRef(relationships["merchant_id"]),
 					},
 				},
-				PriceList: commercelayer.MarketDataRelationshipsPriceList{
+				PriceList: commercelayer.MarketCreateDataRelationshipsPriceList{
 					Data: commercelayer.MarketDataRelationshipsPriceListData{
 						Type: stringRef(priceListType),
 						Id:   stringRef(relationships["price_list_id"]),
 					},
 				},
-				InventoryModel: commercelayer.InventoryReturnLocationDataRelationshipsInventoryModel{
+				InventoryModel: commercelayer.InventoryReturnLocationCreateDataRelationshipsInventoryModel{
 					Data: commercelayer.InventoryReturnLocationDataRelationshipsInventoryModelData{
 						Type: stringRef(inventoryModelType),
 						Id:   stringRef(relationships["inventory_model_id"]),
@@ -183,7 +183,7 @@ func resourceMarketCreateFunc(ctx context.Context, d *schema.ResourceData, i int
 
 	taxCalculatorId := stringRef(relationships["tax_calculator_id"])
 	if taxCalculatorId != nil {
-		marketCreate.Data.Relationships.TaxCalculator = &commercelayer.MarketDataRelationshipsTaxCalculator{
+		marketCreate.Data.Relationships.TaxCalculator = &commercelayer.MarketCreateDataRelationshipsTaxCalculator{
 			Data: commercelayer.MarketDataRelationshipsTaxCalculatorData{
 				Type: stringRef(taxCalculatorType),
 				Id:   taxCalculatorId,
@@ -192,7 +192,7 @@ func resourceMarketCreateFunc(ctx context.Context, d *schema.ResourceData, i int
 
 	customerGroupId := stringRef(relationships["customer_group_id"])
 	if customerGroupId != nil {
-		marketCreate.Data.Relationships.CustomerGroup = &commercelayer.CustomerDataRelationshipsCustomerGroup{
+		marketCreate.Data.Relationships.CustomerGroup = &commercelayer.CustomerCreateDataRelationshipsCustomerGroup{
 			Data: commercelayer.CustomerDataRelationshipsCustomerGroupData{
 				Type: stringRef(customerGroupType),
 				Id:   customerGroupId,
@@ -240,19 +240,19 @@ func resourceMarketUpdateFunc(ctx context.Context, d *schema.ResourceData, i int
 				Metadata:          keyValueRef(attributes["metadata"]),
 			},
 			Relationships: &commercelayer.MarketUpdateDataRelationships{
-				Merchant: &commercelayer.MarketDataRelationshipsMerchant{
+				Merchant: &commercelayer.MarketCreateDataRelationshipsMerchant{
 					Data: commercelayer.MarketDataRelationshipsMerchantData{
 						Type: stringRef(merchantType),
 						Id:   stringRef(relationships["merchant_id"]),
 					},
 				},
-				PriceList: &commercelayer.MarketDataRelationshipsPriceList{
+				PriceList: &commercelayer.MarketCreateDataRelationshipsPriceList{
 					Data: commercelayer.MarketDataRelationshipsPriceListData{
 						Type: stringRef(priceListType),
 						Id:   stringRef(relationships["price_list_id"]),
 					},
 				},
-				InventoryModel: &commercelayer.InventoryReturnLocationDataRelationshipsInventoryModel{
+				InventoryModel: &commercelayer.InventoryReturnLocationCreateDataRelationshipsInventoryModel{
 					Data: commercelayer.InventoryReturnLocationDataRelationshipsInventoryModelData{
 						Type: stringRef(inventoryModelType),
 						Id:   stringRef(relationships["inventory_model_id"]),
@@ -264,7 +264,7 @@ func resourceMarketUpdateFunc(ctx context.Context, d *schema.ResourceData, i int
 
 	taxCalculatorId := stringRef(relationships["tax_calculator_id"])
 	if taxCalculatorId != nil {
-		marketUpdate.Data.Relationships.TaxCalculator = &commercelayer.MarketDataRelationshipsTaxCalculator{
+		marketUpdate.Data.Relationships.TaxCalculator = &commercelayer.MarketCreateDataRelationshipsTaxCalculator{
 			Data: commercelayer.MarketDataRelationshipsTaxCalculatorData{
 				Type: stringRef(taxCalculatorType),
 				Id:   stringRef(taxCalculatorId),
@@ -273,7 +273,7 @@ func resourceMarketUpdateFunc(ctx context.Context, d *schema.ResourceData, i int
 
 	customerGroupId := stringRef(relationships["customer_group_id"])
 	if customerGroupId != nil {
-		marketUpdate.Data.Relationships.CustomerGroup = &commercelayer.CustomerDataRelationshipsCustomerGroup{
+		marketUpdate.Data.Relationships.CustomerGroup = &commercelayer.CustomerCreateDataRelationshipsCustomerGroup{
 			Data: commercelayer.CustomerDataRelationshipsCustomerGroupData{
 				Type: stringRef(customerGroupType),
 				Id:   stringRef(customerGroupId),

diff --git a/commercelayer/resource_merchant.go b/commercelayer/resource_merchant.go
@@ -121,7 +121,7 @@ func resourceMerchantCreateFunc(ctx context.Context, d *schema.ResourceData, i i
 				Metadata:        keyValueRef(attributes["metadata"]),
 			},
 			Relationships: &commercelayer.MerchantCreateDataRelationships{
-				Address: commercelayer.BingGeocoderDataRelationshipsAddresses{
+				Address: commercelayer.CustomerAddressCreateDataRelationshipsAddress{
 					Data: commercelayer.BingGeocoderDataRelationshipsAddressesData{
 						Type: stringRef(addressType),
 						Id:   stringRef(relationships["address_id"]),
@@ -169,7 +169,7 @@ func resourceMerchantUpdateFunc(ctx context.Context, d *schema.ResourceData, i i
 				Metadata:        keyValueRef(attributes["metadata"]),
 			},
 			Relationships: &commercelayer.MerchantUpdateDataRelationships{
-				Address: &commercelayer.BingGeocoderDataRelationshipsAddresses{
+				Address: &commercelayer.CustomerAddressCreateDataRelationshipsAddress{
 					Data: commercelayer.BingGeocoderDataRelationshipsAddressesData{
 						Type: stringRef(addressType),
 						Id:   stringRef(relationships["address_id"]),

diff --git a/commercelayer/resource_payment_method.go b/commercelayer/resource_payment_method.go
@@ -150,7 +150,7 @@ func resourcePaymentMethodCreateFunc(ctx context.Context, d *schema.ResourceData
 				Metadata:          keyValueRef(attributes["metadata"]),
 			},
 			Relationships: &commercelayer.PaymentMethodCreateDataRelationships{
-				PaymentGateway: commercelayer.AdyenPaymentDataRelationshipsPaymentGateway{
+				PaymentGateway: commercelayer.PaymentMethodCreateDataRelationshipsPaymentGateway{
 					Data: commercelayer.AdyenPaymentDataRelationshipsPaymentGatewayData{
 						Type: stringRef(adyenGatewaysType),
 						Id:   stringRef(relationships["payment_gateway_id"]),
@@ -162,7 +162,7 @@ func resourcePaymentMethodCreateFunc(ctx context.Context, d *schema.ResourceData
 
 	marketId := stringRef(relationships["market_id"])
 	if marketId != nil {
-		paymentMethodCreate.Data.Relationships.Market = &commercelayer.AvalaraAccountDataRelationshipsMarkets{
+		paymentMethodCreate.Data.Relationships.Market = &commercelayer.BillingInfoValidationRuleCreateDataRelationshipsMarket{
 			Data: commercelayer.AvalaraAccountDataRelationshipsMarketsData{
 				Type: stringRef(marketType),
 				Id:   marketId,
@@ -171,7 +171,7 @@ func resourcePaymentMethodCreateFunc(ctx context.Context, d *schema.ResourceData
 
 	paymentGatewayId := stringRef(relationships["payment_gateway_id"])
 	if paymentGatewayId != nil {
-		paymentMethodCreate.Data.Relationships.PaymentGateway = commercelayer.AdyenPaymentDataRelationshipsPaymentGateway{
+		paymentMethodCreate.Data.Relationships.PaymentGateway = commercelayer.PaymentMethodCreateDataRelationshipsPaymentGateway{
 			Data: commercelayer.AdyenPaymentDataRelationshipsPaymentGatewayData{
 				Type: stringRef(paymentGatewayType),
 				Id:   paymentGatewayId,
@@ -220,7 +220,7 @@ func resourcePaymentMethodUpdateFunc(ctx context.Context, d *schema.ResourceData
 				Metadata:          keyValueRef(attributes["metadata"]),
 			},
 			Relationships: &commercelayer.PaymentMethodUpdateDataRelationships{
-				PaymentGateway: &commercelayer.AdyenPaymentDataRelationshipsPaymentGateway{
+				PaymentGateway: &commercelayer.PaymentMethodCreateDataRelationshipsPaymentGateway{
 					Data: commercelayer.AdyenPaymentDataRelationshipsPaymentGatewayData{
 						Type: stringRef(adyenGatewaysType),
 						Id:   stringRef(relationships["payment_gateway_id"]),
@@ -232,7 +232,7 @@ func resourcePaymentMethodUpdateFunc(ctx context.Context, d *schema.ResourceData
 
 	marketId := stringRef(relationships["market_id"])
 	if marketId != nil {
-		paymentMethodUpdate.Data.Relationships.Market = &commercelayer.AvalaraAccountDataRelationshipsMarkets{
+		paymentMethodUpdate.Data.Relationships.Market = &commercelayer.BillingInfoValidationRuleCreateDataRelationshipsMarket{
 			Data: commercelayer.AvalaraAccountDataRelationshipsMarketsData{
 				Type: stringRef(marketType),
 				Id:   marketId,
@@ -242,7 +242,7 @@ func resourcePaymentMethodUpdateFunc(ctx context.Context, d *schema.ResourceData
 	paymentGatewayId := stringRef(relationships["payment_gateway_id"])
 	if paymentGatewayId != nil {
 		paymentMethodUpdate.Data.Relationships.PaymentGateway =
-			&commercelayer.AdyenPaymentDataRelationshipsPaymentGateway{
+			&commercelayer.PaymentMethodCreateDataRelationshipsPaymentGateway{
 				Data: commercelayer.AdyenPaymentDataRelationshipsPaymentGatewayData{
 					Type: stringRef(paymentGatewayType),
 					Id:   paymentGatewayId,