Skip to content

Commit 61f6168

Browse files
vivgoyalvivgoyal
committed
Fix linter issues
Signed-off-by: Vivek Goyal <vivek.goyal@broadcom.com>
1 parent f755b93 commit 61f6168

25 files changed

+41
-38
lines changed

‎internal/resources/akscluster/resource_akscluster_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,7 @@ func Test_pollUntilReady(t *testing.T) {
841841
tt.args.interval, tt.wantError, gotErr)
842842
}
843843
}
844+
844845
if tt.validation != nil {
845846
tt.validation(t, tt.args)
846847
}

‎internal/resources/clusterclass/datasource_cluster_class.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func dataSourceClusterClassRead(ctx context.Context, data *schema.ResourceData,
4141
switch {
4242
case err != nil:
4343
return diag.FromErr(errors.Wrap(err, "Couldn't read cluster class"))
44-
case resp.ClusterClasses == nil || len(resp.ClusterClasses) == 0:
44+
case len(resp.ClusterClasses) == 0:
4545
data.SetId("NO_DATA")
4646
default:
4747
clusterClass := resp.ClusterClasses[0]

‎internal/resources/ekscluster/ekscluster_flatten_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ func TestFlattenClusterSpec(t *testing.T) {
444444
t.Run(test.description, func(t *testing.T) {
445445
spec, nps := test.getInput()
446446
output := flattenClusterSpec(spec, nps)
447+
447448
print(test.expected)
448449
print(output)
449450
require.Equal(t, test.expected, output)

‎internal/resources/ekscluster/helpers_test.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,9 @@ func TestNodepoolSpecEqual(t *testing.T) {
321321
for _, test := range tests {
322322
t.Run(test.name, func(t *testing.T) {
323323
spec1 := getNodepoolSpec()
324-
spec2 := getNodepoolSpec()
325324
test.modifySpec1(spec1)
325+
326+
spec2 := getNodepoolSpec()
326327
test.modifySpec2(spec2)
327328

328329
require.Equal(t, test.result, nodepoolSpecEqual(spec1, spec2), "return didn't match the expected output")
@@ -693,8 +694,9 @@ func TestClusterSpecEqual(t *testing.T) {
693694
for _, test := range tests {
694695
t.Run(test.name, func(t *testing.T) {
695696
spec1, _ := getClusterSpec()
696-
spec2, _ := getClusterSpec()
697697
test.modifySpec1(spec1)
698+
699+
spec2, _ := getClusterSpec()
698700
test.modifySpec2(spec2)
699701

700702
require.Equal(t, test.result, clusterSpecEqual(spec1, spec2), "return didn't match the expected output")

‎internal/resources/gitrepository/data_source_git_repository.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func dataSourceGitRepositoryRead(ctx context.Context, d *schema.ResourceData, m
6565
if err != nil {
6666
if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) {
6767
_ = schema.RemoveFromState(d, m)
68-
return
68+
return diags
6969
}
7070

7171
return diag.FromErr(err)

‎internal/resources/gitrepository/resource_git_repository.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ func resourceGitRepositoryInPlaceUpdate(ctx context.Context, d *schema.ResourceD
226226

227227
if !updateAvailable {
228228
log.Printf("[INFO] git repository update is not required")
229-
return
229+
return diags
230230
}
231231

232232
switch scopedFullnameData.Scope {

‎internal/resources/helmcharts/helm_charts_mock_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ import (
2020
objectmetamodel "github.com/vmware/terraform-provider-tanzu-mission-control/internal/models/objectmeta"
2121
)
2222

23-
const (
24-
https = "https:/"
25-
clAPIVersionAndGroup = "v1alpha1/organization/fluxcd/helm/repositories"
26-
apiSubGroup = "chartmetadatas"
27-
apiKind = "charts"
28-
)
29-
3023
// nolint: unused
3124
func bodyInspectingResponder(t *testing.T, expectedContent interface{}, successResponse int, successResponseBody interface{}) httpmock.Responder {
3225
return func(r *http.Request) (*http.Response, error) {
@@ -120,6 +113,13 @@ func (testConfig *testAcceptanceConfig) setupHTTPMocks(t *testing.T) {
120113
},
121114
}
122115

116+
const (
117+
https = "https:/"
118+
clAPIVersionAndGroup = "v1alpha1/organization/fluxcd/helm/repositories"
119+
apiSubGroup = "chartmetadatas"
120+
apiKind = "charts"
121+
)
122+
123123
getPkgEndpoint := (helper.ConstructRequestURL(https, endpoint, clAPIVersionAndGroup, "*", apiSubGroup, testConfig.ChartMetadataName, apiKind)).String()
124124

125125
httpmock.RegisterResponder("GET", getPkgEndpoint,

‎internal/resources/helmfeature/data_source_helm_feature.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func dataSourceHelmRead(ctx context.Context, d *schema.ResourceData, m interface
5353
if err != nil {
5454
if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) {
5555
_ = schema.RemoveFromState(d, m)
56-
return
56+
return diags
5757
}
5858

5959
return diag.FromErr(err)

‎internal/resources/helmrelease/data_source_helm_release.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func dataSourceHelmReleaseRead(ctx context.Context, d *schema.ResourceData, m in
6565
if err != nil {
6666
if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) {
6767
_ = schema.RemoveFromState(d, m)
68-
return
68+
return diags
6969
}
7070

7171
return diag.FromErr(err)

‎internal/resources/helmrelease/resource_helm_release.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ func resourceHelmReleaseInPlaceUpdate(ctx context.Context, d *schema.ResourceDat
267267

268268
if !updateAvailable {
269269
log.Printf("[INFO] helm release update is not required")
270-
return
270+
return diags
271271
}
272272

273273
switch scopedFullnameData.Scope {

‎internal/resources/helmrepository/helm_repository_data_source.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func dataSourceHelmRepositoryRead(ctx context.Context, d *schema.ResourceData, m
8484
if err != nil {
8585
if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) {
8686
_ = schema.RemoveFromState(d, m)
87-
return
87+
return diags
8888
}
8989

9090
return diag.FromErr(err)

‎internal/resources/helmrepository/helm_repository_mock_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ import (
2020
objectmetamodel "github.com/vmware/terraform-provider-tanzu-mission-control/internal/models/objectmeta"
2121
)
2222

23-
const (
24-
https = "https:/"
25-
clAPIVersionAndGroup = "v1alpha1/clusters"
26-
apiSubGroup = "namespaces"
27-
apiKind = "fluxcd/helm/repositories"
28-
)
29-
3023
// nolint: unused
3124
func bodyInspectingResponder(t *testing.T, expectedContent interface{}, successResponse int, successResponseBody interface{}) httpmock.Responder {
3225
return func(r *http.Request) (*http.Response, error) {
@@ -124,6 +117,13 @@ func (testConfig *testAcceptanceConfig) setupHTTPMocks(t *testing.T) {
124117
},
125118
}
126119

120+
const (
121+
https = "https:/"
122+
clAPIVersionAndGroup = "v1alpha1/clusters"
123+
apiSubGroup = "namespaces"
124+
apiKind = "fluxcd/helm/repositories"
125+
)
126+
127127
getPkgEndpoint := (helper.ConstructRequestURL(https, endpoint, clAPIVersionAndGroup, testConfig.ScopeHelperResources.Cluster.Name, apiSubGroup, testConfig.Namespace, apiKind)).String()
128128

129129
httpmock.RegisterResponder("GET", getPkgEndpoint,

‎internal/resources/iampolicy/resource_iam_policy.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func resourceIAMPolicyRead(_ context.Context, d *schema.ResourceData, m interfac
223223
// when iam policy resource is empty: no role bindings are existing, this is equivalent to not found condition.
224224
if len(policyList) == 0 {
225225
_ = schema.RemoveFromState(d, m)
226-
return
226+
return diags
227227
}
228228

229229
d.SetId(d.State().ID)

‎internal/resources/kustomization/resource_kustomization.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func resourceKustomizationRead(ctx context.Context, d *schema.ResourceData, m in
8686
if err != nil {
8787
if clienterrors.IsNotFoundError(err) {
8888
_ = schema.RemoveFromState(d, m)
89-
return
89+
return diags
9090
}
9191

9292
return diag.FromErr(err)
@@ -346,7 +346,7 @@ func resourceKustomizationInPlaceUpdate(ctx context.Context, d *schema.ResourceD
346346

347347
if !updateAvailable {
348348
log.Printf("[INFO] kustomization update is not required")
349-
return
349+
return diags
350350
}
351351

352352
switch scopedFullnameData.Scope {

‎internal/resources/permissiontemplate/datasource_permission_template.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func dataSourcePermissionTemplateRead(ctx context.Context, data *schema.Resource
6969
}
7070
}
7171

72-
if response.TemplateValues != nil && len(response.TemplateValues) > 0 {
72+
if len(response.TemplateValues) > 0 {
7373
// This is necessary because sometimes the template parameters definition and the template values returned from the API do not match.
7474
err = removeUndefinedTemplateValues(response)
7575

‎internal/resources/permissiontemplate/schema.go

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ func buildCapabilityProviderDescription(schemaKey string) (description string) {
113113
for k, v := range capabilityProviderMap {
114114
valueDescription := fmt.Sprintf("When %s is set to '%s' %s must be set to '%s'.", ProviderKey, v, CapabilityKey, k)
115115
description = fmt.Sprintf("%s\n%s", description, valueDescription)
116+
116117
validValues = append(validValues, v)
117118
}
118119

‎internal/resources/policy/kind/network/recipe/custom_common_schema.go

-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ func flattenCustomRule(rule *policyrecipenetworkcommonmodel.V1alpha1CommonPolicy
295295
var ports []interface{}
296296

297297
for _, port := range *rule.Ports {
298-
port := port
299298
ports = append(ports, flattenPort(&port))
300299
}
301300

‎internal/resources/policy/kind/network/recipe/custom_egress_schema.go

-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ func FlattenCustomEgress(customEgress *policyrecipenetworkmodel.V1alpha1CommonPo
129129
var rules []interface{}
130130

131131
for _, rule := range customEgress.Rules {
132-
rule := rule
133132
rules = append(rules, flattenCustomRule(&rule))
134133
}
135134

‎internal/resources/policy/kind/network/recipe/custom_ingress_schema.go

-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ func FlattenCustomIngress(customIngress *policyrecipenetworkmodel.V1alpha1Common
129129
var rules []interface{}
130130

131131
for _, rule := range customIngress.Rules {
132-
rule := rule
133132
rules = append(rules, flattenCustomRule(&rule))
134133
}
135134

‎internal/resources/policy/operations/update.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func ResourcePolicyInPlaceUpdate(ctx context.Context, d *schema.ResourceData, m
6464
if !updateAvailable {
6565
log.Printf("[INFO] %s policy update is not required", rn)
6666

67-
return
67+
return diags
6868
}
6969

7070
switch scopedFullnameData.Scope {

‎internal/resources/provisioner/data_source_provisioner.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@ func dataSourceProvisionerRead(ctx context.Context, d *schema.ResourceData, m in
7575
if err != nil {
7676
if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) {
7777
_ = schema.RemoveFromState(d, m)
78-
return
78+
return diags
7979
}
8080

81-
return
81+
return diags
8282
}
8383
} else {
8484
getResp, err := config.TMCConnection.ProvisionerResourceService.ProvisionerResourceServiceGet(model.Provisioners[0].FullName)
8585
if err != nil {
8686
if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) {
8787
_ = schema.RemoveFromState(d, m)
88-
return
88+
return diags
8989
}
9090
return
9191
}

‎internal/resources/sourcesecret/resource_sourcesecret.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ func resourceSourcesecretInPlaceUpdate(ctx context.Context, d *schema.ResourceDa
262262
}
263263

264264
if !updateAvailable {
265-
return
265+
return diags
266266
}
267267

268268
switch scopedFullnameData.Scope {

‎internal/resources/tanzukubernetescluster/helper.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func waitNodePoolsReady(ctx context.Context, config *authctx.TanzuContext, clust
205205
errMsg = fmt.Sprintf("%s\n%s", errMsg, npStatusMsg)
206206
}
207207

208-
err = errors.Wrapf(err, errMsg)
208+
err = errors.Wrapf(err, "%s", errMsg)
209209
}
210210

211211
return err
@@ -461,6 +461,7 @@ func removeModelVariable(clusterClassSchema interface{}, modelVariable interface
461461
} else {
462462
modelVarAdditionalProperties, additionalPropertiesExist := clusterClassSchema.(map[string]interface{})[string(openapiv3.AdditionalPropertiesKey)]
463463
preserve, preserveExists := clusterClassSchema.(map[string]interface{})[string(openapiv3.PreserveUnknownFieldKey)]
464+
464465
if additionalPropertiesExist {
465466
_, propertiesExist := modelVarAdditionalProperties.(map[string]interface{})[string(openapiv3.PropertiesKey)]
466467

‎internal/resources/tanzukubernetescluster/resource_tanzu_kuberenetes_cluster.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ func validateSchema(_ context.Context, data *schema.ResourceDiff, value interfac
392392
if err != nil {
393393
return errors.Wrapf(err, "Couldn't find cluster class.\nManagement Cluster Name: %s, Provisioner: %s, Cluster Class Name: %s.",
394394
clusterClassFn.ManagementClusterName, clusterClassFn.ProvisionerName, clusterClassFn.Name)
395-
} else if resp.ClusterClasses == nil || len(resp.ClusterClasses) == 0 {
395+
} else if len(resp.ClusterClasses) == 0 {
396396
return errors.Errorf("Couldn't find cluster class.\nManagement Cluster Name: %s, Provisioner: %s, Cluster Class Name: %s.",
397397
clusterClassFn.ManagementClusterName, clusterClassFn.ProvisionerName, clusterClassFn.Name)
398398
}

‎internal/resources/tanzupackagerepository/resource_package_repository.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ func resourcePackageRepositoryInPlaceUpdate(ctx context.Context, d *schema.Resou
239239
}
240240

241241
if !updateCheckForMeta(d, pkgRepoDataFromServer.meta) && !updateCheckForSpec(d, pkgRepoDataFromServer.spec) && !d.HasChange(disabledKey) {
242-
return
242+
return diags
243243
}
244244

245245
return dataPackageRepositoryRead(ctx, d, m)

0 commit comments

Comments
 (0)