Skip to content

Commit 545c72e

Browse files
frodenasfrodenas
committed
Fix linter errors
Signed-off-by: Ferran Rodenas <[email protected]>
1 parent ac130ef commit 545c72e

35 files changed

+149
-149
lines changed

‎vra/data_source_cloud_account_aws.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func dataSourceCloudAccountAWSRead(d *schema.ResourceData, meta interface{}) err
128128
return fmt.Errorf("error setting cloud_account_aws links - error: %#v", err)
129129
}
130130

131-
if err := d.Set("regions", extractIdsFromRegion(cloudAccountAws.EnabledRegions)); err != nil {
131+
if err := d.Set("regions", extractIDsFromRegion(cloudAccountAws.EnabledRegions)); err != nil {
132132
return fmt.Errorf("error setting cloud_account_aws regions - error: %#v", err)
133133
}
134134

‎vra/data_source_cloud_account_azure.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func dataSourceCloudAccountAzureRead(d *schema.ResourceData, meta interface{}) e
141141
return fmt.Errorf("error setting cloud_account_azure links - error: %#v", err)
142142
}
143143

144-
if err := d.Set("regions", extractIdsFromRegion(cloudAccountAzure.EnabledRegions)); err != nil {
144+
if err := d.Set("regions", extractIDsFromRegion(cloudAccountAzure.EnabledRegions)); err != nil {
145145
return fmt.Errorf("error setting cloud_account_azure regions - error: %#v", err)
146146
}
147147

‎vra/data_source_cloud_account_gcp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func dataSourceCloudAccountGCPRead(d *schema.ResourceData, meta interface{}) err
140140
return fmt.Errorf("error setting cloud_account_gcp links - error: %#v", err)
141141
}
142142

