environment support

foomo · Aug 19, 2021 · 4b8749e · 4b8749e
1 parent b632c4e
commit 4b8749e
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 41 deletions.
diff --git a/api_key.go b/api_key.go
@@ -54,7 +54,7 @@ func (apiKey *APIKey) GetVersion() int {
 
 // List returns all api keys collection
 func (service *APIKeyService) List(spaceID string) *Collection {
-	path := fmt.Sprintf("/spaces/%s/api_keys", spaceID)
+	path := fmt.Sprintf("/spaces/%s%s/api_keys", spaceID, getEnvPath(service.c))
 	method := "GET"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -71,7 +71,7 @@ func (service *APIKeyService) List(spaceID string) *Collection {
 
 // Get returns a single api key entity
 func (service *APIKeyService) Get(spaceID, apiKeyID string) (*APIKey, error) {
-	path := fmt.Sprintf("/spaces/%s/api_keys/%s", spaceID, apiKeyID)
+	path := fmt.Sprintf("/spaces/%s%s/api_keys/%s", spaceID, getEnvPath(service.c), apiKeyID)
 	method := "GET"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -98,10 +98,10 @@ func (service *APIKeyService) Upsert(spaceID string, apiKey *APIKey) error {
 	var method string
 
 	if apiKey.Sys != nil && apiKey.Sys.CreatedAt != "" {
-		path = fmt.Sprintf("/spaces/%s/api_keys/%s", spaceID, apiKey.Sys.ID)
+		path = fmt.Sprintf("/spaces/%s%s/api_keys/%s", spaceID, getEnvPath(service.c), apiKey.Sys.ID)
 		method = "PUT"
 	} else {
-		path = fmt.Sprintf("/spaces/%s/api_keys", spaceID)
+		path = fmt.Sprintf("/spaces/%s%s/api_keys", spaceID, getEnvPath(service.c))
 		method = "POST"
 	}
 
@@ -117,7 +117,7 @@ func (service *APIKeyService) Upsert(spaceID string, apiKey *APIKey) error {
 
 // Delete deletes a sinlge api key entity
 func (service *APIKeyService) Delete(spaceID string, apiKey *APIKey) error {
-	path := fmt.Sprintf("/spaces/%s/api_keys/%s", spaceID, apiKey.Sys.ID)
+	path := fmt.Sprintf("/spaces/%s%s/api_keys/%s", spaceID, getEnvPath(service.c), apiKey.Sys.ID)
 	method := "DELETE"
 
 	req, err := service.c.newRequest(method, path, nil, nil)

diff --git a/asset.go b/asset.go
@@ -70,7 +70,7 @@ func (asset *Asset) GetVersion() int {
 
 // List returns asset collection
 func (service *AssetsService) List(spaceID string) *Collection {
-	path := fmt.Sprintf("/spaces/%s/assets", spaceID)
+	path := fmt.Sprintf("/spaces/%s%s/assets", spaceID, getEnvPath(service.c))
 	method := "GET"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -87,7 +87,7 @@ func (service *AssetsService) List(spaceID string) *Collection {
 
 // Get returns a single asset entity
 func (service *AssetsService) Get(spaceID, assetID string, locale ...string) (*Asset, error) {
-	path := fmt.Sprintf("/spaces/%s/assets/%s", spaceID, assetID)
+	path := fmt.Sprintf("/spaces/%s%s/assets/%s", spaceID, getEnvPath(service.c), assetID)
 	query := url.Values{}
 	if service.c.api == "CDA" && len(locale) > 0 {
 		query["locale"] = locale
@@ -159,10 +159,10 @@ func (service *AssetsService) Upsert(spaceID string, asset *Asset) error {
 	var method string
 
 	if asset.Sys.ID != "" {
-		path = fmt.Sprintf("/spaces/%s/assets/%s", spaceID, asset.Sys.ID)
+		path = fmt.Sprintf("/spaces/%s%s/assets/%s", spaceID, getEnvPath(service.c), asset.Sys.ID)
 		method = "PUT"
 	} else {
-		path = fmt.Sprintf("/spaces/%s/assets", spaceID)
+		path = fmt.Sprintf("/spaces/%s%s/assets", spaceID, getEnvPath(service.c))
 		method = "POST"
 	}
 
@@ -178,7 +178,7 @@ func (service *AssetsService) Upsert(spaceID string, asset *Asset) error {
 
 // Delete sends delete request
 func (service *AssetsService) Delete(spaceID string, asset *Asset) error {
-	path := fmt.Sprintf("/spaces/%s/assets/%s", spaceID, asset.Sys.ID)
+	path := fmt.Sprintf("/spaces/%s%s/assets/%s", spaceID, getEnvPath(service.c), asset.Sys.ID)
 	method := "DELETE"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -200,7 +200,7 @@ func (service *AssetsService) Process(spaceID string, asset *Asset) error {
 		break
 	}
 
-	path := fmt.Sprintf("/spaces/%s/assets/%s/files/%s/process", spaceID, asset.Sys.ID, locale)
+	path := fmt.Sprintf("/spaces/%s%s/assets/%s/files/%s/process", spaceID, getEnvPath(service.c), asset.Sys.ID, locale)
 	method := "PUT"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -216,7 +216,7 @@ func (service *AssetsService) Process(spaceID string, asset *Asset) error {
 
 // Publish publishes the asset
 func (service *AssetsService) Publish(spaceID string, asset *Asset) error {
-	path := fmt.Sprintf("/spaces/%s/assets/%s/published", spaceID, asset.Sys.ID)
+	path := fmt.Sprintf("/spaces/%s%s/assets/%s/published", spaceID, getEnvPath(service.c), asset.Sys.ID)
 	method := "PUT"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -232,7 +232,7 @@ func (service *AssetsService) Publish(spaceID string, asset *Asset) error {
 
 // Unpublish unpublishes the asset
 func (service *AssetsService) Unpublish(spaceID string, asset *Asset) error {
-	path := fmt.Sprintf("/spaces/%s/assets/%s/published", spaceID, asset.Sys.ID)
+	path := fmt.Sprintf("/spaces/%s%s/assets/%s/published", spaceID, getEnvPath(service.c), asset.Sys.ID)
 	method := "DELETE"
 
 	req, err := service.c.newRequest(method, path, nil, nil)

diff --git a/content_type.go b/content_type.go
@@ -20,8 +20,8 @@ type ContentType struct {
 }
 
 const (
-    // FieldTypeSymbol content type field type for short textual data
-    FieldTypeSymbol = "Symbol"
+	// FieldTypeSymbol content type field type for short textual data
+	FieldTypeSymbol = "Symbol"
 
 	// FieldTypeText content type field type for text data
 	FieldTypeText = "Text"
@@ -290,7 +290,7 @@ func (ct *ContentType) GetVersion() int {
 
 // List return a content type collection
 func (service *ContentTypesService) List(spaceID string) *Collection {
-	path := fmt.Sprintf("/spaces/%s/content_types", spaceID)
+	path := fmt.Sprintf("/spaces/%s%s/content_types", spaceID, getEnvPath(service.c))
 	method := "GET"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -307,7 +307,7 @@ func (service *ContentTypesService) List(spaceID string) *Collection {
 
 // Get fetched a content type specified by `contentTypeID`
 func (service *ContentTypesService) Get(spaceID, contentTypeID string) (*ContentType, error) {
-	path := fmt.Sprintf("/spaces/%s/content_types/%s", spaceID, contentTypeID)
+	path := fmt.Sprintf("/spaces/%s%s/content_types/%s", spaceID, getEnvPath(service.c), contentTypeID)
 	method := "GET"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -334,10 +334,10 @@ func (service *ContentTypesService) Upsert(spaceID string, ct *ContentType) erro
 	var method string
 
 	if ct.Sys != nil && ct.Sys.ID != "" {
-		path = fmt.Sprintf("/spaces/%s/content_types/%s", spaceID, ct.Sys.ID)
+		path = fmt.Sprintf("/spaces/%s%s/content_types/%s", spaceID, getEnvPath(service.c), ct.Sys.ID)
 		method = "PUT"
 	} else {
-		path = fmt.Sprintf("/spaces/%s/content_types", spaceID)
+		path = fmt.Sprintf("/spaces/%s%s/content_types", spaceID, getEnvPath(service.c))
 		method = "POST"
 	}
 
@@ -353,7 +353,7 @@ func (service *ContentTypesService) Upsert(spaceID string, ct *ContentType) erro
 
 // Delete the content_type
 func (service *ContentTypesService) Delete(spaceID string, ct *ContentType) error {
-	path := fmt.Sprintf("/spaces/%s/content_types/%s", spaceID, ct.Sys.ID)
+	path := fmt.Sprintf("/spaces/%s%s/content_types/%s", spaceID, getEnvPath(service.c), ct.Sys.ID)
 	method := "DELETE"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -369,7 +369,7 @@ func (service *ContentTypesService) Delete(spaceID string, ct *ContentType) erro
 
 // Activate the contenttype, a.k.a publish
 func (service *ContentTypesService) Activate(spaceID string, ct *ContentType) error {
-	path := fmt.Sprintf("/spaces/%s/content_types/%s/published", spaceID, ct.Sys.ID)
+	path := fmt.Sprintf("/spaces/%s%s/content_types/%s/published", spaceID, getEnvPath(service.c), ct.Sys.ID)
 	method := "PUT"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -385,7 +385,7 @@ func (service *ContentTypesService) Activate(spaceID string, ct *ContentType) er
 
 // Deactivate the contenttype, a.k.a unpublish
 func (service *ContentTypesService) Deactivate(spaceID string, ct *ContentType) error {
-	path := fmt.Sprintf("/spaces/%s/content_types/%s/published", spaceID, ct.Sys.ID)
+	path := fmt.Sprintf("/spaces/%s%s/content_types/%s/published", spaceID, getEnvPath(service.c), ct.Sys.ID)
 	method := "DELETE"
 
 	req, err := service.c.newRequest(method, path, nil, nil)

diff --git a/contentful.go b/contentful.go
@@ -23,6 +23,7 @@ type Contentful struct {
 	QueryParams map[string]string
 	Headers     map[string]string
 	BaseURL     string
+	Environment string
 
 	Spaces       *SpacesService
 	APIKeys      *APIKeyService
@@ -37,6 +38,14 @@ type service struct {
 	c *Contentful
 }
 
+func getEnvPath(c *Contentful) (envPath string) {
+	if c.Environment != "" {
+		envPath = fmt.Sprintf("/environments/%s", c.Environment)
+		return
+	}
+	return
+}
+
 // NewCMA returns a CMA client
 func NewCMA(token string) *Contentful {
 	c := &Contentful{

diff --git a/entry.go b/entry.go
@@ -58,7 +58,7 @@ func (service *EntriesService) GetEntryKey(entry *Entry, key string) (*EntryFiel
 
 // List returns entries collection
 func (service *EntriesService) List(spaceID string) *Collection {
-	path := fmt.Sprintf("/spaces/%s/entries", spaceID)
+	path := fmt.Sprintf("/spaces/%s%s/entries", spaceID, getEnvPath(service.c))
 	method := "GET"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -75,7 +75,7 @@ func (service *EntriesService) List(spaceID string) *Collection {
 
 // Sync returns entries collection
 func (service *EntriesService) Sync(spaceID string, initial bool, syncToken ...string) *Collection {
-	path := fmt.Sprintf("/spaces/%s/sync", spaceID)
+	path := fmt.Sprintf("/spaces/%s%s/sync", spaceID, getEnvPath(service.c))
 	method := "GET"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -98,7 +98,7 @@ func (service *EntriesService) Sync(spaceID string, initial bool, syncToken ...s
 
 // Get returns a single entry
 func (service *EntriesService) Get(spaceID, entryID string, locale ...string) (*Entry, error) {
-	path := fmt.Sprintf("/spaces/%s/entries/%s", spaceID, entryID)
+	path := fmt.Sprintf("/spaces/%s%s/entries/%s", spaceID, getEnvPath(service.c), entryID)
 	query := url.Values{}
 	if len(locale) > 0 {
 		query["locale"] = locale
@@ -120,7 +120,7 @@ func (service *EntriesService) Get(spaceID, entryID string, locale ...string) (*
 
 // Delete the entry
 func (service *EntriesService) Delete(spaceID string, entryID string) error {
-	path := fmt.Sprintf("/spaces/%s/entries/%s", spaceID, entryID)
+	path := fmt.Sprintf("/spaces/%s%s/entries/%s", spaceID, getEnvPath(service.c), entryID)
 	method := "DELETE"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -151,10 +151,10 @@ func (service *EntriesService) Upsert(spaceID string, entry *Entry) error {
 	var method string
 
 	if entry.Sys != nil && entry.Sys.ID != "" {
-		path = fmt.Sprintf("/spaces/%s/entries/%s", spaceID, entry.Sys.ID)
+		path = fmt.Sprintf("/spaces/%s%s/entries/%s", spaceID, getEnvPath(service.c), entry.Sys.ID)
 		method = "PUT"
 	} else {
-		path = fmt.Sprintf("/spaces/%s/entries", spaceID)
+		path = fmt.Sprintf("/spaces/%s%s/entries", spaceID, getEnvPath(service.c))
 		method = "POST"
 	}
 
@@ -171,7 +171,7 @@ func (service *EntriesService) Upsert(spaceID string, entry *Entry) error {
 
 // Publish the entry
 func (service *EntriesService) Publish(spaceID string, entry *Entry) error {
-	path := fmt.Sprintf("/spaces/%s/entries/%s/published", spaceID, entry.Sys.ID)
+	path := fmt.Sprintf("/spaces/%s%s/entries/%s/published", spaceID, getEnvPath(service.c), entry.Sys.ID)
 	method := "PUT"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -187,7 +187,7 @@ func (service *EntriesService) Publish(spaceID string, entry *Entry) error {
 
 // Unpublish the entry
 func (service *EntriesService) Unpublish(spaceID string, entry *Entry) error {
-	path := fmt.Sprintf("/spaces/%s/entries/%s/published", spaceID, entry.Sys.ID)
+	path := fmt.Sprintf("/spaces/%s%s/entries/%s/published", spaceID, getEnvPath(service.c), entry.Sys.ID)
 	method := "DELETE"
 
 	req, err := service.c.newRequest(method, path, nil, nil)

diff --git a/locale.go b/locale.go
@@ -48,7 +48,7 @@ func (locale *Locale) GetVersion() int {
 
 // List returns a locales collection
 func (service *LocalesService) List(spaceID string) *Collection {
-	path := fmt.Sprintf("/spaces/%s/locales", spaceID)
+	path := fmt.Sprintf("/spaces/%s%s/locales", spaceID, getEnvPath(service.c))
 	method := "GET"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -65,7 +65,7 @@ func (service *LocalesService) List(spaceID string) *Collection {
 
 // Get returns a single locale entity
 func (service *LocalesService) Get(spaceID, localeID string) (*Locale, error) {
-	path := fmt.Sprintf("/spaces/%s/locales/%s", spaceID, localeID)
+	path := fmt.Sprintf("/spaces/%s%s/locales/%s", spaceID, getEnvPath(service.c), localeID)
 	method := "GET"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -83,7 +83,7 @@ func (service *LocalesService) Get(spaceID, localeID string) (*Locale, error) {
 
 // Delete the locale
 func (service *LocalesService) Delete(spaceID string, locale *Locale) error {
-	path := fmt.Sprintf("/spaces/%s/locales/%s", spaceID, locale.Sys.ID)
+	path := fmt.Sprintf("/spaces/%s%s/locales/%s", spaceID, getEnvPath(service.c), locale.Sys.ID)
 	method := "DELETE"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -108,10 +108,10 @@ func (service *LocalesService) Upsert(spaceID string, locale *Locale) error {
 	var method string
 
 	if locale.Sys != nil && locale.Sys.CreatedAt != "" {
-		path = fmt.Sprintf("/spaces/%s/locales/%s", spaceID, locale.Sys.ID)
+		path = fmt.Sprintf("/spaces/%s%s/locales/%s", spaceID, getEnvPath(service.c), locale.Sys.ID)
 		method = "PUT"
 	} else {
-		path = fmt.Sprintf("/spaces/%s/locales", spaceID)
+		path = fmt.Sprintf("/spaces/%s%s/locales", spaceID, getEnvPath(service.c))
 		method = "POST"
 	}
 

diff --git a/space.go b/space.go
@@ -78,7 +78,7 @@ func (service *SpacesService) Upsert(space *Space) error {
 	var method string
 
 	if space.Sys != nil && space.Sys.CreatedAt != "" {
-		path = fmt.Sprintf("/spaces/%s", space.Sys.ID)
+		path = fmt.Sprintf("/spaces/%s%s", space.Sys.ID, getEnvPath(service.c))
 		method = "PUT"
 	} else {
 		path = "/spaces"

diff --git a/webhook.go b/webhook.go
@@ -39,7 +39,7 @@ func (webhook *Webhook) GetVersion() int {
 
 // List returns webhooks collection
 func (service *WebhooksService) List(spaceID string) *Collection {
-	path := fmt.Sprintf("/spaces/%s/webhook_definitions", spaceID)
+	path := fmt.Sprintf("/spaces/%s%s/webhook_definitions", spaceID, getEnvPath(service.c))
 	method := "GET"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -56,7 +56,7 @@ func (service *WebhooksService) List(spaceID string) *Collection {
 
 // Get returns a single webhook entity
 func (service *WebhooksService) Get(spaceID, webhookID string) (*Webhook, error) {
-	path := fmt.Sprintf("/spaces/%s/webhook_definitions/%s", spaceID, webhookID)
+	path := fmt.Sprintf("/spaces/%s%s/webhook_definitions/%s", spaceID, getEnvPath(service.c), webhookID)
 	method := "GET"
 
 	req, err := service.c.newRequest(method, path, nil, nil)
@@ -83,10 +83,10 @@ func (service *WebhooksService) Upsert(spaceID string, webhook *Webhook) error {
 	var method string
 
 	if webhook.Sys != nil && webhook.Sys.CreatedAt != "" {
-		path = fmt.Sprintf("/spaces/%s/webhook_definitions/%s", spaceID, webhook.Sys.ID)
+		path = fmt.Sprintf("/spaces/%s%s/webhook_definitions/%s", spaceID, getEnvPath(service.c), webhook.Sys.ID)
 		method = "PUT"
 	} else {
-		path = fmt.Sprintf("/spaces/%s/webhook_definitions", spaceID)
+		path = fmt.Sprintf("/spaces/%s%s/webhook_definitions", spaceID, getEnvPath(service.c))
 		method = "POST"
 	}
 
@@ -102,7 +102,7 @@ func (service *WebhooksService) Upsert(spaceID string, webhook *Webhook) error {
 
 // Delete the webhook
 func (service *WebhooksService) Delete(spaceID string, webhook *Webhook) error {
-	path := fmt.Sprintf("/spaces/%s/webhook_definitions/%s", spaceID, webhook.Sys.ID)
+	path := fmt.Sprintf("/spaces/%s%s/webhook_definitions/%s", spaceID, getEnvPath(service.c), webhook.Sys.ID)
 	method := "DELETE"
 
 	req, err := service.c.newRequest(method, path, nil, nil)