Merge remote-tracking branch 'origin/main' into 529-add-support-for-p…

…roject-productsearchindexingmode

# Conflicts:
#	go.mod

.changes/unreleased/Added-20241022-162737.yaml

@@ -0,0 +1,3 @@
+kind: Added
+body: Added stores to cart discounts
+time: 2024-10-22T16:27:37.948019802+02:00

commercetools/resource_cart_discount.go

@@ -168,6 +168,16 @@ func resourceCartDiscount() *schema.Resource {
 					},
 				},
 			},
+			"stores": {
+				Description: "If a value exists, the Cart Discount applies on Carts having a Store matching any " +
+					"Store defined for this field. If empty, the Cart Discount applies on all Carts, irrespective of " +
+					"a Store. Use store keys as references",
+				Type: schema.TypeSet,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Optional: true,
+			},
 			"sort_order": {
 				Description: "The string must contain a number between 0 and 1. All matching cart discounts are " +
 					"applied to a cart in the order defined by this field. A discount with greater sort order is " +
@@ -301,6 +311,7 @@ func resourceCartDiscountCreate(ctx context.Context, d *schema.ResourceData, m a
 		SortOrder:            d.Get("sort_order").(string),
 		IsActive:             boolRef(d.Get("is_active")),
 		RequiresDiscountCode: ctutils.BoolRef(d.Get("requires_discount_code").(bool)),
+		Stores:               expandStores(d.Get("stores").(*schema.Set)),
 		Custom:               custom,
 		StackingMode:         &stackingMode,
 	}
@@ -377,6 +388,7 @@ func resourceCartDiscountRead(ctx context.Context, d *schema.ResourceData, m any
 	_ = d.Set("requires_discount_code", cartDiscount.RequiresDiscountCode)
 	_ = d.Set("stacking_mode", cartDiscount.StackingMode)
 	_ = d.Set("custom", flattenCustomFields(cartDiscount.Custom))
+	_ = d.Set("stores", flattenStores(cartDiscount.Stores))
 	return nil
 }
 
@@ -514,6 +526,13 @@ func resourceCartDiscountUpdate(ctx context.Context, d *schema.ResourceData, m a
 		}
 	}
 
+	if d.HasChange("stores") {
+		stores := expandStores(d.Get("stores").(*schema.Set))
+		input.Actions = append(
+			input.Actions,
+			&platform.CartDiscountSetStoresAction{Stores: stores})
+	}
+
 	err := retry.RetryContext(ctx, 1*time.Minute, func() *retry.RetryError {
 		_, err := client.CartDiscounts().WithId(d.Id()).Post(input).Execute(ctx)
 		return utils.ProcessRemoteError(err)
@@ -762,3 +781,21 @@ func expandSelectionMode(selectionMode string) (platform.SelectionMode, error) {
 		return "", fmt.Errorf("selection mode %s not implemented", selectionMode)
 	}
 }
+
+func flattenStores(storeKeyReferences []platform.StoreKeyReference) []string {
+	var storeKeys []string
+	for _, store := range storeKeyReferences {
+		storeKeys = append(storeKeys, store.Key)
+	}
+
+	return storeKeys
+}
+
+func expandStores(storeKeys *schema.Set) []platform.StoreResourceIdentifier {
+	storeResourceIdentifiers := make([]platform.StoreResourceIdentifier, 0, storeKeys.Len())
+	for _, key := range storeKeys.List() {
+		var keyVal = key.(string)
+		storeResourceIdentifiers = append(storeResourceIdentifiers, platform.StoreResourceIdentifier{Key: &keyVal})
+	}
+	return storeResourceIdentifiers
+}

commercetools/resource_cart_discount_stores_test.go

@@ -0,0 +1,100 @@
+package commercetools
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccCartDiscountStores(t *testing.T) {
+	identifier := "stores"
+	resourceName := "commercetools_cart_discount.stores"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviders,
+		CheckDestroy:      testAccCheckCartDiscountDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCartDiscountWithoutStores(identifier),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "stores.#", "0"),
+				),
+			},
+			{
+				Config: testAccCartDiscountWithStores(identifier),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckTypeSetElemAttr(resourceName, "stores.*", "my-store"),
+				),
+			},
+			{
+				Config: testAccCartDiscountWithoutStores(identifier),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "stores.#", "0"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCartDiscountWithoutStores(identifier string) string {
+	return hclTemplate(`
+		resource "commercetools_cart_discount" "{{ .identifier }}" {
+			name = {
+				en = "fixed name"
+			}
+			sort_order             = "0.9"
+			predicate              = "1=1"
+
+			target {
+				type      = "shipping"
+			}
+
+			value {
+				type      = "fixed"
+				money {
+					currency_code = "USD"
+					cent_amount   = 1000
+				}
+			}
+		}
+	`, map[string]any{
+		"identifier": identifier,
+	})
+}
+
+func testAccCartDiscountWithStores(identifier string) string {
+	return hclTemplate(`
+		resource "commercetools_store" "my-store-{{ .identifier }}" {
+		  key = "my-store"
+		  name = {
+			en-US = "My store"
+		  }
+		  countries = ["NL", "BE"]
+		  languages = ["nl-NL"]
+		}
+	
+		resource "commercetools_cart_discount" "{{ .identifier }}" {
+			name = {
+				en = "fixed name"
+			}
+  			stores = [commercetools_store.my-store-{{ .identifier }}.key]
+			sort_order             = "0.9"
+			predicate              = "1=1"
+
+			target {
+				type      = "shipping"
+			}
+
+			value {
+				type      = "fixed"
+				money {
+					currency_code = "USD"
+					cent_amount   = 1000
+				}
+			}
+		}
+	`, map[string]any{
+		"identifier": identifier,
+	})
+}

docs/resources/cart_discount.md

@@ -170,6 +170,7 @@ resource "commercetools_cart_discount" "my-cart-discount" {
 - `key` (String) User-specific unique identifier for a cart discount. Must be unique across a project
 - `requires_discount_code` (Boolean) States whether the discount can only be used in a connection with a [DiscountCode](https://docs.commercetools.com/api/projects/discountCodes#discountcode)
 - `stacking_mode` (String) Specifies whether the application of this discount causes the following discounts to be ignored. Can be either Stacking or StopAfterThisDiscount
+- `stores` (Set of String) If a value exists, the Cart Discount applies on Carts having a Store matching any Store defined for this field. If empty, the Cart Discount applies on all Carts, irrespective of a Store. Use store keys as references
 - `target` (Block List, Max: 1) Empty when the value has type giftLineItem, otherwise a [CartDiscountTarget](https://docs.commercetools.com/api/projects/cartDiscounts#cartdiscounttarget) (see [below for nested schema](#nestedblock--target))
 - `valid_from` (String)
 - `valid_until` (String)

go.mod

@@ -4,6 +4,8 @@ go 1.22.0
 
 toolchain go1.22.8
 
+//replace github.com/labd/commercetools-go-sdk v1.5.1 => ../commercetools-go-sdk
+
 require (
 	github.com/elliotchance/orderedmap/v2 v2.4.0
 	github.com/elliotchance/pie/v2 v2.9.0

templates/index.md.tmpl

@@ -49,7 +49,6 @@ provider "commercetools" {
   client_id     = "<your client id>"
   client_secret = "<your client secret>"
   project_key   = "<your project key>"
-  project_key   = "<your project key>"
   scopes        = "<space seperated list of scopes>"
   api_url       = "<api url>"
   token_url     = "<token url>"