Merge pull request #648 from labd/fix/update-commercetools-go-sdk

fix: updated commercetools go sdk

Author: demeyerthom

.changes/unreleased/Fixed-20260410-113216.yaml

@@ -0,0 +1,3 @@
+kind: Fixed
+body: Updated to commercetools-go-sdk 1.9.0
+time: 2026-04-10T11:32:16.447617502+02:00

.github/workflows/tests.yaml

@@ -9,7 +9,7 @@ jobs:
 
     services:
       commercetools:
-        image: labdigital/commercetools-mock-server:3.0.0-beta.1
+        image: labdigital/commercetools-mock-server:3.0.0-beta.3
         ports:
         - 8989:8989
 

docker-compose.yaml

@@ -1,5 +1,7 @@
 services:
   commercetools:
-    image: labdigital/commercetools-mock-server:3.0.0-beta.1
+    image: labdigital/commercetools-mock-server:3.0.0-beta.3
+    environment:
+      EXPERIMENTAL_SQLITE_STORAGE: "false"
     ports:
       - 8989:8989

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/hashicorp/terraform-plugin-go v0.31.0
 	github.com/hashicorp/terraform-plugin-mux v0.23.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.40.0
-	github.com/labd/commercetools-go-sdk v1.8.0
+	github.com/labd/commercetools-go-sdk v1.9.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/stretchr/testify v1.11.1
 	golang.org/x/oauth2 v0.36.0

go.sum

@@ -150,8 +150,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/labd/commercetools-go-sdk v1.8.0 h1:Y/KM2T2yFOAIntL/XC1ZV9qFX2GhvofY5Z71fKSqEoc=
-github.com/labd/commercetools-go-sdk v1.8.0/go.mod h1:bdmryE8EngnaYJXt3CYZ1Dcob7HufD6KASZYX1Aa4Kk=
+github.com/labd/commercetools-go-sdk v1.9.0 h1:ZeAtYM5RL7uNb+STvIr6rKJGMMWYZAjyKg6sWWrmrFk=
+github.com/labd/commercetools-go-sdk v1.9.0/go.mod h1:QMG2KGTVY7uyVDJTKvaaFnw8h5lZwq/SEBlPVPrMrQ0=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=

internal/resources/project/model.go

@@ -13,8 +13,9 @@ import (
 )
 
 const (
-	DefaultDeleteDaysAfterCreation   = 15
-	DefaultDaysAfterLastModification = 90
+	DefaultMessagesDeleteDaysAfterCreation              = 15
+	DefaultCartsDeleteDaysAfterLastModification         = 90
+	DefaultShoppingListsDeleteDaysAfterLastModification = 360
 )
 
 type Project struct {
@@ -52,7 +53,7 @@ func IsDefaultShoppingListsConfiguration(c *platform.ShoppingListsConfiguration)
 		return true
 	}
 
