Skip to content

Commit

Permalink
upgrade to sdk v2
Browse files Browse the repository at this point in the history
  • Loading branch information
davidji99 committed Feb 17, 2021
1 parent d954fe9 commit 66d40dd
Show file tree
Hide file tree
Showing 96 changed files with 516 additions and 238 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ jobs:
HEROKU_NON_ADMIN_TEST_USER: [email protected]
HEROKU_SLUG_ID: 8527dbf3-c0a0-4255-beab-aca0aad1dfc9
HEROKU_USER_ID: 007fa6e2-00a1-429e-92a0-7bbe14b063fc
GOFLAGS: "-mod=vendor"
# GOFLAGS: "-mod=vendor"
# TF_LOG: DEBUG
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ require (
github.com/google/uuid v1.1.1
github.com/hashicorp/go-multierror v1.0.0
github.com/hashicorp/go-uuid v1.0.1
github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
github.com/hashicorp/terraform-plugin-sdk v1.15.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3
github.com/heroku/heroku-go/v5 v5.2.1
github.com/mitchellh/go-homedir v1.1.0
github.com/verybluebot/tarinator-go v0.0.0-20190613183509-5ab4e1193986
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
)

go 1.15
382 changes: 331 additions & 51 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion helper/test/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

type TestConfigKey int
Expand Down
4 changes: 2 additions & 2 deletions heroku/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"runtime"

"github.com/bgentry/go-netrc/netrc"
"github.com/hashicorp/terraform-plugin-sdk/helper/logging"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
heroku "github.com/heroku/heroku-go/v5"
"github.com/heroku/terraform-provider-heroku/v3/version"
homedir "github.com/mitchellh/go-homedir"
Expand Down
2 changes: 1 addition & 1 deletion heroku/data_source_heroku_addon.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package heroku

import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceHerokuAddon() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions heroku/data_source_heroku_addon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccDatasourceHerokuAddon_Basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion heroku/data_source_heroku_app.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package heroku

import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceHerokuApp() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions heroku/data_source_heroku_app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccDatasourceHerokuApp_Basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion heroku/data_source_heroku_pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package heroku

import (
"context"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceHerokuPipeline() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions heroku/data_source_heroku_pipeline_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package heroku

import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"testing"
)

Expand Down
2 changes: 1 addition & 1 deletion heroku/data_source_heroku_space.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package heroku

import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceHerokuSpace() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion heroku/data_source_heroku_space_peering_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package heroku
import (
"context"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceHerokuSpacePeeringInfo() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions heroku/data_source_heroku_space_peering_info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccDatasourceHerokuSpacePeeringInfo_Basic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/data_source_heroku_space_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccDatasourceHerokuSpace_Basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion heroku/data_source_heroku_team.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package heroku

import (
"context"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceHerokuTeam() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion heroku/data_source_heroku_team_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package heroku

import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"testing"
)

Expand Down
2 changes: 1 addition & 1 deletion heroku/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
heroku "github.com/heroku/heroku-go/v5"
"github.com/heroku/terraform-provider-heroku/v3/version"
)
Expand Down
2 changes: 1 addition & 1 deletion heroku/import_heroku_account_feature_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package heroku

import (
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"testing"
)

Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_addon_attachment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuAddonAttachment_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_addon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuAddon_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_app_feature_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package heroku

import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"testing"
)

Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_app_release_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuAppRelease_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuApp_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_app_webhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuAppWebhook_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuBuild_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_cert_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuCert_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_collaborator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuCollaborator_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_config_association_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package heroku

import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"regexp"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion heroku/import_heroku_config_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package heroku

import (
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"regexp"
"testing"
)
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_domain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuDomain_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_drain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuDrain_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_formation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuFormation_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_pipeline_config_var_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package heroku

import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"regexp"
"testing"
)
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_pipeline_coupling_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
heroku "github.com/heroku/heroku-go/v5"
)

Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_pipeline_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuPipeline_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_slug_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuSlug_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_space_app_access_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuSpaceAppAccess_importBasic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions heroku/import_heroku_team_collaborator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccHerokuTeamCollaborator_importBasic(t *testing.T) {
Expand Down
Loading

0 comments on commit 66d40dd

Please sign in to comment.