Merge pull request #390 from ovh/376-ovh_vrack-creation-default-payment-mean-does-not-work-for-payment_mean

Fix issue to be able to order with BankAccount or CreditCard

Author: scraly

ovh/data_hosting_privatedatabase_database_test.go

@@ -24,7 +24,6 @@ data "ovh_order_cart" "mycart" {
 	
   resource "ovh_hosting_privatedatabase" "database" {
 	ovh_subsidiary = data.ovh_order_cart.mycart.ovh_subsidiary
-	payment_mean   = "ovh-account"
 	display_name   = "%s"
   
 	plan {

ovh/data_hosting_privatedatabase_test.go

@@ -24,7 +24,6 @@ data "ovh_order_cart" "mycart" {
 	
   resource "ovh_hosting_privatedatabase" "database" {
 	ovh_subsidiary = data.ovh_order_cart.mycart.ovh_subsidiary
-	payment_mean   = "ovh-account"
 	display_name   = "%s"
   
 	plan {

ovh/data_hosting_privatedatabase_user_grant_test.go

@@ -24,7 +24,6 @@ data "ovh_order_cart" "mycart" {
 	
   resource "ovh_hosting_privatedatabase" "database" {
 	ovh_subsidiary = data.ovh_order_cart.mycart.ovh_subsidiary
-	payment_mean   = "ovh-account"
 	display_name   = "%s"
   
 	plan {

ovh/data_hosting_privatedatabase_user_test.go

@@ -24,7 +24,6 @@ data "ovh_order_cart" "mycart" {
 	
   resource "ovh_hosting_privatedatabase" "database" {
 	ovh_subsidiary = data.ovh_order_cart.mycart.ovh_subsidiary
-	payment_mean   = "ovh-account"
 	display_name   = "%s"
   
 	plan {

ovh/data_hosting_privatedatabase_whitelist_test.go

@@ -24,7 +24,6 @@ data "ovh_order_cart_product_plan" "database" {
 	
 resource "ovh_hosting_privatedatabase" "database" {
 	ovh_subsidiary = data.ovh_order_cart.mycart.ovh_subsidiary
-	payment_mean   = "ovh-account"
 	display_name   = "%s"
   
 	plan {

ovh/data_ip_service_test.go

@@ -23,7 +23,6 @@ data "ovh_order_cart_product_plan" "ipblock" {
 
 resource "ovh_ip_service" "ipblock" {
   ovh_subsidiary = data.ovh_order_cart.mycart.ovh_subsidiary
-  payment_mean   = "ovh-account"
   description   = "%s"
 
  plan {

ovh/data_me_paymentmean_bankaccount.go

@@ -60,6 +60,7 @@ func dataSourceMePaymentmeanBankaccount() *schema.Resource {
 				Computed: true,
 			},
 		},
+		DeprecationMessage: "paymentmean API is deprecated. In order process, the account default payment method is used.",
 	}
 }
 

ovh/data_me_paymentmean_creditcard.go

@@ -62,6 +62,7 @@ func dataSourceMePaymentmeanCreditcard() *schema.Resource {
 				Computed: true,
 			},
 		},
+		DeprecationMessage: "paymentmean API is deprecated. In order process, the account default payment method is used.",
 	}
 }
 

ovh/order.go

@@ -41,8 +41,9 @@ func genericOrderSchema(withOptions bool) map[string]*schema.Schema {
 		},
 		"payment_mean": {
 			Type:        schema.TypeString,
-			Required:    true,
+			Optional:    true,
 			ForceNew:    true,
+			Deprecated:  "This field is not anymore used since the API has been deprecated in favor of /payment/mean. Now, the default payment mean is used.",
 			Description: "Ovh payment mode",
 			ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
 				err := helpers.ValidateStringEnum(strings.ToLower(v.(string)), []string{
@@ -303,6 +304,16 @@ func orderCreate(d *schema.ResourceData, meta interface{}, product string) error
 		}
 	}
 
+	// get defaultPayment
+	paymentIds := []int64{}
+	endpoint = "/me/payment/method?default=true"
+	if err := config.OVHClient.Get(endpoint, &paymentIds); err != nil {
+		return fmt.Errorf("calling Get %s \n\t %q", endpoint, err)
+	}
+	if len(paymentIds) == 0 {
+		return fmt.Errorf("no default payment found")
+	}
+
 	// Create Order
 	log.Printf("[DEBUG] Will create order %s for cart: %s", product, cart.CartId)
 	order := &MeOrder{}
@@ -313,33 +324,18 @@ func orderCreate(d *schema.ResourceData, meta interface{}, product string) error
 	}
 
 	// Pay Order
-	log.Printf("[DEBUG] Will pay order %d", order.OrderId)
-
-	var paymentMeanOpts *MeOrderPaymentOpts
-	paymentMean := d.Get("payment_mean").(string)
-
-	switch strings.ToLower(paymentMean) {
-	case "default-payment-mean":
-		paymentMeanOpts, err = MePaymentMeanDefaultPaymentOpts(config.OVHClient)
-		if err != nil {
-			return fmt.Errorf("Could not order product: %v.", err)
-		}
-		if paymentMeanOpts == nil {
-			return fmt.Errorf("Could not find any default payment mean to order product.")
-		}
-	case "ovh-account":
-		paymentMeanOpts = MePaymentMeanOvhAccountPaymentOpts
-	case "fidelity":
-		paymentMeanOpts = MePaymentMeanFidelityAccountPaymentOpts
-	default:
-		return fmt.Errorf("Unsupported payment mean. This is a bug with the provider.")
-	}
+	log.Printf("[DEBUG] Will pay order %d with PaymentId %d", order.OrderId, paymentIds[0])
 
 	endpoint = fmt.Sprintf(
-		"/me/order/%d/payWithRegisteredPaymentMean",
+		"/me/order/%d/pay",
 		order.OrderId,
 	)
-	if err := config.OVHClient.Post(endpoint, paymentMeanOpts, nil); err != nil {
+	var paymentMethodOpts = &MeOrderPaymentMethodOpts{
+		PaymentMethod: PaymentMethod{
+			Id: paymentIds[0],
+		},
+	}
+	if err := config.OVHClient.Post(endpoint, paymentMethodOpts, nil); err != nil {
 		return fmt.Errorf("calling Post %s:\n\t %q", endpoint, err)
 	}
 

ovh/resource_cloud_project_test.go

@@ -29,8 +29,7 @@ data "ovh_order_cart_product_plan" "cloud" {
 resource "ovh_cloud_project" "cloud" {
  ovh_subsidiary = data.ovh_order_cart.mycart.ovh_subsidiary
  description    = "%s"
- payment_mean   = "fidelity"
-
+ 
  plan {
    duration     = data.ovh_order_cart_product_plan.cloud.selected_price.0.duration
    plan_code    = data.ovh_order_cart_product_plan.cloud.plan_code