chore: remove redundant code and update build tags

Ran `golangci-lint run --fix` to:
- Eliminates unnecessary blank lines and redundant code across multiple files to improve readability and maintainability.
- Updates Go build tags by removing legacy `+build` comments, standardizing on `//go:build` syntax for test files.

Updates linter configuration to use `wsl_v5` with custom settings in `.golangci.yml`.

Replaced deprecated use of `swag.ReadJSON` and `swag.WriteJSON` with `jsonutils.ReadJSON` and `jsonutils.WriteJSON`.

Signed-off-by: Ryan Johnson <ryan.johnson@broadcom.com>

Author: tenthirtyam

.golangci.yml

@@ -63,7 +63,7 @@ linters:
     - unparam
     - unused
     - whitespace
-    - wsl
+    - wsl_v5
   settings:
     funlen:
       lines: 150
@@ -72,6 +72,10 @@ linters:
       min-complexity: 60
     nestif:
       min-complexity: 14
+    wsl_v5:
+      allow-first-in-block: true
+      allow-whole-block: false
+      branch-max-lines: 2
   exclusions:
     generated: lax
     presets:

go.mod

@@ -5,6 +5,7 @@ go 1.24.0
 require (
 	github.com/go-openapi/strfmt v0.25.0
 	github.com/go-openapi/swag v0.25.1
+	github.com/go-openapi/swag/jsonutils v0.25.1
 	github.com/go-test/deep v1.1.1
 	github.com/hashicorp/go-cty v1.5.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
@@ -27,7 +28,6 @@ require (
 	github.com/go-openapi/swag/conv v0.25.1 // indirect
 	github.com/go-openapi/swag/fileutils v0.25.1 // indirect
 	github.com/go-openapi/swag/jsonname v0.25.1 // indirect
-	github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
 	github.com/go-openapi/swag/loading v0.25.1 // indirect
 	github.com/go-openapi/swag/mangling v0.25.1 // indirect
 	github.com/go-openapi/swag/netutils v0.25.1 // indirect

internal/authctx/helper.go

@@ -191,8 +191,8 @@ func ProviderConfigureContextWithDefaultTransportForTesting(_ context.Context, d
 	config.TLSConfig.CaCert, _ = d.Get(caCert).(string)
 
 	var err error
-	config.TMCConnection, err = client.NewHTTPClient(config.TLSConfig)
 
+	config.TMCConnection, err = client.NewHTTPClient(config.TLSConfig)
 	if err != nil {
 		panic(err)
 	}
@@ -214,7 +214,6 @@ func setContext(config *TanzuContext) (TanzuContext, diag.Diagnostics) {
 	}
 
 	err := config.Setup()
-
 	if err != nil {
 		diags = append(diags, diag.Diagnostic{
 			Severity: diag.Error,
@@ -242,7 +241,6 @@ func setContextWithDefaultTransport(config *TanzuContext) (TanzuContext, diag.Di
 	}
 
 	err := config.SetupWithDefaultTransportForTesting()
-
 	if err != nil {
 		diags = append(diags, diag.Diagnostic{
 			Severity: diag.Error,

internal/authctx/saas.go

@@ -69,7 +69,6 @@ func getBearerToken(cspEndpoint, cspToken string, config *proxy.TLSConfig) (stri
 			"application/x-www-form-urlencoded",
 			encodedToken,
 		)
-
 		if err == nil {
 			defer resp.Body.Close()
 			break

internal/client/proxy/tls_test.go

@@ -244,6 +244,7 @@ func TestGetConnectorTLSConfig(t *testing.T) {
 					caCert1, _ := os.ReadFile(clientCertPath)
 					caCertPool := x509.NewCertPool()
 					caCertPool.AppendCertsFromPEM(caCert1)
+
 					return caCertPool
 				}(),
 			},
@@ -268,6 +269,7 @@ func TestGetConnectorTLSConfig(t *testing.T) {
 				RootCAs: func() *x509.CertPool {
 					caCertPool := x509.NewCertPool()
 					caCertPool.AppendCertsFromPEM([]byte(caCert))
+
 					return caCertPool
 				}(),
 			},

internal/client/targetlocation/targetlocation_resource.go

@@ -58,7 +58,6 @@ func (c *Client) TargetLocationResourceServiceList(request *targetlocationsmodel
 	}
 
 	requestURL, err := buildTargetLocationsRequestURL(request)
-
 	if err != nil {
 		return nil, err
 	}
@@ -128,7 +127,6 @@ func buildTargetLocationsRequestURL(request *targetlocationsmodel.ListBackupLoca
 	}
 
 	err := buildQueryParams(&queryParams, "", requestMap)
-
 	if err != nil {
 		return "", errors.New("couldn't create request url")
 	}
@@ -152,7 +150,6 @@ func buildQueryParams(queryParams *url.Values, parentParam string, request map[s
 			switch value := value.(type) {
 			case map[string]interface{}:
 				err = buildQueryParams(queryParams, parent, value)
-
 				if err != nil {
 					return err
 				}

internal/client/transport/methods.go

@@ -38,8 +38,8 @@ func (c *Client) Patch(url string, request Request, response Response) error {
 
 func (c *Client) invokeAction(httpMethodType string, url string, request Request, response Response) error {
 	requestURL := fmt.Sprintf("%s/%s", c.Host, strings.TrimPrefix(url, "/"))
-	body, err := request.MarshalBinary()
 
+	body, err := request.MarshalBinary()
 	if err != nil {
 		return errors.Wrap(err, "marshall request body")
 	}

internal/helper/converter/construct_tf_schema.go

@@ -40,8 +40,8 @@ func (converter *TFSchemaModelConverter[T]) buildTFValue(modelJSONData *map[stri
 		var modelValue interface{}
 
 		modelField := mapValue.Field
-		modelValue, err = converter.getModelValue(modelJSONData, modelField, arrIndexer)
 
+		modelValue, err = converter.getModelValue(modelJSONData, modelField, arrIndexer)
 		if err == nil {
 			tfSchemaValue = mapValue.EvalFunc(ConstructTFSchema, modelValue)
 		} else if strings.Contains(err.Error(), arrayCannotBeReachedMsg) && strings.HasSuffix(modelField, ArrayFieldMarker) {

internal/helper/converter/converter.go

@@ -76,27 +76,23 @@ func (converter *TFSchemaModelConverter[T]) FillTFSchema(modelPtr T, data *schem
 	)
 
 	jsonBytes, err := modelPtr.MarshalBinary()
-
 	if err != nil {
 		return err
 	}
 
 	err = json.Unmarshal(jsonBytes, &modelJSONData)
-
 	if err != nil {
 		return err
 	}
 
 	for mapKey, mapValue := range *converter.TFModelMap {
 		tfValue, err = converter.buildTFValue(&modelJSONData, mapValue, &arrIndexer)
-
 		if err != nil {
 			return err
 		}
 
 		if tfValue != nil {
 			err = data.Set(mapKey, tfValue)
-
 			if err != nil {
 				return err
 			}

internal/helper/openapi_v3_schema_validator/openapi_v3_schema_validator.go

@@ -203,7 +203,6 @@ func validateStringFormat(parentKey string, variableValue interface{}, variableS
 
 	if regexPattern, ok := variableSchema[string(PatternKey)]; ok {
 		regex, err := regexp.Compile(regexPattern.(string))
-
 		if err == nil {
 			if !regex.MatchString(variableValue.(string)) {
 				errs = append(errs, errors.Errorf("Key '%s' doesn't match regular expression '%s', value provided: '%s'", parentKey, regexPattern, variableValue))