feat: fixed api client code

Author: demeyerthom

commercetools/resource_api_client.go

@@ -40,18 +40,16 @@ func resourceAPIClient() *schema.Resource {
 				Required:    true,
 				ForceNew:    true,
 			},
-			"accessTokenValiditySeconds": {
+			"access_token_validity_seconds": {
 				Description: "Expiration time in seconds for each access token obtained by the APIClient. Only present when set with the APIClientDraft. If not present the default value applies.",
-				Type:        schema.TypeSet,
-				Elem:        &schema.Schema{Type: schema.TypeInt},
-				Required:    false,
+				Type:        schema.TypeInt,
+				Optional:    true,
 				ForceNew:    true,
 			},
-			"refreshTokenValiditySeconds": {
+			"refresh_token_validity_seconds": {
 				Description: "Inactivity expiration time in seconds for each refresh token obtained by the APIClient. Only present when set with the APIClientDraft. If not present the default value applies.",
-				Type:        schema.TypeSet,
-				Elem:        &schema.Schema{Type: schema.TypeInt},
-				Required:    false,
+				Type:        schema.TypeInt,
+				Optional:    true,
 				ForceNew:    true,
 			},
 			"secret": {
@@ -75,11 +73,11 @@ func resourceAPIClientCreate(ctx context.Context, d *schema.ResourceData, m any)
 		Name:  d.Get("name").(string),
 		Scope: strings.Join(scopeParts, " "),
 	}
-	if val := d.Get("accessTokenValiditySeconds").(*int); val != nil && *val > 0 {
-		draft.AccessTokenValiditySeconds = val
+	if val := d.Get("access_token_validity_seconds").(int); val != 0 {
+		draft.AccessTokenValiditySeconds = &val
 	}
-	if val := d.Get("refreshTokenValiditySeconds").(*int); val != nil && *val > 0 {
-		draft.RefreshTokenValiditySeconds = val
+	if val := d.Get("refresh_token_validity_seconds").(int); val != 0 {
+		draft.RefreshTokenValiditySeconds = &val
 	}
 
 	client := getClient(m)
@@ -119,8 +117,8 @@ func resourceAPIClientRead(ctx context.Context, d *schema.ResourceData, m any) d
 	scopes := strings.Split(apiClient.Scope, " ")
 	sort.Strings(scopes)
 	_ = d.Set("scope", scopes)
-	_ = d.Set("accessTokenValiditySeconds", apiClient.AccessTokenValiditySeconds)
-	_ = d.Set("refreshTokenValiditySeconds", apiClient.RefreshTokenValiditySeconds)
+	_ = d.Set("access_token_validity_seconds", apiClient.AccessTokenValiditySeconds)
+	_ = d.Set("refresh_token_validity_seconds", apiClient.RefreshTokenValiditySeconds)
 	return nil
 }
 

docker-compose.yaml

@@ -0,0 +1,5 @@
+services:
+  commercetools:
+    image: labdigital/commercetools-mock-server
+    ports:
+      - 8989:8989

docs/index.md

@@ -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>"

docs/resources/api_client.md

@@ -11,16 +11,14 @@ description: |-
 
 Create a new API client. Note that Commercetools might return slightly different scopes, resulting in a new API client being created everytime Terraform is run. In this case, fix your scopes accordingly to match what is returned by Commercetools.
 
-Also see the [API client HTTP API documentation](https://docs.commercetools.com//http-api-projects-api-clients).
+Also see the [API client HTTP API documentation](https://docs.commercetools.com/api/projects/api-clients).
 
 ## Example Usage
 
 ```terraform
 resource "commercetools_api_client" "my-api-client" {
   name  = "My API Client"
   scope = ["manage_orders:my-ct-project-key", "manage_payments:my-ct-project-key"]
-  accessTokenValiditySeconds = 3600
-  refreshTokenValiditySeconds = 60
 }
 ```
 
@@ -29,14 +27,13 @@ resource "commercetools_api_client" "my-api-client" {
 
 ### Required
 
-- `name` (String) Name of the API client.
-- `scope` (Set of String) A list of the [OAuth scopes](https://docs.commercetools.com/api/scopes).
-
+- `name` (String) Name of the API client
+- `scope` (Set of String) A list of the [OAuth scopes](https://docs.commercetools.com/api/scopes)
 
 ### Optional
 
-- `accessTokenValiditySeconds` (Int) Expiration time in seconds for each access token obtained by the APIClient. See the latest CommerceTools documentation for [API Clients](https://docs.commercetools.com/api/projects/api-clients) for valid number ranges.
-- `refreshTokenValiditySeconds` (Int) Inactivity expiration time in seconds for each refresh token obtained by the APIClient. See the latest CommerceTools documentation for [API Clients](https://docs.commercetools.com/api/projects/api-clients) for valid number ranges.
+- `access_token_validity_seconds` (Number) Expiration time in seconds for each access token obtained by the APIClient. Only present when set with the APIClientDraft. If not present the default value applies.
+- `refresh_token_validity_seconds` (Number) Inactivity expiration time in seconds for each refresh token obtained by the APIClient. Only present when set with the APIClientDraft. If not present the default value applies.
 
 ### Read-Only
 

go.mod

@@ -1,6 +1,7 @@
 module github.com/labd/terraform-provider-commercetools
 
-go 1.22.0
+go 1.22.7
+
 toolchain go1.22.8
 
 //replace github.com/labd/commercetools-go-sdk v1.5.1 => ../commercetools-go-sdk