Merge pull request #1 from TeeVeeCorp/contenttype-environment-support

Contenttype environment support
TeeVeeCorp · Aug 11, 2024 · a1cf31a · a1cf31a
2 parents e1f97e0 + 1a2bd4e
commit a1cf31a
Show file tree

Hide file tree

Showing 12 changed files with 386 additions and 52 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Contentful
+Copyright (c) 2017 Telly Inc.,Contentful
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/contentful/constants.go b/contentful/constants.go
@@ -2,6 +2,7 @@ package contentful
 
 import (
 	"os"
+	"time"
 )
 
 var (
@@ -13,3 +14,5 @@ var (
 	// Terraform configuration values
 	logBoolean = os.Getenv("TF_LOG")
 )
+
+var consistencyBuffer time.Duration = 10 * time.Second
diff --git a/contentful/provider.go b/contentful/provider.go
@@ -2,6 +2,7 @@ package contentful
 
 import (
 	"context"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	contentful "github.com/labd/contentful-go"

diff --git a/contentful/resource_contentful_apikey.go b/contentful/resource_contentful_apikey.go
@@ -3,6 +3,8 @@ package contentful
 import (
 	"context"
 	"errors"
+	"time"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/labd/contentful-go"
@@ -30,6 +32,11 @@ func resourceContentfulAPIKey() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"environment_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
 			"name": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -43,13 +50,19 @@ func resourceContentfulAPIKey() *schema.Resource {
 }
 
 func resourceCreateAPIKey(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	time.Sleep(consistencyBuffer)
 	client := m.(*contentful.Client)
 
 	apiKey := &contentful.APIKey{
 		Name:        d.Get("name").(string),
 		Description: d.Get("description").(string),
 	}
 
+	environmentID := d.Get("environment_id").(string)
+	if environmentID != "" {
+		apiKey.Environments = append(apiKey.Environments, environmentLink(environmentID))
+	}
+
 	err := client.APIKeys.Upsert(d.Get("space_id").(string), apiKey)
 	if err != nil {
 		return parseError(err)
@@ -65,6 +78,7 @@ func resourceCreateAPIKey(_ context.Context, d *schema.ResourceData, m interface
 }
 
 func resourceUpdateAPIKey(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	time.Sleep(consistencyBuffer)
 	client := m.(*contentful.Client)
 	spaceID := d.Get("space_id").(string)
 	apiKeyID := d.Id()
@@ -92,6 +106,7 @@ func resourceUpdateAPIKey(_ context.Context, d *schema.ResourceData, m interface
 }
 
 func resourceReadAPIKey(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	time.Sleep(consistencyBuffer)
 	client := m.(*contentful.Client)
 	spaceID := d.Get("space_id").(string)
 	apiKeyID := d.Id()
@@ -112,6 +127,7 @@ func resourceReadAPIKey(_ context.Context, d *schema.ResourceData, m interface{}
 }
 
 func resourceDeleteAPIKey(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	time.Sleep(consistencyBuffer)
 	client := m.(*contentful.Client)
 	spaceID := d.Get("space_id").(string)
 	apiKeyID := d.Id()
@@ -152,3 +168,13 @@ func setAPIKeyProperties(d *schema.ResourceData, apiKey *contentful.APIKey) erro
 
 	return nil
 }
+
+func environmentLink(environmentID string) contentful.Environments {
+	return contentful.Environments{
+		Sys: contentful.Sys{
+			Type:     "Link",
+			LinkType: "Environment",
+			ID:       environmentID,
+		},
+	}
+}
diff --git a/contentful/resource_contentful_asset.go b/contentful/resource_contentful_asset.go
@@ -3,9 +3,10 @@ package contentful
 import (
 	"context"
 	"errors"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"time"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/labd/contentful-go"
 )
@@ -145,6 +146,7 @@ func resourceContentfulAsset() *schema.Resource {
 }
 
 func resourceCreateAsset(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	time.Sleep(consistencyBuffer)
 	client := m.(*contentful.Client)
 
 	fields := d.Get("fields").([]interface{})[0].(map[string]interface{})
@@ -233,6 +235,7 @@ func resourceCreateAsset(_ context.Context, d *schema.ResourceData, m interface{
 }
 
 func resourceUpdateAsset(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	time.Sleep(consistencyBuffer)
 	client := m.(*contentful.Client)
 	spaceID := d.Get("space_id").(string)
 	assetID := d.Id()
@@ -357,6 +360,7 @@ func setAssetState(d *schema.ResourceData, m interface{}) (err error) {
 }
 
 func resourceReadAsset(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	time.Sleep(consistencyBuffer)
 	client := m.(*contentful.Client)
 	spaceID := d.Get("space_id").(string)
 	assetID := d.Id()
@@ -377,6 +381,7 @@ func resourceReadAsset(_ context.Context, d *schema.ResourceData, m interface{})
 }
 
 func resourceDeleteAsset(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	time.Sleep(consistencyBuffer)
 	client := m.(*contentful.Client)
 	spaceID := d.Get("space_id").(string)
 	assetID := d.Id()