Merge pull request #44 from jianyuan/terraform-sdk

jianyuan · web-flow · commit 5a75be8f6eac · 2019-09-27T16:15:52.000+01:00
Migrate to Terraform Plugin SDK
diff --git a/go.mod b/go.mod
@@ -1,11 +1,33 @@
 module github.com/jianyuan/terraform-provider-sentry
 
 require (
+	cloud.google.com/go/storage v1.0.0 // indirect
+	github.com/aws/aws-sdk-go v1.25.0 // indirect
+	github.com/go-test/deep v1.0.4 // indirect
+	github.com/google/go-cmp v0.3.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/terraform v0.12.4
-	github.com/hashicorp/yamux v0.0.0-20180917205041-7221087c3d28 // indirect
+	github.com/hashicorp/hcl2 v0.0.0-20190909202536-66c59f909e25 // indirect
+	github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
+	github.com/hashicorp/terraform-plugin-sdk v1.0.0
+	github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
 	github.com/jianyuan/go-sentry v1.2.0
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mattn/go-colorable v0.1.2 // indirect
+	github.com/mattn/go-isatty v0.0.9 // indirect
+	github.com/stretchr/testify v1.4.0 // indirect
+	github.com/ulikunitz/xz v0.5.6 // indirect
+	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
+	go.opencensus.io v0.22.1 // indirect
+	golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad // indirect
+	golang.org/x/exp v0.0.0-20190925190815-26a69ce95baf // indirect
+	golang.org/x/net v0.0.0-20190926025831-c00fd9afed17 // indirect
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
+	golang.org/x/sys v0.0.0-20190927073244-c990c680b611 // indirect
+	golang.org/x/tools v0.0.0-20190927052746-69890759d905 // indirect
+	google.golang.org/api v0.10.0 // indirect
+	google.golang.org/appengine v1.6.4 // indirect
+	google.golang.org/genproto v0.0.0-20190926190326-7ee9db18f195 // indirect
+	google.golang.org/grpc v1.24.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 )
 
 replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 // indirect
diff --git a/go.sum b/go.sum
diff --git a/main.go b/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/hashicorp/terraform-plugin-sdk/plugin"
 	"github.com/jianyuan/terraform-provider-sentry/sentry"
 )
 
diff --git a/sentry/data_source_sentry_key.go b/sentry/data_source_sentry_key.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/jianyuan/go-sentry/sentry"
 )
 
diff --git a/sentry/data_source_sentry_key_test.go b/sentry/data_source_sentry_key_test.go
@@ -5,8 +5,8 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccSentryKeyDataSource_basic(t *testing.T) {
diff --git a/sentry/import_sentry_key.go b/sentry/import_sentry_key.go
@@ -2,7 +2,7 @@ package sentry
 
 import (
 	"errors"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"log"
 	"strings"
 )
diff --git a/sentry/import_sentry_project_plugin.go b/sentry/import_sentry_project_plugin.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceSentryPluginImporter(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
diff --git a/sentry/import_sentry_team.go b/sentry/import_sentry_team.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceSentryTeamImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
diff --git a/sentry/provider.go b/sentry/provider.go
@@ -1,8 +1,8 @@
 package sentry
 
 import (
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 // Provider returns a terraform.ResourceProvider.
diff --git a/sentry/provider_test.go b/sentry/provider_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 var testOrganization = os.Getenv("SENTRY_TEST_ORGANIZATION")
diff --git a/sentry/resource_sentry_key.go b/sentry/resource_sentry_key.go
@@ -3,7 +3,7 @@ package sentry
 import (
 	"net/http"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/jianyuan/go-sentry/sentry"
 )
 
diff --git a/sentry/resource_sentry_key_test.go b/sentry/resource_sentry_key_test.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	"github.com/jianyuan/go-sentry/sentry"
 )
 
diff --git a/sentry/resource_sentry_organization.go b/sentry/resource_sentry_organization.go
@@ -3,7 +3,7 @@ package sentry
 import (
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/jianyuan/go-sentry/sentry"
 )
 
diff --git a/sentry/resource_sentry_project.go b/sentry/resource_sentry_project.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/jianyuan/go-sentry/sentry"
 )
 
diff --git a/sentry/resource_sentry_project_plugin.go b/sentry/resource_sentry_project_plugin.go
@@ -3,7 +3,7 @@ package sentry
 import (
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/jianyuan/go-sentry/sentry"
 )
 
diff --git a/sentry/resource_sentry_project_test.go b/sentry/resource_sentry_project_test.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	"github.com/jianyuan/go-sentry/sentry"
 )
 
diff --git a/sentry/resource_sentry_team.go b/sentry/resource_sentry_team.go
@@ -3,7 +3,7 @@ package sentry
 import (
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/jianyuan/go-sentry/sentry"
 )
 
diff --git a/sentry/resource_sentry_team_test.go b/sentry/resource_sentry_team_test.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	"github.com/jianyuan/go-sentry/sentry"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/hashicorp/terraform/plugin"`
	`4`	`+ "github.com/hashicorp/terraform-plugin-sdk/plugin"`
`5`	`5`	`"github.com/jianyuan/terraform-provider-sentry/sentry"`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"log"`
`6`	`6`
`7`		`- "github.com/hashicorp/terraform/helper/schema"`
	`7`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
`8`	`8`	`"github.com/jianyuan/go-sentry/sentry"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`	`"regexp"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- "github.com/hashicorp/terraform/helper/resource"`
`9`		`- "github.com/hashicorp/terraform/terraform"`
	`8`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/resource"`
	`9`	`+ "github.com/hashicorp/terraform-plugin-sdk/terraform"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func TestAccSentryKeyDataSource_basic(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package sentry`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`		`- "github.com/hashicorp/terraform/helper/schema"`
	`5`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
`6`	`6`	`"log"`
`7`	`7`	`"strings"`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"log"`
`6`	`6`	`"strings"`
`7`	`7`
`8`		`- "github.com/hashicorp/terraform/helper/schema"`
	`8`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func resourceSentryPluginImporter(d schema.ResourceData, meta interface{}) ([]schema.ResourceData, error) {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package sentry`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/hashicorp/terraform/helper/schema"`
`5`		`- "github.com/hashicorp/terraform/terraform"`
	`4`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
	`5`	`+ "github.com/hashicorp/terraform-plugin-sdk/terraform"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`// Provider returns a terraform.ResourceProvider.`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"os"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/hashicorp/terraform/helper/schema"`
`8`		`- "github.com/hashicorp/terraform/terraform"`
	`7`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
	`8`	`+ "github.com/hashicorp/terraform-plugin-sdk/terraform"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`var testOrganization = os.Getenv("SENTRY_TEST_ORGANIZATION")`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package sentry`
`3`	`3`	`import (`
`4`	`4`	`"net/http"`
`5`	`5`
`6`		`- "github.com/hashicorp/terraform/helper/schema"`
	`6`	`+ "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
`7`	`7`	`"github.com/jianyuan/go-sentry/sentry"`
`8`	`8`	`)`
`9`	`9`