Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start using terraform-plugin-sdk v1.0.0 #382

Merged
merged 2 commits into from
Oct 31, 2019
Merged

Start using terraform-plugin-sdk v1.0.0 #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cdf029
tf-sdk-migrator migrate ; go mod vendor
Didainius Oct 30, 2019
cb3f222
Add correct GH issue number
Didainius Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
## 2.6.0 (Unreleased)

IMPROVEMENTS:

* Switch to Terraform terraform-plugin-sdk v1.0.0 as per recent [HashiCorp
recommendation](https://www.terraform.io/docs/extend/plugin-sdk.html) - [GH-382]

## 2.5.0 (October 28, 2019)

FEATURES:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ module github.com/terraform-providers/terraform-provider-vcd/v2
go 1.13

require (
github.com/hashicorp/terraform v0.12.8
github.com/hashicorp/terraform-plugin-sdk v1.0.0
github.com/vmware/go-vcloud-director/v2 v2.4.0
)
378 changes: 100 additions & 278 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
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/terraform-providers/terraform-provider-vcd/v2/vcd"
)

Expand Down
2 changes: 1 addition & 1 deletion vcd/catalogitem.go
View file
Open in desktop
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/vmware/go-vcloud-director/v2/govcd"
)

Expand Down
4 changes: 2 additions & 2 deletions vcd/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"runtime"
"time"

"github.com/hashicorp/terraform/helper/mutexkv"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/mutexkv"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/vmware/go-vcloud-director/v2/govcd"
)

Expand Down
6 changes: 3 additions & 3 deletions vcd/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"testing"
"time"

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
"github.com/vmware/go-vcloud-director/v2/govcd"
"github.com/vmware/go-vcloud-director/v2/util"
)
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_catalog.go
View file
Open in desktop
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"
)

func datasourceVcdCatalog() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_catalog_item.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package vcd

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

func datasourceVcdCatalogItem() *schema.Resource {
return &schema.Resource{
Expand Down
4 changes: 2 additions & 2 deletions vcd/datasource_vcd_catalog_item_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,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"
)

// Test catalog and catalog item data sources
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_catalog_media.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package vcd

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

func datasourceVcdCatalogMedia() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions vcd/datasource_vcd_catalog_media_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,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"
)

// Test catalog and catalog media data sources
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_edgegateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package vcd

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

func datasourceVcdEdgeGateway() *schema.Resource {
return &schema.Resource{
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_external_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package vcd

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

func datasourceVcdExternalNetwork() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_independent_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vcd
import (
"errors"
"fmt"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/vmware/go-vcloud-director/v2/govcd"
"github.com/vmware/go-vcloud-director/v2/types/v56"
"log"
Expand Down
4 changes: 2 additions & 2 deletions vcd/datasource_vcd_independent_disk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ package vcd

import (
"fmt"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
"regexp"
"testing"

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

// Test independent disk data resource
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_lb_app_profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vcd
import (
"fmt"

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

func datasourceVcdLBAppProfile() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_lb_app_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vcd
import (
"fmt"

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

func datasourceVcdLBAppRule() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_lb_server_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vcd
import (
"fmt"

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

func datasourceVcdLbServerPool() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_lb_service_monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vcd
import (
"fmt"

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

func datasourceVcdLbServiceMonitor() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_lb_virtual_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vcd
import (
"fmt"

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

func datasourceVcdLbVirtualServer() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_network_direct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package vcd

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

func datasourceVcdNetworkDirect() *schema.Resource {
return &schema.Resource{
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_network_isolated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package vcd

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

func datasourceVcdNetworkIsolated() *schema.Resource {
return &schema.Resource{
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_network_routed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package vcd

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

func datasourceVcdNetworkRouted() *schema.Resource {
return &schema.Resource{
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/vmware/go-vcloud-director/v2/govcd"
"github.com/vmware/go-vcloud-director/v2/types/v56"
)
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_nsxv_dnat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package vcd

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

func datasourceVcdNsxvDnat() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_nsxv_firewall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package vcd

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

func datasourceVcdNsxvFirewallRule() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_nsxv_snat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package vcd

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

func datasourceVcdNsxvSnat() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_org.go
View file
Open in desktop
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"
)

func datasourceVcdOrg() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_org_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package vcd
import (
"testing"

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

// Cloning an organization using an existing organization as data source
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_org_vdc.go
View file
Open in desktop
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"
)

func datasourceVcdOrgVdc() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_org_vdc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"testing"

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

func TestAccVcdVdcDatasource(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_vapp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package vcd

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

func datasourceVcdVApp() *schema.Resource {
return &schema.Resource{
Expand Down
2 changes: 1 addition & 1 deletion vcd/datasource_vcd_vapp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/vmware/go-vcloud-director/v2/govcd"
)

Expand Down
2 changes: 1 addition & 1 deletion vcd/nsxv_nat.go
View file
Open in desktop
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/vmware/go-vcloud-director/v2/govcd"
"github.com/vmware/go-vcloud-director/v2/types/v56"
)
Expand Down
4 changes: 2 additions & 2 deletions vcd/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package vcd
import (
"os"

"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"
"github.com/vmware/go-vcloud-director/v2/util"
)

Expand Down
4 changes: 2 additions & 2 deletions vcd/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package vcd
import (
"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 vcd/resource_vcd_catalog.go
View file
Open in desktop
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/vmware/go-vcloud-director/v2/govcd"
)

Expand Down
2 changes: 1 addition & 1 deletion vcd/resource_vcd_catalog_item.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/vmware/go-vcloud-director/v2/govcd"
)

Expand Down
4 changes: 2 additions & 2 deletions vcd/resource_vcd_catalog_item_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"
"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"
)

var TestAccVcdCatalogItem = "TestAccVcdCatalogItemBasic"
Expand Down
2 changes: 1 addition & 1 deletion vcd/resource_vcd_catalog_media.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/vmware/go-vcloud-director/v2/govcd"
)

Expand Down
4 changes: 2 additions & 2 deletions vcd/resource_vcd_catalog_media_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,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"
)

var TestAccVcdCatalogMedia = "TestAccVcdCatalogMediaBasic"
Expand Down
4 changes: 2 additions & 2 deletions vcd/resource_vcd_catalog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,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"
)

var TestAccVcdCatalog = "TestAccVcdCatalogBasic"
Expand Down
Loading