Skip to content

Commit

Permalink
Merge pull request #44 from jianyuan/terraform-sdk
Browse files Browse the repository at this point in the history
Migrate to Terraform Plugin SDK
  • Loading branch information
jianyuan authored Sep 27, 2019
2 parents e6872e6 + 626d8f5 commit 5a75be8
Show file tree
Hide file tree
Showing 18 changed files with 238 additions and 327 deletions.
28 changes: 25 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
489 changes: 189 additions & 300 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion sentry/data_source_sentry_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions sentry/data_source_sentry_key_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion sentry/import_sentry_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package sentry

import (
"errors"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"log"
"strings"
)
Expand Down
2 changes: 1 addition & 1 deletion sentry/import_sentry_project_plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion sentry/import_sentry_team.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions sentry/provider.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions sentry/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion sentry/resource_sentry_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions sentry/resource_sentry_key_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion sentry/resource_sentry_organization.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion sentry/resource_sentry_project.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion sentry/resource_sentry_project_plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions sentry/resource_sentry_project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion sentry/resource_sentry_team.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions sentry/resource_sentry_team_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down

0 comments on commit 5a75be8

Please sign in to comment.