Merge pull request #55 from terraform-providers/go1.11-upgrade-2019-01-07

[AUTOMATED] Upgrade to Go 1.11

Author: Sander van Harmelen

.travis.yml

@@ -4,7 +4,7 @@ services:
 - docker
 language: go
 go:
-- 1.11.x
+  - "1.11.x"
 
 script:
 - make vet

cloudstack/provider.go

@@ -12,46 +12,46 @@ import (
 func Provider() terraform.ResourceProvider {
 	return &schema.Provider{
 		Schema: map[string]*schema.Schema{
-			"api_url": &schema.Schema{
+			"api_url": {
 				Type:          schema.TypeString,
 				Optional:      true,
 				DefaultFunc:   schema.EnvDefaultFunc("CLOUDSTACK_API_URL", nil),
 				ConflictsWith: []string{"config", "profile"},
 			},
 
-			"api_key": &schema.Schema{
+			"api_key": {
 				Type:          schema.TypeString,
 				Optional:      true,
 				DefaultFunc:   schema.EnvDefaultFunc("CLOUDSTACK_API_KEY", nil),
 				ConflictsWith: []string{"config", "profile"},
 			},
 
-			"secret_key": &schema.Schema{
+			"secret_key": {
 				Type:          schema.TypeString,
 				Optional:      true,
 				DefaultFunc:   schema.EnvDefaultFunc("CLOUDSTACK_SECRET_KEY", nil),
 				ConflictsWith: []string{"config", "profile"},
 			},
 
-			"config": &schema.Schema{
+			"config": {
 				Type:          schema.TypeString,
 				Optional:      true,
 				ConflictsWith: []string{"api_url", "api_key", "secret_key"},
 			},
 
-			"profile": &schema.Schema{
+			"profile": {
 				Type:          schema.TypeString,
 				Optional:      true,
 				ConflictsWith: []string{"api_url", "api_key", "secret_key"},
 			},
 
-			"http_get_only": &schema.Schema{
+			"http_get_only": {
 				Type:        schema.TypeBool,
 				Required:    true,
 				DefaultFunc: schema.EnvDefaultFunc("CLOUDSTACK_HTTP_GET_ONLY", false),
 			},
 
-			"timeout": &schema.Schema{
+			"timeout": {
 				Type:        schema.TypeInt,
 				Required:    true,
 				DefaultFunc: schema.EnvDefaultFunc("CLOUDSTACK_TIMEOUT", 900),

cloudstack/resource_cloudstack_affinity_group.go

@@ -19,26 +19,26 @@ func resourceCloudStackAffinityGroup() *schema.Resource {
 		},
 
 		Schema: map[string]*schema.Schema{
-			"name": &schema.Schema{
+			"name": {
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"description": &schema.Schema{
+			"description": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 				ForceNew: true,
 			},
 
-			"type": &schema.Schema{
+			"type": {
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"project": &schema.Schema{
+			"project": {
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,

cloudstack/resource_cloudstack_affinity_group_test.go

@@ -17,7 +17,7 @@ func TestAccCloudStackAffinityGroup_basic(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudStackAffinityGroupDestroy,
 		Steps: []resource.TestStep{
-			resource.TestStep{
+			{
 				Config: testAccCloudStackAffinityGroup,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCloudStackAffinityGroupExists("cloudstack_affinity_group.foo", &affinityGroup),
@@ -34,11 +34,11 @@ func TestAccCloudStackAffinityGroup_import(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudStackAffinityGroupDestroy,
 		Steps: []resource.TestStep{
-			resource.TestStep{
+			{
 				Config: testAccCloudStackAffinityGroup,
 			},
 
-			resource.TestStep{
+			{
 				ResourceName:      "cloudstack_affinity_group.foo",
 				ImportState:       true,
 				ImportStateVerify: true,

cloudstack/resource_cloudstack_disk.go

@@ -19,54 +19,54 @@ func resourceCloudStackDisk() *schema.Resource {
 		},
 
 		Schema: map[string]*schema.Schema{
-			"name": &schema.Schema{
+			"name": {
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"attach": &schema.Schema{
+			"attach": {
 				Type:     schema.TypeBool,
 				Optional: true,
 				Default:  false,
 			},
 
-			"device_id": &schema.Schema{
+			"device_id": {
 				Type:     schema.TypeInt,
 				Optional: true,
 				Computed: true,
 			},
 
-			"disk_offering": &schema.Schema{
+			"disk_offering": {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
 
-			"size": &schema.Schema{
+			"size": {
 				Type:     schema.TypeInt,
 				Optional: true,
 				Computed: true,
 			},
 
-			"shrink_ok": &schema.Schema{
+			"shrink_ok": {
 				Type:     schema.TypeBool,
 				Optional: true,
 				Default:  false,
 			},
 
-			"virtual_machine_id": &schema.Schema{
+			"virtual_machine_id": {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
 
-			"project": &schema.Schema{
+			"project": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 				ForceNew: true,
 			},
 
-			"zone": &schema.Schema{
+			"zone": {
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,

cloudstack/resource_cloudstack_disk_test.go

@@ -17,7 +17,7 @@ func TestAccCloudStackDisk_basic(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudStackDiskDestroy,
 		Steps: []resource.TestStep{
-			resource.TestStep{
+			{
 				Config: testAccCloudStackDisk_basic,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCloudStackDiskExists(
@@ -38,7 +38,7 @@ func TestAccCloudStackDisk_update(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudStackDiskDestroy,
 		Steps: []resource.TestStep{
-			resource.TestStep{
+			{
 				Config: testAccCloudStackDisk_update,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCloudStackDiskExists(
@@ -47,7 +47,7 @@ func TestAccCloudStackDisk_update(t *testing.T) {
 				),
 			},
 
-			resource.TestStep{
+			{
 				Config: testAccCloudStackDisk_resize,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCloudStackDiskExists(
@@ -69,7 +69,7 @@ func TestAccCloudStackDisk_deviceID(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudStackDiskDestroy,
 		Steps: []resource.TestStep{
-			resource.TestStep{
+			{
 				Config: testAccCloudStackDisk_deviceID,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCloudStackDiskExists(
@@ -89,11 +89,11 @@ func TestAccCloudStackDisk_import(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudStackDiskDestroy,
 		Steps: []resource.TestStep{
-			resource.TestStep{
+			{
 				Config: testAccCloudStackDisk_basic,
 			},
 
-			resource.TestStep{
+			{
 				ResourceName:            "cloudstack_disk.foo",
 				ImportState:             true,
 				ImportStateVerify:       true,

cloudstack/resource_cloudstack_egress_firewall.go

@@ -20,63 +20,63 @@ func resourceCloudStackEgressFirewall() *schema.Resource {
 		Delete: resourceCloudStackEgressFirewallDelete,
 
 		Schema: map[string]*schema.Schema{
-			"network_id": &schema.Schema{
+			"network_id": {
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"managed": &schema.Schema{
+			"managed": {
 				Type:     schema.TypeBool,
 				Optional: true,
 				Default:  false,
 			},
 
-			"rule": &schema.Schema{
+			"rule": {
 				Type:     schema.TypeSet,
 				Optional: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-						"cidr_list": &schema.Schema{
+						"cidr_list": {
 							Type:     schema.TypeSet,
 							Required: true,
 							Elem:     &schema.Schema{Type: schema.TypeString},
 							Set:      schema.HashString,
 						},
 
-						"protocol": &schema.Schema{
+						"protocol": {
 							Type:     schema.TypeString,
 							Required: true,
 						},
 
-						"icmp_type": &schema.Schema{
+						"icmp_type": {
 							Type:     schema.TypeInt,
 							Optional: true,
 							Computed: true,
 						},
 
-						"icmp_code": &schema.Schema{
+						"icmp_code": {
 							Type:     schema.TypeInt,
 							Optional: true,
 							Computed: true,
 						},
 
-						"ports": &schema.Schema{
+						"ports": {
 							Type:     schema.TypeSet,
 							Optional: true,
 							Elem:     &schema.Schema{Type: schema.TypeString},
 							Set:      schema.HashString,
 						},
 
-						"uuids": &schema.Schema{
+						"uuids": {
 							Type:     schema.TypeMap,
 							Computed: true,
 						},
 					},
 				},
 			},
 
-			"parallelism": &schema.Schema{
+			"parallelism": {
 				Type:     schema.TypeInt,
 				Optional: true,
 				Default:  2,

cloudstack/resource_cloudstack_egress_firewall_test.go

@@ -16,7 +16,7 @@ func TestAccCloudStackEgressFirewall_basic(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudStackEgressFirewallDestroy,
 		Steps: []resource.TestStep{
-			resource.TestStep{
+			{
 				Config: testAccCloudStackEgressFirewall_basic,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCloudStackEgressFirewallRulesExist("cloudstack_egress_firewall.foo"),
@@ -40,7 +40,7 @@ func TestAccCloudStackEgressFirewall_update(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudStackEgressFirewallDestroy,
 		Steps: []resource.TestStep{
-			resource.TestStep{
+			{
 				Config: testAccCloudStackEgressFirewall_basic,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCloudStackEgressFirewallRulesExist("cloudstack_egress_firewall.foo"),
@@ -55,7 +55,7 @@ func TestAccCloudStackEgressFirewall_update(t *testing.T) {
 				),
 			},
 
-			resource.TestStep{
+			{
 				Config: testAccCloudStackEgressFirewall_update,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCloudStackEgressFirewallRulesExist("cloudstack_egress_firewall.foo"),