Cortex-ify project (#13)

Makefile

@@ -1,11 +1,11 @@
 HOSTNAME=github.com
-NAMESPACE=bigcommerce
+NAMESPACE=cortexapps
 NAME=cortex
 BINARY=terraform-provider-${NAME}
-VERSION=0.2.2-dev
+VERSION=0.2.3-dev
 
-GOOS?=$(shell go tool dist env | grep GOOS | grep -o '".*"' | sed 's/"//g')
-GOARCH?=$(shell go tool dist env | grep GOARCH | grep -o '".*"' | sed 's/"//g')
+GOOS?=$(shell go env | grep GOOS | cut -d '=' -f2 | tr -d "'")
+GOARCH?=$(shell go env | grep GOARCH | cut -d '=' -f2 | tr -d "'")
 OS_ARCH?=$(GOOS)_$(GOARCH)
 
 TF_LOG ?= WARN

README.md

@@ -93,7 +93,7 @@ make testacc
 This provider uses [Go modules](https://github.com/golang/go/wiki/Modules).
 Please see the Go documentation for the most up to date information about using Go modules.
 
-To add a new dependency `github.com/bigcommerce/dependency` to your Terraform provider:
+To add a new dependency `github.com/author/dependency` to your Terraform provider:
 
 ```shell
 go get github.com/author/dependency

go.mod

@@ -1,4 +1,4 @@
-module github.com/bigcommerce/terraform-provider-cortex
+module github.com/cortexapps/terraform-provider-cortex
 
 go 1.20
 

internal/cortex/api_error_test.go

@@ -1,7 +1,7 @@
 package cortex_test
 
 import (
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

internal/cortex/catalog_entities.go

@@ -220,7 +220,7 @@ func (c *CatalogEntitiesClient) Upsert(ctx context.Context, req UpsertCatalogEnt
 	}
 
 	// coerce violations into an error
-	if len(upsertResponse.Violations) > 0 {
+	if !upsertResponse.Ok && len(upsertResponse.Violations) > 0 {
 		o := ""
 		for _, v := range upsertResponse.Violations {
 			o += v.String() + "\n"
@@ -236,13 +236,10 @@ func (c *CatalogEntitiesClient) Upsert(ctx context.Context, req UpsertCatalogEnt
  * DELETE /api/v1/catalog/:tag - Delete a catalog entity
  **********************************************************************************************************************/
 
-type DeleteCatalogEntityResponse struct{}
-
 func (c *CatalogEntitiesClient) Delete(ctx context.Context, tag string) error {
-	entityResponse := &DeleteCatalogEntityResponse{}
 	apiError := &ApiError{}
 
-	response, err := c.Client().Delete(Route("catalog_entities", tag)).Receive(entityResponse, apiError)
+	response, err := c.Client().Delete(Route("catalog_entities", tag)).Receive(nil, apiError)
 	if err != nil {
 		return errors.New("could not delete catalog entity: " + err.Error())
 	}

internal/cortex/catalog_entities_test.go

@@ -2,7 +2,7 @@ package cortex_test
 
 import (
 	"context"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

internal/cortex/catalog_entity_custom_data_test.go

@@ -2,7 +2,7 @@ package cortex_test
 
 import (
 	"context"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

internal/cortex/departments_test.go

@@ -2,7 +2,7 @@ package cortex_test
 
 import (
 	"context"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

internal/cortex/http_client_test.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
 	"io"

internal/cortex/resource_definitions_test.go

@@ -2,7 +2,7 @@ package cortex_test
 
 import (
 	"context"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

internal/cortex/scorecards_test.go

@@ -2,7 +2,7 @@ package cortex_test
 
 import (
 	"context"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

internal/cortex/teams_test.go

@@ -2,7 +2,7 @@ package cortex_test
 
 import (
 	"context"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

internal/provider/catalog_entity_custom_data_data_source.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 )

internal/provider/catalog_entity_custom_data_data_source_models.go

@@ -2,7 +2,7 @@ package provider
 
 import (
 	"context"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )

internal/provider/catalog_entity_custom_data_models.go

@@ -2,7 +2,7 @@ package provider
 
 import (
 	"context"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )

internal/provider/catalog_entity_custom_data_resource.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"

internal/provider/catalog_entity_custom_data_test.go

@@ -2,7 +2,7 @@ package provider_test
 
 import (
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"testing"
 )

internal/provider/catalog_entity_data_source.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"

internal/provider/catalog_entity_resource.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/path"

internal/provider/catalog_entity_resource_models.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"

internal/provider/catalog_entity_resource_team_models.go

@@ -2,7 +2,7 @@ package provider
 
 import (
 	"context"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"

internal/provider/department_data_source.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 )

internal/provider/department_resource.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"

internal/provider/department_resource_models.go

@@ -1,7 +1,7 @@
 package provider
 
 import (
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 

internal/provider/provider.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/provider"

internal/provider/provider_test.go

@@ -1,7 +1,7 @@
 package provider_test
 
 import (
-	"github.com/bigcommerce/terraform-provider-cortex/internal/provider"
+	"github.com/cortexapps/terraform-provider-cortex/internal/provider"
 	"github.com/hashicorp/terraform-plugin-framework/providerserver"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 	"os"

internal/provider/resource_definition_data_source.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 )

internal/provider/resource_definition_data_source_models.go

@@ -2,7 +2,7 @@ package provider
 
 import (
 	"context"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )

internal/provider/resource_definition_models.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"encoding/json"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )

internal/provider/resource_definition_resource.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"

internal/provider/scorecard_data_source.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 )

internal/provider/scorecard_data_source_models.go

@@ -2,7 +2,7 @@ package provider
 
 import (
 	"context"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )

internal/provider/scorecard_resource.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"

internal/provider/scorecard_resource_models.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"

internal/provider/team_data_source.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"github.com/bigcommerce/terraform-provider-cortex/internal/cortex"
+	"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"

main.go

@@ -5,7 +5,7 @@ import (
 	"flag"
 	"log"
 
-	"github.com/bigcommerce/terraform-provider-cortex/internal/provider"
+	"github.com/cortexapps/terraform-provider-cortex/internal/provider"
 	"github.com/hashicorp/terraform-plugin-framework/providerserver"
 )
 
@@ -35,7 +35,7 @@ func main() {
 	flag.Parse()
 
 	err := providerserver.Serve(context.Background(), provider.New(version), providerserver.ServeOpts{
-		Address: "github.com/bigcommerce/cortex",
+		Address: "github.com/cortexapps/cortex",
 		Debug:   debug,
 	})