143-
if err := d.Set("regions", extractIdsFromRegion(cloudAccountGcp.EnabledRegions)); err != nil {
143+
if err := d.Set("regions", extractIDsFromRegion(cloudAccountGcp.EnabledRegions)); err != nil {
144144
return fmt.Errorf("error setting cloud_account_gcp regions - error: %#v", err)
145145
}
146146

‎vra/data_source_cloud_account_nsxt.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func dataSourceCloudAccountNSXTRead(d *schema.ResourceData, meta interface{}) er
105105

106106
setFields := func(account *models.CloudAccountNsxT) error {
107107
d.SetId(*account.ID)
108-
d.Set("associated_cloud_account_ids", flattenAssociatedCloudAccountIds(account.Links))
108+
d.Set("associated_cloud_account_ids", flattenAssociatedCloudAccountIDs(account.Links))
109109
d.Set("created_at", account.CreatedAt)
110110
d.Set("dc_id", account.Dcid)
111111
d.Set("description", account.Description)

‎vra/data_source_cloud_account_nsxv.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func dataSourceCloudAccountNSXVRead(d *schema.ResourceData, meta interface{}) er
100100

101101
setFields := func(account *models.CloudAccountNsxV) error {
102102
d.SetId(*account.ID)
103-
d.Set("associated_cloud_account_ids", flattenAssociatedCloudAccountIds(account.Links))
103+
d.Set("associated_cloud_account_ids", flattenAssociatedCloudAccountIDs(account.Links))
104104
d.Set("created_at", account.CreatedAt)
105105
d.Set("dc_id", account.Dcid)
106106
d.Set("description", account.Description)

‎vra/data_source_cloud_account_vmc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func dataSourceCloudAccountVMCRead(d *schema.ResourceData, meta interface{}) err
154154
return fmt.Errorf("error setting cloud_account_vmc links - error: %#v", err)
155155
}
156156

157-
if err := d.Set("regions", extractIdsFromRegion(cloudAccount.EnabledRegions)); err != nil {
157+
if err := d.Set("regions", extractIDsFromRegion(cloudAccount.EnabledRegions)); err != nil {
158158
return fmt.Errorf("error setting cloud_account_vmc regions - error: %#v", err)
159159
}
160160

‎vra/data_source_cloud_account_vsphere.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func dataSourceCloudAccountVsphereRead(d *schema.ResourceData, meta interface{})
133133
}
134134

135135
d.SetId(*cloudAccountVsphere.ID)
136-
d.Set("associated_cloud_account_ids", flattenAssociatedCloudAccountIds(cloudAccountVsphere.Links))
136+
d.Set("associated_cloud_account_ids", flattenAssociatedCloudAccountIDs(cloudAccountVsphere.Links))
137137
d.Set("created_at", cloudAccountVsphere.CreatedAt)
138138
d.Set("dc_id", cloudAccountVsphere.Dcid)
139139
d.Set("description", cloudAccountVsphere.Description)
@@ -148,7 +148,7 @@ func dataSourceCloudAccountVsphereRead(d *schema.ResourceData, meta interface{})
148148
return fmt.Errorf("error setting cloud_account_vsphere links - error: %#v", err)
149149
}
150150

151-
if err := d.Set("regions", extractIdsFromRegion(cloudAccountVsphere.EnabledRegions)); err != nil {
151+
if err := d.Set("regions", extractIDsFromRegion(cloudAccountVsphere.EnabledRegions)); err != nil {
152152
return fmt.Errorf("error setting cloud_account_vsphere regions - error: %#v", err)
153153
}
154154

‎vra/data_source_network.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func dataSourceNetwork() *schema.Resource {
2323
Type: schema.TypeString,
2424
Optional: true,
2525
Computed: true,
26-
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
26+
DiffSuppressFunc: func(_, old, new string, _ *schema.ResourceData) bool {
2727
return !strings.HasPrefix(new, old)
2828
},
2929
},

‎vra/data_source_network_profile.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,13 @@ func dataSourceNetworkProfileRead(d *schema.ResourceData, meta interface{}) erro
156156

157157
if fabricNetworkLinks, ok := networkProfile.Links["fabric-networks"]; ok {
158158
if fabricNetworkLinks.Hrefs != nil {
159-
fabricNetworkIds := make([]string, 0, len(fabricNetworkLinks.Hrefs))
159+
fabricNetworkIDs := make([]string, 0, len(fabricNetworkLinks.Hrefs))
160160

161161
for _, link := range fabricNetworkLinks.Hrefs {
162-
fabricNetworkIds = append(fabricNetworkIds, strings.TrimPrefix(link, "/iaas/api/fabric-networks/"))
162+
fabricNetworkIDs = append(fabricNetworkIDs, strings.TrimPrefix(link, "/iaas/api/fabric-networks/"))
163163
}
164164

165-
d.Set("fabric_network_ids", fabricNetworkIds)
165+
d.Set("fabric_network_ids", fabricNetworkIDs)
166166
}
167167
}
168168

@@ -180,13 +180,13 @@ func dataSourceNetworkProfileRead(d *schema.ResourceData, meta interface{}) erro
180180

181181
if securityGroupLinks, ok := networkProfile.Links["security-groups"]; ok {
182182
if securityGroupLinks.Hrefs != nil {
183-
securityGroupIds := make([]string, 0, len(securityGroupLinks.Hrefs))
183+
securityGroupIDs := make([]string, 0, len(securityGroupLinks.Hrefs))
184184

185185
for _, link := range securityGroupLinks.Hrefs {
186-
securityGroupIds = append(securityGroupIds, strings.TrimPrefix(link, "/iaas/api/security-groups/"))
186+
securityGroupIDs = append(securityGroupIDs, strings.TrimPrefix(link, "/iaas/api/security-groups/"))
187187
}
188188

189-
d.Set("security_group_ids", securityGroupIds)
189+
d.Set("security_group_ids", securityGroupIDs)
190190
}
191191
}
192192

@@ -198,12 +198,12 @@ func dataSourceNetworkProfileRead(d *schema.ResourceData, meta interface{}) erro
198198

199199
if fabricNetworkLinks, ok := networkProfile.Links["fabric-networks"]; ok {
200200
if len(fabricNetworkLinks.Hrefs) != 0 {
201-
var networkIds []string
201+
var networkIDs []string
202202
for i, link := range fabricNetworkLinks.Hrefs {
203-
networkIds = append(networkIds, strings.TrimPrefix(link, "/iaas/api/fabric-networks/"))
203+
networkIDs = append(networkIDs, strings.TrimPrefix(link, "/iaas/api/fabric-networks/"))
204204
log.Printf("Appending network profile link %s on index %d", link, i)
205205
}
206-
d.Set("fabric_network_ids", networkIds)
206+
d.Set("fabric_network_ids", networkIDs)
207207
}
208208
}
209209
log.Printf("Finished reading the vra_network_profile data source with filter %s", d.Get("filter"))

‎vra/data_source_region_enumeration.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ func dataSourceRegionEnumerationRead(ctx context.Context, d *schema.ResourceData
8686
MinTimeout: 5 * time.Second,
8787
}
8888

89-
resourceIds, err := stateChangeFunc.WaitForStateContext(ctx)
89+
resourceIDs, err := stateChangeFunc.WaitForStateContext(ctx)
9090
if err != nil {
9191
return diag.FromErr(err)
9292
}
93-
enumID := (resourceIds.([]string))[0]
93+
enumID := (resourceIDs.([]string))[0]
9494

9595
getResp, err := apiClient.CloudAccount.GetRegionEnumerationResult(
9696
cloud_account.NewGetRegionEnumerationResultParams().
@@ -100,7 +100,7 @@ func dataSourceRegionEnumerationRead(ctx context.Context, d *schema.ResourceData
100100
return diag.FromErr(err)
101101
}
102102

103-
d.Set("regions", extractIdsFromRegionSpecification(getResp.Payload.ExternalRegions))
103+
d.Set("regions", extractIDsFromRegionSpecification(getResp.Payload.ExternalRegions))
104104
d.SetId(d.Get("hostname").(string))
105105

106106
return nil
@@ -120,11 +120,11 @@ func dataSourceRegionEnumerationReadRefreshFunc(apiClient client.API, id string)
120120
case models.RequestTrackerStatusINPROGRESS:
121121
return [...]string{id}, *status, nil
122122
case models.RequestTrackerStatusFINISHED:
123-
regionEnumerationIds := make([]string, len(reqResp.Payload.Resources))
123+
regionEnumerationIDs := make([]string, len(reqResp.Payload.Resources))
124124
for i, r := range reqResp.Payload.Resources {
125-
regionEnumerationIds[i] = strings.TrimPrefix(r, "/iaas/api/cloud-accounts/region-enumeration/")
125+
regionEnumerationIDs[i] = strings.TrimPrefix(r, "/iaas/api/cloud-accounts/region-enumeration/")
126126
}
127-
return regionEnumerationIds, *status, nil
127+
return regionEnumerationIDs, *status, nil
128128
default:
129129
return [...]string{id}, reqResp.Payload.Message, fmt.Errorf("dataSourceRegionEnumerationReadRefreshFunc: unknown status %v", *status)
130130
}

‎vra/data_source_region_enumeration_aws.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ func dataSourceRegionEnumerationAWSRead(ctx context.Context, d *schema.ResourceD
6262
MinTimeout: 5 * time.Second,
6363
}
6464

65-
resourceIds, err := stateChangeFunc.WaitForStateContext(ctx)
65+
resourceIDs, err := stateChangeFunc.WaitForStateContext(ctx)
6666
if err != nil {
6767
return diag.FromErr(err)
6868
}
69-
enumID := (resourceIds.([]string))[0]
69+
enumID := (resourceIDs.([]string))[0]
7070

7171
getResp, err := apiClient.CloudAccount.GetRegionEnumerationResult(
7272
cloud_account.NewGetRegionEnumerationResultParams().
@@ -76,7 +76,7 @@ func dataSourceRegionEnumerationAWSRead(ctx context.Context, d *schema.ResourceD
7676
return diag.FromErr(err)
7777
}
7878

79-
d.Set("regions", extractIdsFromRegionSpecification(getResp.Payload.ExternalRegions))
79+
d.Set("regions", extractIDsFromRegionSpecification(getResp.Payload.ExternalRegions))
8080
d.SetId(d.Get("access_key").(string))
8181

8282
return nil

‎vra/data_source_region_enumeration_azure.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ func dataSourceRegionEnumerationAzureRead(ctx context.Context, d *schema.Resourc
7474
MinTimeout: 5 * time.Second,
7575
}
7676

77-
resourceIds, err := stateChangeFunc.WaitForStateContext(ctx)
77+
resourceIDs, err := stateChangeFunc.WaitForStateContext(ctx)
7878
if err != nil {
7979
return diag.FromErr(err)
8080
}
81-
enumID := (resourceIds.([]string))[0]
81+
enumID := (resourceIDs.([]string))[0]
8282

8383
getResp, err := apiClient.CloudAccount.GetRegionEnumerationResult(
8484
cloud_account.NewGetRegionEnumerationResultParams().
@@ -88,7 +88,7 @@ func dataSourceRegionEnumerationAzureRead(ctx context.Context, d *schema.Resourc
8888
return diag.FromErr(err)
8989
}
9090

91-
d.Set("regions", extractIdsFromRegionSpecification(getResp.Payload.ExternalRegions))
91+
d.Set("regions", extractIDsFromRegionSpecification(getResp.Payload.ExternalRegions))
9292
d.SetId(d.Get("application_id").(string))
9393

9494
return nil

‎vra/data_source_region_enumeration_gcp.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ func dataSourceRegionEnumerationGCPRead(ctx context.Context, d *schema.ResourceD
7474
MinTimeout: 5 * time.Second,
7575
}
7676

77-
resourceIds, err := stateChangeFunc.WaitForStateContext(ctx)
77+
resourceIDs, err := stateChangeFunc.WaitForStateContext(ctx)
7878
if err != nil {
7979
return diag.FromErr(err)
8080
}
81-
enumID := (resourceIds.([]string))[0]
81+
enumID := (resourceIDs.([]string))[0]
8282

8383
getResp, err := apiClient.CloudAccount.GetRegionEnumerationResult(
8484
cloud_account.NewGetRegionEnumerationResultParams().
@@ -88,7 +88,7 @@ func dataSourceRegionEnumerationGCPRead(ctx context.Context, d *schema.ResourceD
8888
return diag.FromErr(err)
8989
}
9090

91-
d.Set("regions", extractIdsFromRegionSpecification(getResp.Payload.ExternalRegions))
91+
d.Set("regions", extractIDsFromRegionSpecification(getResp.Payload.ExternalRegions))
9292
d.SetId(d.Get("private_key_id").(string))
9393

9494
return nil

‎vra/data_source_region_enumeration_vmc.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ func dataSourceRegionEnumerationVMCRead(ctx context.Context, d *schema.ResourceD
9999
MinTimeout: 5 * time.Second,
100100
}
101101

102-
resourceIds, err := stateChangeFunc.WaitForStateContext(ctx)
102+
resourceIDs, err := stateChangeFunc.WaitForStateContext(ctx)
103103
if err != nil {
104104
return diag.FromErr(err)
105105
}
106-
enumID := (resourceIds.([]string))[0]
106+
enumID := (resourceIDs.([]string))[0]
107107

108108
getResp, err := apiClient.CloudAccount.GetRegionEnumerationResult(
109109
cloud_account.NewGetRegionEnumerationResultParams().
@@ -113,7 +113,7 @@ func dataSourceRegionEnumerationVMCRead(ctx context.Context, d *schema.ResourceD
113113
return diag.FromErr(err)
114114
}
115115

116-
d.Set("regions", extractIdsFromRegionSpecification(getResp.Payload.ExternalRegions))
116+
d.Set("regions", extractIDsFromRegionSpecification(getResp.Payload.ExternalRegions))
117117
d.SetId(d.Get("vcenter_hostname").(string))
118118

119119
return nil

‎vra/data_source_region_enumeration_vsphere.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ func dataSourceRegionEnumerationVsphereRead(ctx context.Context, d *schema.Resou
8282
MinTimeout: 5 * time.Second,
8383
}
8484

85-
resourceIds, err := stateChangeFunc.WaitForStateContext(ctx)
85+
resourceIDs, err := stateChangeFunc.WaitForStateContext(ctx)
8686
if err != nil {
8787
return diag.FromErr(err)
8888
}
89-
enumID := (resourceIds.([]string))[0]
89+
enumID := (resourceIDs.([]string))[0]
9090

9191
getResp, err := apiClient.CloudAccount.GetRegionEnumerationResult(
9292
cloud_account.NewGetRegionEnumerationResultParams().
@@ -96,7 +96,7 @@ func dataSourceRegionEnumerationVsphereRead(ctx context.Context, d *schema.Resou
9696
return diag.FromErr(err)
9797
}
9898

99-
d.Set("regions", extractIdsFromRegionSpecification(getResp.Payload.ExternalRegions))
99+
d.Set("regions", extractIDsFromRegionSpecification(getResp.Payload.ExternalRegions))
100100
d.SetId(d.Get("hostname").(string))
101101

102102
return nil

‎vra/data_source_zone.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ func dataSourceZoneRead(d *schema.ResourceData, m interface{}) error {
163163
return fmt.Errorf("error getting zone computes - error: %v", err)
164164
}
165165

166-
var computeIds []string
166+
var computeIDs []string
167167
for _, compute := range getComputesResp.Payload.Content {
168-
computeIds = append(computeIds, *compute.ID)
168+
computeIDs = append(computeIDs, *compute.ID)
169169
}
170-
d.Set("compute_ids", computeIds)
170+
d.Set("compute_ids", computeIDs)
171171

172172
return nil
173173
}

‎vra/nics.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ func expandNics(configNics []interface{}) []*models.NetworkInterfaceSpecificatio
8686
}
8787

8888
if v, ok := nicMap["security_group_ids"].([]interface{}); ok && len(v) != 0 {
89-
securityGroupIds := make([]string, 0)
89+
securityGroupIDs := make([]string, 0)
9090

9191
for _, value := range v {
92-
securityGroupIds = append(securityGroupIds, value.(string))
92+
securityGroupIDs = append(securityGroupIDs, value.(string))
9393
}
9494

95-
nic.SecurityGroupIds = securityGroupIds
95+
nic.SecurityGroupIds = securityGroupIDs
9696
}
9797

9898
nic.CustomProperties = expandCustomProperties(nicMap["custom_properties"].(map[string]interface{}))

‎vra/regions.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ import (
44
"github.com/vmware/vra-sdk-go/pkg/models"
55
)
66

7-
func extractIdsFromRegion(regions []*models.Region) []string {
8-
regionIds := []string{}
7+
func extractIDsFromRegion(regions []*models.Region) []string {
8+
regionIDs := []string{}
99

1010
for _, region := range regions {
11-
regionIds = append(regionIds, *region.ExternalRegionID)
11+
regionIDs = append(regionIDs, *region.ExternalRegionID)
1212
}
1313

14-
return regionIds
14+
return regionIDs
1515
}
1616

17-
func extractIdsFromRegionSpecification(regions []*models.RegionSpecification) []string {
18-
regionIds := []string{}
17+
func extractIDsFromRegionSpecification(regions []*models.RegionSpecification) []string {
18+
regionIDs := []string{}
1919

2020
for _, region := range regions {
21-
regionIds = append(regionIds, *region.ExternalRegionID)
21+
regionIDs = append(regionIDs, *region.ExternalRegionID)
2222
}
2323

24-
return regionIds
24+
return regionIDs
2525
}
2626

2727
func expandRegionSpecificationList(rList []interface{}) []*models.RegionSpecification {

‎vra/resource_block_device.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func resourceBlockDevice() *schema.Resource {
3737
"name": {
3838
Type: schema.TypeString,
3939
Required: true,
40-
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
40+
DiffSuppressFunc: func(_, old, new string, _ *schema.ResourceData) bool {
4141
return !strings.HasPrefix(new, old)
4242
},
4343
Description: "A human-friendly name for the block device.",

‎vra/resource_cloud_account_aws.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ func resourceCloudAccountAWSCreate(ctx context.Context, d *schema.ResourceData,
125125
MinTimeout: 5 * time.Second,
126126
}
127127

128-
resourceIds, err := stateChangeFunc.WaitForStateContext(ctx)
128+
resourceIDs, err := stateChangeFunc.WaitForStateContext(ctx)
129129
if err != nil {
130130
return diag.FromErr(err)
131131
}
132-
cloudAccountAWS := (resourceIds.([]string))[0]
132+
cloudAccountAWS := (resourceIDs.([]string))[0]
133133

134134
d.SetId(cloudAccountAWS)
135135

@@ -163,7 +163,7 @@ func resourceCloudAccountAWSRead(_ context.Context, d *schema.ResourceData, m in
163163
return diag.Errorf("error setting cloud_account_aws links - error: %#v", err)
164164
}
165165

166-
if err := d.Set("regions", extractIdsFromRegion(awsAccount.EnabledRegions)); err != nil {
166+
if err := d.Set("regions", extractIDsFromRegion(awsAccount.EnabledRegions)); err != nil {
167167
return diag.Errorf("error setting cloud_account_aws regions - error: %#v", err)
168168
}
169169

@@ -244,11 +244,11 @@ func resourceCloudAccountAWSStateRefreshFunc(apiClient client.API, id string) re
244244
case models.RequestTrackerStatusINPROGRESS:
245245
return [...]string{id}, *status, nil
246246
case models.RequestTrackerStatusFINISHED:
247-
cloudAccountIds := make([]string, len(ret.Payload.Resources))
247+
cloudAccountIDs := make([]string, len(ret.Payload.Resources))
248248
for i, r := range ret.Payload.Resources {
249-
cloudAccountIds[i] = strings.TrimPrefix(r, "/iaas/api/cloud-accounts/")
249+
cloudAccountIDs[i] = strings.TrimPrefix(r, "/iaas/api/cloud-accounts/")
250250
}
251-
return cloudAccountIds, *status, nil
251+
return cloudAccountIDs, *status, nil
252252
default:
253253
return [...]string{id}, ret.Payload.Message, fmt.Errorf("resourceCloudAccountAWSStateRefreshFunc: unknown status %v", *status)
254254
}

0 commit comments

Comments
 (0)