Skip to content

Commit 5a75be8

Browse files
jianyuanjianyuan
authored
Merge pull request #44 from jianyuan/terraform-sdk
Migrate to Terraform Plugin SDK
2 parents e6872e6 + 626d8f5 commit 5a75be8

18 files changed

+238
-327
lines changed

Diff for: ‎go.mod

+25-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,33 @@
11
module github.com/jianyuan/terraform-provider-sentry
22

33
require (
4+
cloud.google.com/go/storage v1.0.0 // indirect
5+
github.com/aws/aws-sdk-go v1.25.0 // indirect
6+
github.com/go-test/deep v1.0.4 // indirect
7+
github.com/google/go-cmp v0.3.1 // indirect
48
github.com/hashicorp/hcl v1.0.0 // indirect
5-
github.com/hashicorp/terraform v0.12.4
6-
github.com/hashicorp/yamux v0.0.0-20180917205041-7221087c3d28 // indirect
9+
github.com/hashicorp/hcl2 v0.0.0-20190909202536-66c59f909e25 // indirect
10+
github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
11+
github.com/hashicorp/terraform-plugin-sdk v1.0.0
12+
github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
713
github.com/jianyuan/go-sentry v1.2.0
8-
github.com/mitchellh/go-homedir v1.1.0 // indirect
14+
github.com/mattn/go-colorable v0.1.2 // indirect
15+
github.com/mattn/go-isatty v0.0.9 // indirect
16+
github.com/stretchr/testify v1.4.0 // indirect
17+
github.com/ulikunitz/xz v0.5.6 // indirect
18+
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
19+
go.opencensus.io v0.22.1 // indirect
20+
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad // indirect
21+
golang.org/x/exp v0.0.0-20190925190815-26a69ce95baf // indirect
22+
golang.org/x/net v0.0.0-20190926025831-c00fd9afed17 // indirect
23+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
24+
golang.org/x/sys v0.0.0-20190927073244-c990c680b611 // indirect
25+
golang.org/x/tools v0.0.0-20190927052746-69890759d905 // indirect
26+
google.golang.org/api v0.10.0 // indirect
27+
google.golang.org/appengine v1.6.4 // indirect
28+
google.golang.org/genproto v0.0.0-20190926190326-7ee9db18f195 // indirect
29+
google.golang.org/grpc v1.24.0 // indirect
30+
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
931
)
1032

1133
replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 // indirect

Diff for: ‎go.sum

+189-300
Large diffs are not rendered by default.

Diff for: ‎main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
"github.com/hashicorp/terraform/plugin"
4+
"github.com/hashicorp/terraform-plugin-sdk/plugin"
55
"github.com/jianyuan/terraform-provider-sentry/sentry"
66
)
77

Diff for: ‎sentry/data_source_sentry_key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"log"
66

7-
"github.com/hashicorp/terraform/helper/schema"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
88
"github.com/jianyuan/go-sentry/sentry"
99
)
1010

Diff for: ‎sentry/data_source_sentry_key_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"regexp"
66
"testing"
77

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"
1010
)
1111

1212
func TestAccSentryKeyDataSource_basic(t *testing.T) {

Diff for: ‎sentry/import_sentry_key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package sentry
22

33
import (
44
"errors"
5-
"github.com/hashicorp/terraform/helper/schema"
5+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
66
"log"
77
"strings"
88
)

Diff for: ‎sentry/import_sentry_project_plugin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log"
66
"strings"
77

8-
"github.com/hashicorp/terraform/helper/schema"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
99
)
1010

1111
func resourceSentryPluginImporter(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {

Diff for: ‎sentry/import_sentry_team.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log"
66
"strings"
77

8-
"github.com/hashicorp/terraform/helper/schema"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
99
)
1010

1111
func resourceSentryTeamImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {

Diff for: ‎sentry/provider.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package sentry
22

33
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"
66
)
77

88
// Provider returns a terraform.ResourceProvider.

Diff for: ‎sentry/provider_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"os"
55
"testing"
66

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"
99
)
1010

1111
var testOrganization = os.Getenv("SENTRY_TEST_ORGANIZATION")

Diff for: ‎sentry/resource_sentry_key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package sentry
33
import (
44
"net/http"
55

6-
"github.com/hashicorp/terraform/helper/schema"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
77
"github.com/jianyuan/go-sentry/sentry"
88
)
99

Diff for: ‎sentry/resource_sentry_key_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
"testing"
77

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"
1010
"github.com/jianyuan/go-sentry/sentry"
1111
)
1212

Diff for: ‎sentry/resource_sentry_organization.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package sentry
33
import (
44
"log"
55

6-
"github.com/hashicorp/terraform/helper/schema"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
77
"github.com/jianyuan/go-sentry/sentry"
88
)
99

Diff for: ‎sentry/resource_sentry_project.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log"
66
"strings"
77

8-
"github.com/hashicorp/terraform/helper/schema"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
99
"github.com/jianyuan/go-sentry/sentry"
1010
)
1111

Diff for: ‎sentry/resource_sentry_project_plugin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package sentry
33
import (
44
"log"
55

6-
"github.com/hashicorp/terraform/helper/schema"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
77
"github.com/jianyuan/go-sentry/sentry"
88
)
99

Diff for: ‎sentry/resource_sentry_project_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"fmt"
66
"testing"
77

8-
"github.com/hashicorp/terraform/helper/acctest"
9-
"github.com/hashicorp/terraform/helper/resource"
10-
"github.com/hashicorp/terraform/terraform"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
9+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
10+
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1111
"github.com/jianyuan/go-sentry/sentry"
1212
)
1313

Diff for: ‎sentry/resource_sentry_team.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package sentry
33
import (
44
"log"
55

6-
"github.com/hashicorp/terraform/helper/schema"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
77
"github.com/jianyuan/go-sentry/sentry"
88
)
99

Diff for: ‎sentry/resource_sentry_team_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"fmt"
66
"testing"
77

8-
"github.com/hashicorp/terraform/helper/acctest"
9-
"github.com/hashicorp/terraform/helper/resource"
10-
"github.com/hashicorp/terraform/terraform"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
9+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
10+
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1111
"github.com/jianyuan/go-sentry/sentry"
1212
)
1313

0 commit comments

Comments
 (0)