fix: fix goreleaser for private dep

GuanceCloud · Apr 3, 2023 · 577abfc · 577abfc
1 parent 950485d
commit 577abfc
Show file tree

Hide file tree

Showing 1,995 changed files with 13 additions and 578,793 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -11,10 +11,10 @@ builds:
     # usage by users in CI/CD systems like Terraform Cloud where
     # they are unable to install libraries.
     - CGO_ENABLED=0
+    - GO111MODULE=on
   mod_timestamp: '{{ .CommitTimestamp }}'
   flags:
     - -trimpath
-    - -mod=vendor
   ldflags:
     - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
   goos:

diff --git a/go.mod b/go.mod
@@ -3,13 +3,20 @@ module github.com/GuanceCloud/terraform-provider-guance
 go 1.18
 
 require (
-	github.com/GuanceCloud/openapi v0.0.0-00010101000000-000000000000
+	github.com/avast/retry-go v3.0.0+incompatible
+	github.com/evanphx/json-patch v0.5.2
+	github.com/go-kratos/kratos/v2 v2.4.1
+	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-multierror v1.1.1
+	github.com/hashicorp/go-retryablehttp v0.7.2
 	github.com/hashicorp/terraform-plugin-docs v0.13.0
 	github.com/hashicorp/terraform-plugin-framework v1.0.0
 	github.com/hashicorp/terraform-plugin-go v0.14.2
 	github.com/hashicorp/terraform-plugin-log v0.7.0
 	github.com/magefile/mage v1.14.0
+	google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6
+	google.golang.org/grpc v1.52.3
+	google.golang.org/protobuf v1.28.1
 
 )
 
@@ -18,21 +25,16 @@ require (
 	github.com/Masterminds/semver/v3 v3.1.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
-	github.com/avast/retry-go v3.0.0+incompatible // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
-	github.com/evanphx/json-patch v0.5.2 // indirect
 	github.com/fatih/color v1.14.1 // indirect
-	github.com/go-kratos/kratos/v2 v2.4.1 // indirect
 	github.com/go-playground/form/v4 v4.2.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.2.1 // indirect
 	github.com/hashicorp/go-plugin v1.4.6 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/hashicorp/hc-install v0.4.0 // indirect
@@ -63,10 +65,5 @@ require (
 	golang.org/x/sys v0.4.0 // indirect
 	golang.org/x/text v0.6.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect
-	google.golang.org/grpc v1.52.3 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace github.com/GuanceCloud/openapi => ../openapi
diff --git a/go.sum b/go.sum
@@ -249,8 +249,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
 github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=

diff --git a/guance/provider.go b/guance/provider.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/GuanceCloud/terraform-provider-guance/internal/sdk"
 
-	ccv1 "github.com/GuanceCloud/openapi/api/cloudcontrol/v1"
+	ccv1 "github.com/GuanceCloud/terraform-provider-guance/internal/sdk/api/v1"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/provider"
 	"github.com/hashicorp/terraform-plugin-framework/provider/schema"

diff --git a/...oud/openapi/api/cloudcontrol/v1/client.go → internal/sdk/api/v1/client.go b/...oud/openapi/api/cloudcontrol/v1/client.go → internal/sdk/api/v1/client.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-retryablehttp"
 
-	"github.com/GuanceCloud/openapi/internal/pkg/types"
+	"github.com/GuanceCloud/terraform-provider-guance/internal/sdk/types"
 )
 
 type Client interface {

diff --git a/...pi/api/cloudcontrol/v1/cloudcontrol.pb.go → internal/sdk/api/v1/cloudcontrol.pb.go b/...pi/api/cloudcontrol/v1/cloudcontrol.pb.go → internal/sdk/api/v1/cloudcontrol.pb.go
diff --git a/...oudcontrol/v1/cloudcontrol.pb.validate.go → ...al/sdk/api/v1/cloudcontrol.pb.validate.go b/...oudcontrol/v1/cloudcontrol.pb.validate.go → ...al/sdk/api/v1/cloudcontrol.pb.validate.go
diff --git a/...pi/api/cloudcontrol/v1/cloudcontrol.proto → internal/sdk/api/v1/cloudcontrol.proto b/...pi/api/cloudcontrol/v1/cloudcontrol.proto → internal/sdk/api/v1/cloudcontrol.proto
diff --git a/...i/cloudcontrol/v1/cloudcontrol_grpc.pb.go → internal/sdk/api/v1/cloudcontrol_grpc.pb.go b/...i/cloudcontrol/v1/cloudcontrol_grpc.pb.go → internal/sdk/api/v1/cloudcontrol_grpc.pb.go
diff --git a/...i/cloudcontrol/v1/cloudcontrol_http.pb.go → internal/sdk/api/v1/cloudcontrol_http.pb.go b/...i/cloudcontrol/v1/cloudcontrol_http.pb.go → internal/sdk/api/v1/cloudcontrol_http.pb.go
diff --git a/internal/sdk/client.go b/internal/sdk/client.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 
-	ccv1 "github.com/GuanceCloud/openapi/api/cloudcontrol/v1"
+	ccv1 "github.com/GuanceCloud/terraform-provider-guance/internal/sdk/api/v1"
 	"github.com/hashicorp/go-multierror"
 )
 

diff --git a/...Cloud/openapi/internal/pkg/types/error.go → internal/sdk/types/error.go b/...Cloud/openapi/internal/pkg/types/error.go → internal/sdk/types/error.go
diff --git a/.../openapi/internal/pkg/types/identifier.go → internal/sdk/types/identifier.go b/.../openapi/internal/pkg/types/identifier.go → internal/sdk/types/identifier.go
diff --git a/...oud/openapi/internal/pkg/types/request.go → internal/sdk/types/request.go b/...oud/openapi/internal/pkg/types/request.go → internal/sdk/types/request.go
diff --git a/...penapi/internal/pkg/types/requestquery.go → internal/sdk/types/requestquery.go b/...penapi/internal/pkg/types/requestquery.go → internal/sdk/types/requestquery.go
diff --git a/...ud/openapi/internal/pkg/types/resource.go → internal/sdk/types/resource.go b/...ud/openapi/internal/pkg/types/resource.go → internal/sdk/types/resource.go
diff --git a/...enapi/internal/pkg/types/resourcepatch.go → internal/sdk/types/resourcepatch.go b/...enapi/internal/pkg/types/resourcepatch.go → internal/sdk/types/resourcepatch.go
diff --git a/...enapi/internal/pkg/types/resourcequery.go → internal/sdk/types/resourcequery.go b/...enapi/internal/pkg/types/resourcequery.go → internal/sdk/types/resourcequery.go
diff --git a/vendor/github.com/GuanceCloud/openapi/LICENSE b/vendor/github.com/GuanceCloud/openapi/LICENSE
diff --git a/vendor/github.com/Masterminds/goutils/.travis.yml b/vendor/github.com/Masterminds/goutils/.travis.yml
diff --git a/vendor/github.com/Masterminds/goutils/CHANGELOG.md b/vendor/github.com/Masterminds/goutils/CHANGELOG.md
diff --git a/vendor/github.com/Masterminds/goutils/LICENSE.txt b/vendor/github.com/Masterminds/goutils/LICENSE.txt