Merge pull request #406 from ovh/refactoring_sdk_go

terraform-plugin-sdk + go versions bump

Author: yomovh

.cds/terraform-provider-ovh-check.pip.yml

@@ -15,4 +15,4 @@ jobs:
       make test
       make vet
   requirements:
-  - model: shared.infra/Go-official-1.13-buster
+  - model: shared.infra/Go-official-1.19-bullseye

.cds/terraform-provider-ovh-testacc.pip.yml

@@ -33,4 +33,4 @@ jobs:
       TF_ACC=1 go test ./ovh/ -v -sweep=1
 
   requirements:
-  - model: shared.infra/Go-official-1.16-buster
+  - model: shared.infra/Go-official-1.19-bullseye

.cds/terraform-provider-ovh.yml

@@ -63,5 +63,4 @@ notifications:
     on_success: never
     send_to_author: false
     recipients:
-    - [email protected]
-    - [email protected]
+    - [email protected]

GNUmakefile

@@ -14,7 +14,7 @@ test: fmtcheck
 		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
 
 testacc: fmtcheck
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 240m
+	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 600m -p 10
 
 vet:
 	@echo "go vet ."

go.mod

@@ -1,18 +1,63 @@
 module github.com/ovh/terraform-provider-ovh
 
 require (
-	github.com/google/go-cmp v0.5.6 // indirect
-	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
+	github.com/google/go-cmp v0.5.9
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-version v1.6.0
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.9.0
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/ovh/go-ovh v1.3.0
-	github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
 	github.com/ybriffa/rfc3339 v0.0.0-20220203155318-1789e3fd6e70
-	golang.org/x/tools v0.0.0-20201118030313-598b068a9102 // indirect
 	gopkg.in/ini.v1 v1.57.0
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
+	gopkg.in/yaml.v3 v3.0.1
+)
+
+require (
+	github.com/agext/levenshtein v1.2.2 // indirect
+	github.com/apparentlymart/go-cidr v1.1.0 // indirect
+	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fatih/color v1.13.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
+	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
+	github.com/hashicorp/go-hclog v1.2.1 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-plugin v1.4.4 // indirect
+	github.com/hashicorp/go-uuid v1.0.3 // indirect
+	github.com/hashicorp/hc-install v0.4.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.14.1 // indirect
+	github.com/hashicorp/logutils v1.0.0 // indirect
+	github.com/hashicorp/terraform-exec v0.17.3 // indirect
+	github.com/hashicorp/terraform-json v0.14.0 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.14.0 // indirect
+	github.com/hashicorp/terraform-plugin-log v0.7.0 // indirect
+	github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c // indirect
+	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
+	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/oklog/run v1.0.0 // indirect
+	github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
+	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
+	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
+	github.com/vmihailenco/tagparser v0.1.1 // indirect
+	github.com/zclconf/go-cty v1.11.0 // indirect
+	golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167 // indirect
+	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
+	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/appengine v1.6.6 // indirect
+	google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect
+	google.golang.org/grpc v1.48.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 )
 
-go 1.16
+go 1.19

go.sum

@@ -42,7 +42,7 @@ data "ovh_cloud_project_database_kafka_topics" "topics" {
 
 func TestAccCloudProjectDatabaseKafkaTopicsDataSource_basic(t *testing.T) {
 	serviceName := os.Getenv("OVH_CLOUD_PROJECT_SERVICE_TEST")
-	version := os.Getenv("OVH_CLOUD_PROJECT_DATABASE_KAKFA_VERSION_TEST")
+	version := os.Getenv("OVH_CLOUD_PROJECT_DATABASE_KAFKA_VERSION_TEST")
 	if version == "" {
 		version = os.Getenv("OVH_CLOUD_PROJECT_DATABASE_VERSION_TEST")
 	}

ovh/data_cloud_project_database_kafka_topics_test.go

@@ -35,7 +35,7 @@ func dataSourceCloudProjectDatabaseMongodbUser() *schema.Resource {
 				Computed:    true,
 			},
 			"roles": {
-				Type:        schema.TypeList,
+				Type:        schema.TypeSet,
 				Description: "Roles the user belongs to",
 				Computed:    true,
 				Elem:        &schema.Schema{Type: schema.TypeString},

ovh/data_cloud_project_database_mongodb_user.go

@@ -13,7 +13,7 @@ func TestAccDedicatedNashaData(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
-			checkEnvOrFail(t, "OVH_NASHA_SERVICE_TEST")
+			checkEnvOrSkip(t, "OVH_NASHA_SERVICE_TEST")
 			testAccPreCheckCredentials(t)
 		},
 		Providers: testAccProviders,