feat: updated deprecated code, removed unused, made some general fixe…

…s to styling

commercetools/custom_fields.go

@@ -241,19 +241,19 @@ func getTypeResource(ctx context.Context, client *platform.ByProjectKeyRequestBu
 		return nil, nil
 	}
 
-	if type_id, ok := data["type_id"].(string); ok {
+	if typeId, ok := data["type_id"].(string); ok {
 		if cacheTypes == nil {
 			cacheTypes = make(map[string]*platform.Type)
 		}
-		if t, exists := cacheTypes[type_id]; exists {
+		if t, exists := cacheTypes[typeId]; exists {
 			if t == nil {
-				return nil, fmt.Errorf("type %s not in cache due to previous error", type_id)
+				return nil, fmt.Errorf("type %s not in cache due to previous error", typeId)
 			}
 			return t, nil
 		}
 
-		t, err := client.Types().WithId(type_id).Get().Execute(ctx)
-		cacheTypes[type_id] = t
+		t, err := client.Types().WithId(typeId).Get().Execute(ctx)
+		cacheTypes[typeId] = t
 		return t, err
 	}
 	return nil, fmt.Errorf("missing type_id for custom fields")

commercetools/custom_fields_test.go

@@ -124,7 +124,7 @@ func TestAccCustomField_SetAndRemove(t *testing.T) {
 
 		// Remove Custom fields from the resource one by one
 		for index := range customFieldTypes {
-			var customFieldTypesReduced = []string{}
+			var customFieldTypesReduced []string
 			for i := range customFieldTypes {
 				if i == index {
 					continue
@@ -164,9 +164,9 @@ func TestAccCustomField_SetAndRemove(t *testing.T) {
 		})
 
 		resource.Test(t, resource.TestCase{
-			PreCheck:  func() { testAccPreCheck(t) },
-			Providers: testAccProviders,
-			Steps:     customFieldsAccTestSteps,
+			PreCheck:          func() { testAccPreCheck(t) },
+			ProviderFactories: testAccProviders,
+			Steps:             customFieldsAccTestSteps,
 		})
 	}
 }
@@ -225,7 +225,7 @@ func getResourceCustomFields(s *terraform.State, resourceType, identifier string
 func testGetCategory(s *terraform.State, identifier string) (*platform.Category, error) {
 	rs, ok := s.RootModule().Resources[identifier]
 	if !ok {
-		return nil, fmt.Errorf("Category %s not found", identifier)
+		return nil, fmt.Errorf("category %s not found", identifier)
 	}
 
 	client := getClient(testAccProvider.Meta())
@@ -239,7 +239,7 @@ func testGetCategory(s *terraform.State, identifier string) (*platform.Category,
 func testGetShippingMethod(s *terraform.State, identifier string) (*platform.ShippingMethod, error) {
 	rs, ok := s.RootModule().Resources[identifier]
 	if !ok {
-		return nil, fmt.Errorf("Shipping Method %s not found", identifier)
+		return nil, fmt.Errorf("shipping Method %s not found", identifier)
 	}
 
 	client := getClient(testAccProvider.Meta())

commercetools/marshalling.go

@@ -86,26 +86,6 @@ func expandLocalizedString(val any) platform.LocalizedString {
 	return result
 }
 
-func expandCentPrecisionMoneyDraft(d map[string]any) []platform.CentPrecisionMoneyDraft {
-	input := d["money"].([]any)
-	var result []platform.CentPrecisionMoneyDraft
-	for _, raw := range input {
-		data := raw.(map[string]any)
-		item := platform.CentPrecisionMoneyDraft{}
-		if currencyCode, ok := data["currency_code"].(string); ok {
-			item.CurrencyCode = currencyCode
-		}
-		if centAmount, ok := data["cent_amount"].(int); ok {
-			item.CentAmount = &centAmount
-		}
-		if fractionDigits, ok := data["fraction_digits"].(int); ok {
-			item.FractionDigits = &fractionDigits
-		}
-		result = append(result, item)
-	}
-	return result
-}
-
 func expandMoneyDraft(d map[string]any) []platform.Money {
 	input := d["money"].([]any)
 	var result []platform.Money

commercetools/provider.go

@@ -18,12 +18,12 @@ import (
 )
 
 func init() {
-	// Set descriptions to support markdown syntax, this will be used in document generation
+	// Set descriptions to support Markdown syntax, this will be used in document generation
 	// and the language server.
 	schema.DescriptionKind = schema.StringMarkdown
 }
 
-// Provider returns a terraform.ResourceProvider.
+// New returns a new terraform.ResourceProvider.
 func New(version string) func() *schema.Provider {
 	return func() *schema.Provider {
 		p := &schema.Provider{
@@ -88,7 +88,7 @@ func New(version string) func() *schema.Provider {
 				// "commercetools_subscription":       resourceSubscription(),
 			},
 		}
-		p.ConfigureContextFunc = providerConfigure(version, p)
+		p.ConfigureContextFunc = providerConfigure(version)
 		return p
 	}
 }
@@ -100,7 +100,7 @@ func getDefault(d *schema.ResourceData, key string, envKey string) string {
 	return os.Getenv(envKey)
 }
 
-func providerConfigure(version string, p *schema.Provider) func(context.Context, *schema.ResourceData) (any, diag.Diagnostics) {
+func providerConfigure(version string) func(context.Context, *schema.ResourceData) (any, diag.Diagnostics) {
 	return func(ctx context.Context, d *schema.ResourceData) (any, diag.Diagnostics) {
 		clientID := getDefault(d, "client_id", "CTP_CLIENT_ID")
 		clientSecret := getDefault(d, "client_secret", "CTP_CLIENT_SECRET")

commercetools/provider_test.go

@@ -9,13 +9,15 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-var testAccProviders map[string]*schema.Provider
+var testAccProviders map[string]func() (*schema.Provider, error)
 var testAccProvider *schema.Provider
 
 func init() {
 	testAccProvider = New("snapshot")()
-	testAccProviders = map[string]*schema.Provider{
-		"commercetools": testAccProvider,
+	testAccProviders = map[string]func() (*schema.Provider, error){
+		"commercetools": func() (*schema.Provider, error) {
+			return testAccProvider, nil
+		},
 	}
 }
 

commercetools/resource_api_client.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/labd/commercetools-go-sdk/platform"
 
@@ -67,7 +67,7 @@ func resourceAPIClientCreate(ctx context.Context, d *schema.ResourceData, m any)
 
 	var apiClient *platform.ApiClient
 
-	err := resource.RetryContext(ctx, 20*time.Second, func() *resource.RetryError {
+	err := retry.RetryContext(ctx, 20*time.Second, func() *retry.RetryError {
 		var err error
 		apiClient, err = client.ApiClients().Post(draft).Execute(ctx)
 		return utils.ProcessRemoteError(err)
@@ -78,7 +78,7 @@ func resourceAPIClientCreate(ctx context.Context, d *schema.ResourceData, m any)
 	}
 
 	d.SetId(apiClient.ID)
-	d.Set("secret", apiClient.Secret)
+	_ = d.Set("secret", apiClient.Secret)
 
 	return resourceAPIClientRead(ctx, d, m)
 }
@@ -96,17 +96,17 @@ func resourceAPIClientRead(ctx context.Context, d *schema.ResourceData, m any) d
 	}
 
 	d.SetId(apiClient.ID)
-	d.Set("name", apiClient.Name)
+	_ = d.Set("name", apiClient.Name)
 	scopes := strings.Split(apiClient.Scope, " ")
 	sort.Strings(scopes)
-	d.Set("scope", scopes)
+	_ = d.Set("scope", scopes)
 	return nil
 }
 
 func resourceAPIClientDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
 	client := getClient(m)
 
-	err := resource.RetryContext(ctx, 20*time.Second, func() *resource.RetryError {
+	err := retry.RetryContext(ctx, 20*time.Second, func() *retry.RetryError {
 		_, err := client.ApiClients().WithId(d.Id()).Delete().Execute(ctx)
 		return utils.ProcessRemoteError(err)
 	})

commercetools/resource_api_extension.go

@@ -3,12 +3,12 @@ package commercetools
 import (
 	"context"
 	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"log"
 	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/labd/commercetools-go-sdk/platform"
 
@@ -17,7 +17,7 @@ import (
 
 func resourceAPIExtension() *schema.Resource {
 	return &schema.Resource{
-		Description: "Create a new API extension to extend the bevahiour of an API with business logic. " +
+		Description: "Create a new API extension to extend the behaviour of an API with business logic. " +
 			"Note that API extensions affect the performance of the API it is extending. If it fails, the whole API " +
 			"call fails \n\n" +
 			"Also see the [API Extension API Documentation](https://docs.commercetools.com/api/projects/api-extensions)",
@@ -184,7 +184,7 @@ func resourceAPIExtensionCreate(ctx context.Context, d *schema.ResourceData, m a
 	}
 
 	var extension *platform.Extension
-	err = resource.RetryContext(ctx, 20*time.Second, func() *resource.RetryError {
+	err = retry.RetryContext(ctx, 20*time.Second, func() *retry.RetryError {
 		var err error
 		extension, err = client.Extensions().Post(draft).Execute(ctx)
 		return utils.ProcessRemoteError(err)
@@ -266,7 +266,7 @@ func resourceAPIExtensionUpdate(ctx context.Context, d *schema.ResourceData, m a
 			&platform.ExtensionSetTimeoutInMsAction{TimeoutInMs: &newTimeout})
 	}
 
-	err := resource.RetryContext(ctx, 20*time.Second, func() *resource.RetryError {
+	err := retry.RetryContext(ctx, 20*time.Second, func() *retry.RetryError {
 		_, err := client.Extensions().WithId(d.Id()).Post(input).Execute(ctx)
 		return utils.ProcessRemoteError(err)
 	})
@@ -360,10 +360,10 @@ func expandExtensionDestinationAuthentication(destInput map[string]any) (platfor
 // commercetools to write it in the state file.
 func flattenExtensionDestination(dst platform.Destination, d *schema.ResourceData) []map[string]string {
 	// Special handling is required here since the destination contains a secret
-	// value which is returned as a masked value by the commercetools API.  This
-	// means we need to extract the value from the current raw state file.
-	// However when importing a resource we don't have the value so we need to
-	// handle that scenario as well.
+	// value which is returned as a masked value by the commercetools API. This means
+	// we need to extract the value from the current raw state file. However, when
+	// importing a resource we don't have the value, so we need to handle that
+	// scenario as well.
 	isExisting := true
 	rawState := d.GetRawState()
 	if !rawState.IsNull() {

commercetools/resource_api_extension_migrate.go

@@ -58,7 +58,7 @@ func resourceAPIExtensionResourceV0() *schema.Resource {
 	}
 }
 
-func migrateAPIExtensionStateV0toV1(ctx context.Context, rawState map[string]any, meta any) (map[string]any, error) {
+func migrateAPIExtensionStateV0toV1(_ context.Context, rawState map[string]any, _ any) (map[string]any, error) {
 	transformToList(rawState, "destination")
 	return rawState, nil
 }

commercetools/resource_api_extension_test.go

@@ -100,9 +100,9 @@ func TestAccAPIExtension_basic(t *testing.T) {
 	resourceName := "commercetools_api_extension.ext"
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckAPIExtensionDestroy,
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviders,
+		CheckDestroy:      testAccCheckAPIExtensionDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccAPIExtensionGCFConfig(identifier, name, timeoutInMs),
@@ -309,9 +309,9 @@ func TestAccAPIExtension_azure_authentication(t *testing.T) {
 	resourceName := "commercetools_api_extension.ext"
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckAPIExtensionDestroy,
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviders,
+		CheckDestroy:      testAccCheckAPIExtensionDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccAPIExtensionAzureFunctionsConfig(identifier, name, timeoutInMs),

commercetools/resource_cart_discount.go

@@ -3,10 +3,10 @@ package commercetools
 import (
 	"context"
 	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/labd/commercetools-go-sdk/ctutils"
 	"github.com/labd/commercetools-go-sdk/platform"
@@ -324,7 +324,7 @@ func resourceCartDiscountCreate(ctx context.Context, d *schema.ResourceData, m a
 	}
 
 	var cartDiscount *platform.CartDiscount
-	err = resource.RetryContext(ctx, 1*time.Minute, func() *resource.RetryError {
+	err = retry.RetryContext(ctx, 1*time.Minute, func() *retry.RetryError {
 		var err error
 		cartDiscount, err = client.CartDiscounts().Post(draft).Execute(ctx)
 		return utils.ProcessRemoteError(err)
@@ -506,7 +506,7 @@ func resourceCartDiscountUpdate(ctx context.Context, d *schema.ResourceData, m a
 		}
 	}
 
-	err := resource.RetryContext(ctx, 1*time.Minute, func() *resource.RetryError {
+	err := retry.RetryContext(ctx, 1*time.Minute, func() *retry.RetryError {
 		_, err := client.CartDiscounts().WithId(d.Id()).Post(input).Execute(ctx)
 		return utils.ProcessRemoteError(err)
 	})
@@ -525,7 +525,7 @@ func resourceCartDiscountDelete(ctx context.Context, d *schema.ResourceData, m a
 	client := getClient(m)
 	version := d.Get("version").(int)
 
-	err := resource.RetryContext(ctx, 1*time.Minute, func() *resource.RetryError {
+	err := retry.RetryContext(ctx, 1*time.Minute, func() *retry.RetryError {
 		_, err := client.CartDiscounts().WithId(d.Id()).Delete().Version(version).Execute(ctx)
 		return utils.ProcessRemoteError(err)
 	})

commercetools/resource_cart_discount_absolute_test.go

@@ -11,9 +11,9 @@ func TestAccCartDiscountAbsolute(t *testing.T) {
 	resourceName := "commercetools_cart_discount.absolute"
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckCartDiscountDestroy,
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviders,
+		CheckDestroy:      testAccCheckCartDiscountDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccCartDiscountAbsoluteConfig(identifier),

commercetools/resource_cart_discount_fixed_test.go

@@ -11,9 +11,9 @@ func TestAccCartDiscountFixed(t *testing.T) {
 	resourceName := "commercetools_cart_discount.fixed"
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckCartDiscountDestroy,
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviders,
+		CheckDestroy:      testAccCheckCartDiscountDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccCartDiscountFixedConfig(identifier),

commercetools/resource_cart_discount_giftlineitem_test.go

@@ -11,9 +11,9 @@ func TestAccCartDiscountGiftLineItem(t *testing.T) {
 	resourceName := "commercetools_cart_discount.gift_line_item"
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckCartDiscountDestroy,
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviders,
+		CheckDestroy:      testAccCheckCartDiscountDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccCartDiscountGiftLineItemConfig(identifier),

commercetools/resource_cart_discount_migrate.go

@@ -147,7 +147,7 @@ func resourceCartDiscountResourceV0() *schema.Resource {
 	}
 }
 
-func migrateCartDiscountStateV0toV1(ctx context.Context, rawState map[string]any, meta any) (map[string]any, error) {
+func migrateCartDiscountStateV0toV1(_ context.Context, rawState map[string]any, _ any) (map[string]any, error) {
 	transformToList(rawState, "target")
 	return rawState, nil
 }