fix: enable more linting

.golangci.yaml

@@ -27,8 +27,6 @@ linters:
     - cyclop # we have gocyclo, apparently its better
     - execinquery # deprecated
 
-    - canonicalheader # for checking copyright headers
-    - bodyclose # we want this
     - contextcheck # we want this
     - copyloopvar # if we update to later than go 1.22
     - depguard # for banning specific dependencies
@@ -39,18 +37,15 @@ linters:
     - funlen # we want this
     - goconst # we want this
     - gocritic # we want this
-    - gosec # we want this
     - intrange # later version of go
-    - ireturn # we want this
+    # - ireturn # we want this
     - lll # we want this
     - maintidx # we want this
     - mnd # we want this  todo: also see gomnd
     - gomnd # disabled in gl provider  todo: also see mnd
-    - nlreturn # we want this
     - noctx # we want this
     - nestif # we want this
     - revive # we want this
-    - stylecheck # we want this
     - tagliatelle # we want this
     - testifylint # we want this
     - thelper # we want this
@@ -93,6 +88,10 @@ issues:
         - dupl
       path: _test\.go
 
+    - linters:
+        - stylecheck
+      path: pkg/config-api-client
+
     - linters:
         - dupl
       path: ".*generated.*go"
@@ -109,4 +108,12 @@ issues:
         - stylecheck
       text: "ST1005:"
 
+    - linters:
+        - ireturn
+      path: internal/provider/resources
+
+    - linters:
+        - ireturn
+      path: internal/provider/util/retry.go
+
   max-same-issues: 0

internal/provider/config/config.go

@@ -8,7 +8,7 @@ import "os"
 
 const (
 	MaxRetriesForTooManyRequests = 10
-	TokenURL                     = "https://sso.common.cloud.hpe.com/as/token.oauth2"
+	TokenURL                     = "https://sso.common.cloud.hpe.com/as/token.oauth2" // #nosec G101
 	UXIDefaultHost               = "api.capenetworks.com"
 )
 
@@ -23,6 +23,7 @@ func getEnv(key, fallback string) string {
 	if value == "" {
 		return fallback
 	}
+
 	return value
 }
 

internal/provider/provider.go

@@ -135,7 +135,7 @@ func (p *uxiConfigurationProvider) Configure(
 	uxiConfiguration := config_api_client.NewConfiguration()
 	uxiConfiguration.Host = configuration.Host
 	uxiConfiguration.Scheme = "https"
-	uxiConfiguration.HTTPClient = getHttpClient(clientID, clientSecret, configuration.TokenURL)
+	uxiConfiguration.HTTPClient = getHTTPClient(clientID, clientSecret, configuration.TokenURL)
 	uxiClient := config_api_client.NewAPIClient(uxiConfiguration)
 
 	resp.DataSourceData = uxiClient
@@ -172,7 +172,7 @@ func (p *uxiConfigurationProvider) Resources(_ context.Context) []func() resourc
 	}
 }
 
