Skip to content

Commit

Permalink
Migrate to terraform-plugin-sdk (#346)
Browse files Browse the repository at this point in the history
* Upgrade to hashicorp/terraform v0.12.7 to prepare for plugin-sdk migration

* Migrate to standalone terraform-plugin-sdk

```
▶ GO111MODULE=on tf-sdk-migrator check
Checking Go runtime version ...
Go version 1.12.10: OK.
Checking whether provider uses Go modules...
Go modules in use: OK.
Checking version of github.com/hashicorp/terraform-plugin-sdk to determine if provider was already migrated...
Checking version of github.com/hashicorp/terraform used in provider...
Terraform version 0.12.7: OK.
Checking whether provider uses deprecated SDK packages or identifiers...
No imports of deprecated SDK packages or identifiers: OK.

All constraints satisfied. Provider can be migrated to the new SDK.
```

```
▶ GO111MODULE=on tf-sdk-migrator migrate
Checking Go runtime version ...
Go version 1.12.10: OK.
Checking whether provider uses Go modules...
Go modules in use: OK.
Checking version of github.com/hashicorp/terraform-plugin-sdk to determine if provider was already migrated...
Checking version of github.com/hashicorp/terraform used in provider...
Terraform version 0.12.7: OK.
Checking whether provider uses deprecated SDK packages or identifiers...
No imports of deprecated SDK packages or identifiers: OK.

All constraints satisfied. Provider can be migrated to the new SDK.

Rewriting provider go.mod file...
Rewriting SDK package imports...
Running `go mod tidy`...
Success! Provider is migrated to github.com/hashicorp/terraform-plugin-sdk v1.1.0.

It looks like this provider vendors dependencies. Don't forget to run `go mod vendor`.
Make sure to review all changes and run all tests.
```
  • Loading branch information
stack72 authored Feb 4, 2020
1 parent c8c1848 commit 32d929c
Show file tree
Hide file tree
Showing 1,129 changed files with 40,597 additions and 35,370 deletions.
2 changes: 1 addition & 1 deletion datadog/data_source_datadog_ip_ranges.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package datadog

import (
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
datadog "github.com/zorkian/go-datadog-api"
)

Expand Down
2 changes: 1 addition & 1 deletion datadog/data_source_datadog_ip_ranges_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package datadog
import (
"testing"

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

func TestAccDatadogIpRangesDatasource_existing(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion datadog/import_datadog_downtime_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package datadog
import (
"testing"

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

func TestDatadogDowntime_import(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion datadog/import_datadog_integration_pagerduty_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package datadog
import (
"testing"

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion datadog/import_datadog_monitor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package datadog
import (
"testing"

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

func TestDatadogMonitor_import(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion datadog/import_datadog_user_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package datadog
import (
"testing"

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

func TestDatadogUser_import(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions datadog/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"runtime"

cleanhttp "github.com/hashicorp/go-cleanhttp"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform-plugin-sdk/helper/logging"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
"github.com/terraform-providers/terraform-provider-datadog/version"
"github.com/zorkian/go-datadog-api"
)
Expand Down
4 changes: 2 additions & 2 deletions datadog/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 testAccProviders map[string]terraform.ResourceProvider
Expand Down
2 changes: 1 addition & 1 deletion datadog/resource_datadog_dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
datadog "github.com/zorkian/go-datadog-api"
)

Expand Down
2 changes: 1 addition & 1 deletion datadog/resource_datadog_dashboard_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
datadog "github.com/zorkian/go-datadog-api"
)

Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_dashboard_list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"
"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"
datadog "github.com/zorkian/go-datadog-api"
)

Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_dashboard_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strings"
"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"
datadog "github.com/zorkian/go-datadog-api"
)

Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_downtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"time"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
datadog "github.com/zorkian/go-datadog-api"
)

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

"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/zorkian/go-datadog-api"
)

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

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/zorkian/go-datadog-api"
)

Expand Down
2 changes: 1 addition & 1 deletion datadog/resource_datadog_integration_gcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package datadog
import (
"fmt"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/zorkian/go-datadog-api"
)

Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_integration_gcp_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/helper/resource"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
datadog "github.com/zorkian/go-datadog-api"
)

Expand Down
2 changes: 1 addition & 1 deletion datadog/resource_datadog_integration_pagerduty.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"sync"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/zorkian/go-datadog-api"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/zorkian/go-datadog-api"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

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

// We're not testing for schedules because Datadog actively verifies it with Pagerduty
Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_integration_pagerduty_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strings"
"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"
datadog "github.com/zorkian/go-datadog-api"
)

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

import (
"fmt"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/zorkian/go-datadog-api"
"strings"
)
Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_logs_custom_pipeline_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package datadog

import (
"fmt"
"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/zorkian/go-datadog-api"
"strings"
"testing"
Expand Down
2 changes: 1 addition & 1 deletion datadog/resource_datadog_logs_index.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package datadog

import (
"fmt"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/zorkian/go-datadog-api"
"strings"
)
Expand Down
2 changes: 1 addition & 1 deletion datadog/resource_datadog_logs_index_order.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package datadog

import (
"fmt"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/zorkian/go-datadog-api"
)

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

import (
"fmt"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/zorkian/go-datadog-api"
"strings"
)
Expand Down
2 changes: 1 addition & 1 deletion datadog/resource_datadog_logs_pipeline_order.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package datadog

import (
"fmt"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/zorkian/go-datadog-api"
"strings"
)
Expand Down
2 changes: 1 addition & 1 deletion datadog/resource_datadog_metric_metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/zorkian/go-datadog-api"

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

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

"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/zorkian/go-datadog-api"
)

Expand Down
2 changes: 1 addition & 1 deletion datadog/resource_datadog_monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"time"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/zorkian/go-datadog-api"
)

Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_monitor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"
"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/zorkian/go-datadog-api"
)

Expand Down
2 changes: 1 addition & 1 deletion datadog/resource_datadog_screenboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/kr/pretty"
datadog "github.com/zorkian/go-datadog-api"
)
Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_screenboard_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"
"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"
datadog "github.com/zorkian/go-datadog-api"
)

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

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/zorkian/go-datadog-api"
)

Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_service_level_objective_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strings"
"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/zorkian/go-datadog-api"
)

Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_synthetics_test_.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
datadog "github.com/zorkian/go-datadog-api"
)

Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_synthetics_test_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strings"
"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"
datadog "github.com/zorkian/go-datadog-api"
)

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

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/kr/pretty"
"github.com/zorkian/go-datadog-api"
)
Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_timeboard_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"
"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/zorkian/go-datadog-api"
)

Expand Down
Loading

0 comments on commit 32d929c

Please sign in to comment.