Merge pull request #155 from terraform-providers/go-modules-2019-03-14

[MODULES] Switch to Go Modules

.go-version

@@ -0,0 +1 @@
+1.11.5

.travis.yml

@@ -12,11 +12,9 @@ install:
 # packages that live there.
 # See: https://github.com/golang/go/issues/12933
 - bash scripts/gogetcookie.sh
-- go get github.com/kardianos/govendor
 
 script:
 - make test
-- make vendor-status
 - make vet
 - make website-test
 
@@ -27,3 +25,5 @@ matrix:
   fast_finish: true
   allow_failures:
   - go: tip
+env:
+  - GOFLAGS=-mod=vendor GO111MODULE=on

GNUmakefile

@@ -34,8 +34,6 @@ fmtcheck:
 errcheck:
 	@sh -c "'$(CURDIR)/scripts/errcheck.sh'"
 
-vendor-status:
-	@govendor status
 
 test-compile:
 	@if [ "$(TEST)" = "./..." ]; then \
@@ -59,5 +57,5 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 endif
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
-.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile website website-test
+.PHONY: build test testacc vet fmt fmtcheck errcheck test-compile website website-test
 

go.mod

@@ -0,0 +1,7 @@
+module github.com/terraform-providers/terraform-provider-nsxt
+
+require (
+	github.com/hashicorp/terraform v0.11.14-0.20190313165547-28810e6c0c0a
+	github.com/vmware/go-vmware-nsxt v0.0.0-20190201205556-16aa0443042d
+	golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 // indirect
+)

nsxt/resource_nsxt_logical_switch.go

@@ -81,7 +81,7 @@ func resourceNsxtLogicalSwitch() *schema.Resource {
 				Required:    true,
 				ForceNew:    true,
 			},
-			"vlan": &schema.Schema{
+			"vlan": {
 				Type:       schema.TypeInt,
 				Deprecated: "Use nsxt_vlan_logical_switch resource instead",
 				Optional:   true,

nsxt/resource_nsxt_vlan_logical_switch.go

@@ -24,12 +24,12 @@ func resourceNsxtVlanLogicalSwitch() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"revision": getRevisionSchema(),
-			"description": &schema.Schema{
+			"description": {
 				Type:        schema.TypeString,
 				Description: "Description of this resource",
 				Optional:    true,
 			},
-			"display_name": &schema.Schema{
+			"display_name": {
 				Type:        schema.TypeString,
 				Description: "The display name of this resource. Defaults to ID if not set",
 				Optional:    true,
@@ -38,24 +38,24 @@ func resourceNsxtVlanLogicalSwitch() *schema.Resource {
 			"tag":             getTagsSchema(),
 			"address_binding": getAddressBindingsSchema(),
 			"admin_state":     getAdminStateSchema(),
-			"ip_pool_id": &schema.Schema{
+			"ip_pool_id": {
 				Type:        schema.TypeString,
 				Description: "IP pool id that associated with a LogicalSwitch",
 				Optional:    true,
 			},
-			"mac_pool_id": &schema.Schema{
+			"mac_pool_id": {
 				Type:        schema.TypeString,
 				Description: "Mac pool id that associated with a LogicalSwitch",
 				Optional:    true,
 			},
 			"switching_profile_id": getSwitchingProfileIdsSchema(),
-			"transport_zone_id": &schema.Schema{
+			"transport_zone_id": {
 				Type:        schema.TypeString,
 				Description: "Id of the TransportZone to which this LogicalSwitch is associated",
 				Required:    true,
 				ForceNew:    true,
 			},
-			"vlan": &schema.Schema{
+			"vlan": {
 				Type:        schema.TypeInt,
 				Description: "VLAN Id",
 				Required:    true,