-func getHttpClient(clientID string, clientSecret string, tokenURL string) *http.Client {
+func getHTTPClient(clientID string, clientSecret string, tokenURL string) *http.Client {
 	config := &clientcredentials.Config{
 		ClientID:     clientID,
 		ClientSecret: clientSecret,

internal/provider/resources/data_source_agent.go

@@ -123,17 +123,20 @@ func (d *agentDataSource) Read(
 
 	agentResponse, response, err := util.RetryForTooManyRequests(request.Execute)
 	errorPresent, errorDetail := util.RaiseForStatus(response, err)
-
 	errorSummary := util.GenerateErrorSummary("read", "uxi_agent")
 
 	if errorPresent {
 		resp.Diagnostics.AddError(errorSummary, errorDetail)
+
 		return
 	}
 
+	defer response.Body.Close()
+
 	if len(agentResponse.Items) != 1 {
 		resp.Diagnostics.AddError(errorSummary, "Could not find specified data source")
 		resp.State.RemoveResource(ctx)
+
 		return
 	}
 
@@ -171,6 +174,7 @@ func (d *agentDataSource) Configure(
 			"Unexpected Data Source Configure Type",
 			"Data Source type: Agent. Please report this issue to the provider developers.",
 		)
+
 		return
 	}
 

internal/provider/resources/data_source_agent_group_assignment.go

@@ -97,17 +97,20 @@ func (d *agentGroupAssignmentDataSource) Read(
 		Id(state.Filter.ID)
 	agentGroupAssignmentResponse, response, err := util.RetryForTooManyRequests(request.Execute)
 	errorPresent, errorDetail := util.RaiseForStatus(response, err)
-
 	errorSummary := util.GenerateErrorSummary("read", "uxi_agent_group_assignment")
 
 	if errorPresent {
 		resp.Diagnostics.AddError(errorSummary, errorDetail)
+
 		return
 	}
 
+	defer response.Body.Close()
+
 	if len(agentGroupAssignmentResponse.Items) != 1 {
 		resp.Diagnostics.AddError(errorSummary, "Could not find specified data source")
 		resp.State.RemoveResource(ctx)
+
 		return
 	}
 
@@ -139,6 +142,7 @@ func (d *agentGroupAssignmentDataSource) Configure(
 			"Unexpected Data Source Configure Type",
 			"Data Source type: Agent Group Assignment. Please report this issue to the provider developers.",
 		)
+
 		return
 	}
 

internal/provider/resources/data_source_group.go

@@ -103,23 +103,27 @@ func (d *groupDataSource) Read(
 
 	groupResponse, response, err := util.RetryForTooManyRequests(request.Execute)
 	errorPresent, errorDetail := util.RaiseForStatus(response, err)
-
 	errorSummary := util.GenerateErrorSummary("read", "uxi_group")
 
 	if errorPresent {
 		resp.Diagnostics.AddError(errorSummary, errorDetail)
+
 		return
 	}
 
+	defer response.Body.Close()
+
 	if len(groupResponse.Items) != 1 {
 		resp.Diagnostics.AddError(errorSummary, "Could not find specified data source")
 		resp.State.RemoveResource(ctx)
+
 		return
 	}
 
 	group := groupResponse.Items[0]
 	if util.IsRoot(group) {
 		resp.Diagnostics.AddError(errorSummary, "The root group cannot be used as a data source")
+
 		return
 	}
 
@@ -151,6 +155,7 @@ func (d *groupDataSource) Configure(
 			"Unexpected Data Source Configure Type",
 			"Data Source type: Group. Please report this issue to the provider developers.",
 		)
+
 		return
 	}
 

internal/provider/resources/data_source_network_group_assignment.go

@@ -97,17 +97,20 @@ func (d *networkGroupAssignmentDataSource) Read(
 		Id(state.Filter.ID)
 	networkGroupAssignmentResponse, response, err := util.RetryForTooManyRequests(request.Execute)
 	errorPresent, errorDetail := util.RaiseForStatus(response, err)
-
 	errorSummary := util.GenerateErrorSummary("read", "uxi_network_group_assignment")
 
 	if errorPresent {
 		resp.Diagnostics.AddError(errorSummary, errorDetail)
+
 		return
 	}
 
+	defer response.Body.Close()
+
 	if len(networkGroupAssignmentResponse.Items) != 1 {
 		resp.Diagnostics.AddError(errorSummary, "Could not find specified data source")
 		resp.State.RemoveResource(ctx)
+
 		return
 	}
 
@@ -139,6 +142,7 @@ func (d *networkGroupAssignmentDataSource) Configure(
 			"Unexpected Data Source Configure Type",
 			"Data Source type: Network Group Assignment. Please report this issue to the provider developers.",
 		)
+
 		return
 	}
 

internal/provider/resources/data_source_sensor.go

@@ -138,17 +138,20 @@ func (d *sensorDataSource) Read(
 
 	sensorResponse, response, err := util.RetryForTooManyRequests(request.Execute)
 	errorPresent, errorDetail := util.RaiseForStatus(response, err)
-
 	errorSummary := util.GenerateErrorSummary("read", "uxi_sensor")
 
 	if errorPresent {
 		resp.Diagnostics.AddError(errorSummary, errorDetail)
+
 		return
 	}
 
+	defer response.Body.Close()
+
 	if len(sensorResponse.Items) != 1 {
 		resp.Diagnostics.AddError(errorSummary, "Could not find specified data source")
 		resp.State.RemoveResource(ctx)
+
 		return
 	}
 
@@ -189,6 +192,7 @@ func (d *sensorDataSource) Configure(
 			"Unexpected Data Source Configure Type",
 			"Data Source type: Sensor. Please report this issue to the provider developers.",
 		)
+
 		return
 	}
 

internal/provider/resources/data_source_sensor_group_assignment.go

@@ -97,17 +97,20 @@ func (d *sensorGroupAssignmentDataSource) Read(
 		Id(state.Filter.ID)
 	sensorGroupAssignmentResponse, response, err := util.RetryForTooManyRequests(request.Execute)
 	errorPresent, errorDetail := util.RaiseForStatus(response, err)
-
 	errorSummary := util.GenerateErrorSummary("read", "uxi_sensor_group_assignment")
 
 	if errorPresent {
 		resp.Diagnostics.AddError(errorSummary, errorDetail)
+
 		return
 	}
 
+	defer response.Body.Close()
+
 	if len(sensorGroupAssignmentResponse.Items) != 1 {
 		resp.Diagnostics.AddError(errorSummary, "Could not find specified data source")
 		resp.State.RemoveResource(ctx)
+
 		return
 	}
 
@@ -139,6 +142,7 @@ func (d *sensorGroupAssignmentDataSource) Configure(
 			"Unexpected Data Source Configure Type",
 			"Data Source type: Sensor Group Assignment. Please report this issue to the provider developers.",
 		)
+
 		return
 	}
 

internal/provider/resources/data_source_service.go

@@ -116,17 +116,20 @@ func (d *serviceTestDataSource) Read(
 
 	serviceTestResponse, response, err := util.RetryForTooManyRequests(request.Execute)
 	errorPresent, errorDetail := util.RaiseForStatus(response, err)
-
 	errorSummary := util.GenerateErrorSummary("read", "uxi_service_test")
 
 	if errorPresent {
 		resp.Diagnostics.AddError(errorSummary, errorDetail)
+
 		return
 	}
 
+	defer response.Body.Close()
+
 	if len(serviceTestResponse.Items) != 1 {
 		resp.Diagnostics.AddError(errorSummary, "Could not find specified data source")
 		resp.State.RemoveResource(ctx)
+
 		return
 	}
 
@@ -162,6 +165,7 @@ func (d *serviceTestDataSource) Configure(
 			"Unexpected Data Source Configure Type",
 			"Data Source type: ServiceTest. Please report this issue to the provider developers.",
 		)
+
 		return
 	}
 

internal/provider/resources/data_source_service_test_group_assignment.go

@@ -99,17 +99,20 @@ func (d *serviceTestGroupAssignmentDataSource) Read(
 		request.Execute,
 	)
 	errorPresent, errorDetail := util.RaiseForStatus(response, err)
-
 	errorSummary := util.GenerateErrorSummary("read", "uxi_service_test_group_assignment")
 
 	if errorPresent {
 		resp.Diagnostics.AddError(errorSummary, errorDetail)
+
 		return
 	}
 
+	defer response.Body.Close()
+
 	if len(serviceTestGroupAssignmentResponse.Items) != 1 {
 		resp.Diagnostics.AddError(errorSummary, "Could not find specified data source")
 		resp.State.RemoveResource(ctx)
+
 		return
 	}
 
@@ -141,6 +144,7 @@ func (d *serviceTestGroupAssignmentDataSource) Configure(
 			"Unexpected Data Source Configure Type",
 			"Data Source type: ServiceTest Group Assignment. Please report this issue to the provider developers.",
 		)
+
 		return
 	}
 

internal/provider/resources/data_source_wired_network.go

@@ -127,17 +127,20 @@ func (d *wiredNetworkDataSource) Read(
 		Id(state.Filter.ID)
 	networkResponse, response, err := util.RetryForTooManyRequests(request.Execute)
 	errorPresent, errorDetail := util.RaiseForStatus(response, err)
-
 	errorSummary := util.GenerateErrorSummary("read", "uxi_wired_network")
 
 	if errorPresent {
 		resp.Diagnostics.AddError(errorSummary, errorDetail)
+
 		return
 	}
 
+	defer response.Body.Close()
+
 	if len(networkResponse.Items) != 1 {
 		resp.Diagnostics.AddError(errorSummary, "Could not find specified data source")
 		resp.State.RemoveResource(ctx)
+
 		return
 	}
 
@@ -175,6 +178,7 @@ func (d *wiredNetworkDataSource) Configure(
 			"Unexpected Data Source Configure Type",
 			"Data Source type: Wired Network. Please report this issue to the provider developers.",
 		)
+
 		return
 	}
 

internal/provider/resources/data_source_wireless_network.go

@@ -137,17 +137,20 @@ func (d *wirelessNetworkDataSource) Read(
 		Id(state.Filter.ID)
 	networkResponse, response, err := util.RetryForTooManyRequests(request.Execute)
 	errorPresent, errorDetail := util.RaiseForStatus(response, err)
-
 	errorSummary := util.GenerateErrorSummary("read", "uxi_wireless_network")
 
 	if errorPresent {
 		resp.Diagnostics.AddError(errorSummary, errorDetail)
+
 		return
 	}
 
+	defer response.Body.Close()
+
 	if len(networkResponse.Items) != 1 {
 		resp.Diagnostics.AddError(errorSummary, "Could not find specified data source")
 		resp.State.RemoveResource(ctx)
+
 		return
 	}
 
@@ -187,6 +190,7 @@ func (d *wirelessNetworkDataSource) Configure(
 			"Unexpected Data Source Configure Type",
 			"Data Source type: Wireless Network. Please report this issue to the provider developers.",
 		)
+
 		return
 	}