-	return c.DeleteDaysAfterLastModification == nil || *c.DeleteDaysAfterLastModification == DefaultDaysAfterLastModification
+	return c.DeleteDaysAfterLastModification == 0 || c.DeleteDaysAfterLastModification == DefaultShoppingListsDeleteDaysAfterLastModification
 }
 
 func NewProjectFromNative(n *platform.Project) Project {
@@ -81,9 +82,14 @@ func NewProjectFromNative(n *platform.Project) Project {
 		BusinessUnits: []BusinessUnits{},
 	}
 
+	var cartsDeleteDaysAfterLastModification = DefaultCartsDeleteDaysAfterLastModification
+	if n.Carts.DeleteDaysAfterLastModification != 0 {
+		cartsDeleteDaysAfterLastModification = n.Carts.DeleteDaysAfterLastModification
+	}
+
 	res.Carts = []Carts{
 		{
-			DeleteDaysAfterLastModification: utils.FromOptionalInt(n.Carts.DeleteDaysAfterLastModification),
+			DeleteDaysAfterLastModification: types.Int64Value(int64(cartsDeleteDaysAfterLastModification)),
 			CountryTaxRateFallbackEnabled:   utils.FromOptionalBool(n.Carts.CountryTaxRateFallbackEnabled),
 			PriceRoundingMode:               utils.FromOptionalString((*string)(n.Carts.PriceRoundingMode)),
 			TaxRoundingMode:                 utils.FromOptionalString((*string)(n.Carts.TaxRoundingMode)),
@@ -93,7 +99,7 @@ func NewProjectFromNative(n *platform.Project) Project {
 	if !IsDefaultShoppingListsConfiguration(n.ShoppingLists) {
 		res.ShoppingLists = []ShoppingList{
 			{
-				DeleteDaysAfterLastModification: utils.FromOptionalInt(n.ShoppingLists.DeleteDaysAfterLastModification),
+				DeleteDaysAfterLastModification: types.Int64Value(int64(n.ShoppingLists.DeleteDaysAfterLastModification)),
 			},
 		}
 	}
@@ -118,7 +124,7 @@ func NewProjectFromNative(n *platform.Project) Project {
 	// If delete_days_after_creation is nil (before version 1.6) then we set it
 	// to the commercetools default of 15
 	if res.Messages[0].DeleteDaysAfterCreation.IsNull() {
-		res.Messages[0].DeleteDaysAfterCreation = types.Int64Value(DefaultDeleteDaysAfterCreation)
+		res.Messages[0].DeleteDaysAfterCreation = types.Int64Value(DefaultMessagesDeleteDaysAfterCreation)
 	}
 
 	if n.SearchIndexing != nil && n.SearchIndexing.Products != nil && n.SearchIndexing.Products.Status != nil {
@@ -188,7 +194,7 @@ func (p *Project) setStateData(o Project) {
 
 	// The commercetools default for delete_days_after_creation is 15, so if the
 	if len(p.Messages) > 0 && len(o.Messages) > 0 {
-		if p.Messages[0].DeleteDaysAfterCreation.ValueInt64() == DefaultDeleteDaysAfterCreation && o.Messages[0].DeleteDaysAfterCreation.IsNull() {
+		if p.Messages[0].DeleteDaysAfterCreation.ValueInt64() == DefaultCartsDeleteDaysAfterLastModification && o.Messages[0].DeleteDaysAfterCreation.IsNull() {
 			p.Messages[0].DeleteDaysAfterCreation = o.Messages[0].DeleteDaysAfterCreation
 		}
 	}
@@ -214,7 +220,7 @@ func (p *Project) updateActions(plan Project) (platform.ProjectUpdate, error) {
 			result.Actions = append(result.Actions,
 				platform.ProjectChangeCartsConfigurationAction{
 					CartsConfiguration: platform.CartsConfiguration{
-						DeleteDaysAfterLastModification: utils.IntRef(DefaultDaysAfterLastModification),
+						DeleteDaysAfterLastModification: DefaultCartsDeleteDaysAfterLastModification,
 					},
 				},
 				platform.ProjectChangeCountryTaxRateFallbackEnabledAction{
@@ -252,7 +258,7 @@ func (p *Project) updateActions(plan Project) (platform.ProjectUpdate, error) {
 			result.Actions = append(result.Actions,
 				platform.ProjectChangeShoppingListsConfigurationAction{
 					ShoppingListsConfiguration: platform.ShoppingListsConfiguration{
-						DeleteDaysAfterLastModification: utils.IntRef(DefaultDaysAfterLastModification),
+						DeleteDaysAfterLastModification: DefaultShoppingListsDeleteDaysAfterLastModification,
 					},
 				},
 			)
@@ -307,16 +313,17 @@ func (p *Project) updateActions(plan Project) (platform.ProjectUpdate, error) {
 					MessagesConfiguration: plan.Messages[0].toNative(),
 				},
 			)
-		} else {
-			// Set message configuration to the default values
-			result.Actions = append(result.Actions,
-				platform.ProjectChangeMessagesConfigurationAction{
-					MessagesConfiguration: platform.MessagesConfigurationDraft{
-						Enabled:                 false,
-						DeleteDaysAfterCreation: DefaultDeleteDaysAfterCreation,
+		} else if len(p.Messages) > 0 {
+			defaultMessagesConfiguration := platform.MessagesConfigurationDraft{
+				DeleteDaysAfterCreation: DefaultMessagesDeleteDaysAfterCreation,
+			}
+			if !reflect.DeepEqual(p.Messages[0].toNative(), defaultMessagesConfiguration) {
+				result.Actions = append(result.Actions,
+					platform.ProjectChangeMessagesConfigurationAction{
+						MessagesConfiguration: defaultMessagesConfiguration,
 					},
-				},
-			)
+				)
+			}
 		}
 	}
 
@@ -491,7 +498,7 @@ type Messages struct {
 }
 
 func (m Messages) toNative() platform.MessagesConfigurationDraft {
-	days := DefaultDeleteDaysAfterCreation // Commercetools default
+	days := DefaultMessagesDeleteDaysAfterCreation // Commercetools default
 
 	if !m.DeleteDaysAfterCreation.IsNull() {
 		days = int(m.DeleteDaysAfterCreation.ValueInt64())
@@ -503,7 +510,7 @@ func (m Messages) toNative() platform.MessagesConfigurationDraft {
 	}
 }
 func (m Messages) isDefault() bool {
-	return !m.toNative().Enabled && m.DeleteDaysAfterCreation.ValueInt64() == DefaultDeleteDaysAfterCreation
+	return !m.toNative().Enabled && m.DeleteDaysAfterCreation.ValueInt64() == DefaultMessagesDeleteDaysAfterCreation
 }
 
 type ExternalOAuth struct {
@@ -527,7 +534,7 @@ type Carts struct {
 
 func (c Carts) isDefault() bool {
 	return !c.CountryTaxRateFallbackEnabled.ValueBool() &&
-		c.DeleteDaysAfterLastModification.ValueInt64() == DefaultDaysAfterLastModification &&
+		c.DeleteDaysAfterLastModification.ValueInt64() == DefaultCartsDeleteDaysAfterLastModification &&
 		(c.PriceRoundingMode.IsNull() || c.PriceRoundingMode.ValueString() == string(platform.RoundingModeHalfEven)) &&
 		(c.TaxRoundingMode.IsNull() || c.TaxRoundingMode.ValueString() == string(platform.RoundingModeHalfEven))
 }
@@ -537,7 +544,7 @@ func (c Carts) toNative() platform.CartsConfiguration {
 	taxRoundingMode := platform.RoundingMode(c.TaxRoundingMode.ValueString())
 
 	return platform.CartsConfiguration{
-		DeleteDaysAfterLastModification: utils.OptionalInt(c.DeleteDaysAfterLastModification),
+		DeleteDaysAfterLastModification: int(c.DeleteDaysAfterLastModification.ValueInt64()),
 		CountryTaxRateFallbackEnabled:   utils.BoolRef(c.CountryTaxRateFallbackEnabled.ValueBool()),
 		PriceRoundingMode:               &priceRoundingMode,
 		TaxRoundingMode:                 &taxRoundingMode,
@@ -549,12 +556,12 @@ type ShoppingList struct {
 }
 
 func (c ShoppingList) isDefault() bool {
-	return c.DeleteDaysAfterLastModification.ValueInt64() == DefaultDaysAfterLastModification
+	return c.DeleteDaysAfterLastModification.ValueInt64() == DefaultShoppingListsDeleteDaysAfterLastModification
 }
 
 func (c ShoppingList) toNative() platform.ShoppingListsConfiguration {
 	return platform.ShoppingListsConfiguration{
-		DeleteDaysAfterLastModification: utils.OptionalInt(c.DeleteDaysAfterLastModification),
+		DeleteDaysAfterLastModification: int(c.DeleteDaysAfterLastModification.ValueInt64()),
 	}
 }
 

internal/resources/project/model_test.go

@@ -43,15 +43,15 @@ func TestNewProjectFromNative(t *testing.T) {
 				Carts: []Carts{
 					{
 						CountryTaxRateFallbackEnabled:   types.BoolNull(),
-						DeleteDaysAfterLastModification: types.Int64Null(),
+						DeleteDaysAfterLastModification: types.Int64Value(DefaultCartsDeleteDaysAfterLastModification),
 						PriceRoundingMode:               types.StringNull(),
 						TaxRoundingMode:                 types.StringNull(),
 					},
 				},
 				Messages: []Messages{
 					{
 						Enabled:                 types.BoolValue(false),
-						DeleteDaysAfterCreation: types.Int64Value(DefaultDeleteDaysAfterCreation),
+						DeleteDaysAfterCreation: types.Int64Value(DefaultMessagesDeleteDaysAfterCreation),
 					},
 				},
 				ShippingRateCartClassificationValue: []models.CustomFieldLocalizedEnumValue{},
@@ -158,7 +158,7 @@ func TestUpdateActions(t *testing.T) {
 				Actions: []platform.ProjectUpdateAction{
 					platform.ProjectChangeCartsConfigurationAction{
 						CartsConfiguration: platform.CartsConfiguration{
-							DeleteDaysAfterLastModification: utils.Ref(90),
+							DeleteDaysAfterLastModification: 90,
 							CountryTaxRateFallbackEnabled:   utils.Ref(false),
 							PriceRoundingMode:               utils.Ref(platform.RoundingModeHalfEven),
 							TaxRoundingMode:                 utils.Ref(platform.RoundingModeHalfEven),
@@ -532,7 +532,7 @@ func IsDefaultShoppingListsConfiguration_Nil(t *testing.T) {
 
 func IsDefaultShoppingListsConfiguration_DefaultValue(t *testing.T) {
 	c := &platform.ShoppingListsConfiguration{
-		DeleteDaysAfterLastModification: utils.IntRef(DefaultDaysAfterLastModification),
+		DeleteDaysAfterLastModification: DefaultShoppingListsDeleteDaysAfterLastModification,
 	}
 	assert.True(t, IsDefaultShoppingListsConfiguration(c))
 }
@@ -544,7 +544,7 @@ func IsDefaultShoppingListsConfiguration_NilDeleteDays(t *testing.T) {
 
 func IsDefaultShoppingListsConfiguration_NonDefaultDeleteDays(t *testing.T) {
 	c := &platform.ShoppingListsConfiguration{
-		DeleteDaysAfterLastModification: utils.IntRef(30),
+		DeleteDaysAfterLastModification: 30,
 	}
 	assert.False(t, IsDefaultShoppingListsConfiguration(c))
 }

internal/resources/project/resource.go

@@ -14,8 +14,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
-	"github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier"
-	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
@@ -175,16 +173,14 @@ func (r *projectResource) Schema(_ context.Context, _ resource.SchemaRequest, re
 						"enabled": schema.BoolAttribute{
 							MarkdownDescription: "When true the creation of messages on the Messages Query HTTP API is enabled",
 							Optional:            true,
-							PlanModifiers: []planmodifier.Bool{
-								boolplanmodifier.UseStateForUnknown(),
-							},
+							Computed:            true,
+							Default:             booldefault.StaticBool(false),
 						},
 						"delete_days_after_creation": schema.Int64Attribute{
 							MarkdownDescription: "Specifies the number of days each Message should be available via the Messages Query API",
 							Optional:            true,
-							PlanModifiers: []planmodifier.Int64{
-								int64planmodifier.UseStateForUnknown(),
-							},
+							Computed:            true,
+							Default:             int64default.StaticInt64(15),
 							Validators: []validator.Int64{
 								int64validator.Between(1, 90),
 							},

internal/resources/project/resource_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"github.com/labd/commercetools-go-sdk/platform"
+	"github.com/labd/terraform-provider-commercetools/internal/resources/project"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/labd/terraform-provider-commercetools/internal/acctest"
@@ -64,12 +65,12 @@ func TestAccProjectCreate_basic(t *testing.T) {
 						assert.EqualValues(t, []string{"nl", "de", "en", "en-US"}, result.Languages)
 						assert.EqualValues(t, []string{"EUR", "USD"}, result.Currencies)
 						assert.EqualValues(t, false, result.Messages.Enabled)
-						assert.EqualValues(t, utils.IntRef(15), result.Messages.DeleteDaysAfterCreation)
-						assert.Equal(t, 90, *result.Carts.DeleteDaysAfterLastModification)
+						assert.EqualValues(t, project.DefaultMessagesDeleteDaysAfterCreation, *result.Messages.DeleteDaysAfterCreation)
+						assert.Equal(t, 90, result.Carts.DeleteDaysAfterLastModification)
 						assert.Equal(t, false, *result.Carts.CountryTaxRateFallbackEnabled)
 						assert.Equal(t, utils.Ref(platform.RoundingModeHalfEven), result.Carts.PriceRoundingMode)
 						assert.Equal(t, utils.Ref(platform.RoundingModeHalfEven), result.Carts.TaxRoundingMode)
-						assert.Equal(t, 90, *result.ShoppingLists.DeleteDaysAfterLastModification)
+						assert.Equal(t, 360, result.ShoppingLists.DeleteDaysAfterLastModification)
 						assert.Nil(t, result.ShippingRateInputType)
 						return nil
 					},