CLEANUP/MEDIUM: lint: upgrade linter and fix linting errors

Author: mjuraga

cmd/gitlab-mr-checker/main.go

@@ -221,18 +221,18 @@ func startThreadOnMergeRequest(baseURL, token, projectID string, mergeRequestIID
 		os.Exit(1)
 	}
 
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodPost,
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodPost, //nolint:gosec // URL constructed from trusted CI environment variables
 		fmt.Sprintf("%s/projects/%s/merge_requests/%d/discussions", baseURL, url.PathEscape(projectID), mergeRequestIID), bytes.NewBuffer(threadDataBytes))
 	if err != nil {
-		slog.Error(err.Error())
+		slog.Error(err.Error()) //nolint:gosec // log message from trusted CI environment variables
 		os.Exit(1)
 	}
 	req.Header.Add("PRIVATE-TOKEN", token) //nolint:canonicalheader
 	req.Header.Add("Content-Type", "application/json")
 
-	resp, err := client.Do(req)
+	resp, err := client.Do(req) //nolint:gosec // URL constructed from trusted CI environment variables
 	if err != nil {
-		slog.Error(err.Error())
+		slog.Error(err.Error()) //nolint:gosec // log message from trusted CI environment variables
 		os.Exit(1)
 	}
 	defer resp.Body.Close()
@@ -241,14 +241,14 @@ func startThreadOnMergeRequest(baseURL, token, projectID string, mergeRequestIID
 func getMergeRequest(baseURL, token, projectID string, mergeRequestIID int) (*MergeRequest, error) {
 	client := &http.Client{}
 
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet,
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, //nolint:gosec // URL constructed from trusted CI environment variables
 		fmt.Sprintf("%s/projects/%s/merge_requests/%d", baseURL, url.PathEscape(projectID), mergeRequestIID), nil)
 	if err != nil {
 		return nil, err
 	}
 	req.Header.Add("PRIVATE-TOKEN", token) //nolint:canonicalheader
 
-	resp, err := client.Do(req)
+	resp, err := client.Do(req) //nolint:gosec // URL constructed from trusted CI environment variables
 	if err != nil {
 		return nil, err
 	}
@@ -276,14 +276,14 @@ func getMergeRequest(baseURL, token, projectID string, mergeRequestIID int) (*Me
 func getMergeRequestComments(baseURL, token, projectID string, mergeRequestIID int) ([]Note, error) {
 	client := &http.Client{}
 
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet,
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, //nolint:gosec // URL constructed from trusted CI environment variables
 		fmt.Sprintf("%s/projects/%s/merge_requests/%d/notes", baseURL, url.PathEscape(projectID), mergeRequestIID), nil)
 	if err != nil {
 		return nil, err
 	}
 	req.Header.Add("PRIVATE-TOKEN", token) //nolint:canonicalheader
 
-	resp, err := client.Do(req)
+	resp, err := client.Do(req) //nolint:gosec // URL constructed from trusted CI environment variables
 	if err != nil {
 		return nil, err
 	}
@@ -309,13 +309,13 @@ func getProjectlabels(backportLabels map[string]struct{}, projectID string) erro
 	if token == "" {
 		return errors.New("GITLAB_TOKEN not set")
 	}
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet,
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, //nolint:gosec // URL constructed from trusted CI environment variables
 		fmt.Sprintf("%s/projects/%s/labels", baseURL, url.PathEscape(projectID)), nil)
 	if err != nil {
 		return fmt.Errorf("failed to create request: %w", err)
 	}
 	req.Header.Add("PRIVATE-TOKEN", token) //nolint:canonicalheader
-	resp, err := client.Do(req)
+	resp, err := client.Do(req)            //nolint:gosec // URL constructed from trusted CI environment variables
 	if err != nil {
 		return fmt.Errorf("failed to get project labels: %w", err)
 	}
@@ -353,14 +353,14 @@ func getProjectlabels(backportLabels map[string]struct{}, projectID string) erro
 		if err != nil {
 			return fmt.Errorf("failed to marshal label data: %w", err)
 		}
-		req, err := http.NewRequestWithContext(context.Background(), http.MethodPost,
+		req, err := http.NewRequestWithContext(context.Background(), http.MethodPost, //nolint:gosec // URL constructed from trusted CI environment variables
 			fmt.Sprintf("%s/projects/%s/labels", baseURL, url.PathEscape(projectID)), bytes.NewBuffer(labelDataBytes))
 		if err != nil {
 			return fmt.Errorf("failed to create request to create label: %w", err)
 		}
 		req.Header.Add("PRIVATE-TOKEN", token) //nolint:canonicalheader
 		req.Header.Add("Content-Type", "application/json")
-		resp, err := client.Do(req)
+		resp, err := client.Do(req) //nolint:gosec // URL constructed from trusted CI environment variables
 		if err != nil {
 			return fmt.Errorf("failed to create label %s: %w", label, err)
 		}
@@ -387,13 +387,13 @@ func GetBranches() ([]string, error) {
 	nextPageURL := fmt.Sprintf("%s/projects/%s/repository/branches", baseURL, url.PathEscape(projectID))
 
 	for nextPageURL != "" {
-		req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, nextPageURL, nil)
+		req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, nextPageURL, nil) //nolint:gosec // URL constructed from trusted CI environment variables
 		if err != nil {
 			return nil, fmt.Errorf("failed to create request: %w", err)
 		}
 		req.Header.Add("PRIVATE-TOKEN", token) //nolint:canonicalheader
 
-		resp, err := client.Do(req)
+		resp, err := client.Do(req) //nolint:gosec // URL constructed from trusted CI environment variables
 		if err != nil {
 			return nil, fmt.Errorf("failed to get branches: %w", err)
 		}

cmd/gitlab-mr-pipelines/main.go

@@ -96,14 +96,14 @@ func getOldMergeRequestPipelines(apiURL, projectID, mrIID, token string) ([]pipe
 	}
 
 	url := fmt.Sprintf("%s/projects/%s/merge_requests/%s/pipelines", apiURL, projectID, mrIID)
-	req, err := http.NewRequest("GET", url, nil) //nolint:noctx,usestdlibvars
+	req, err := http.NewRequest("GET", url, nil) //nolint:noctx,usestdlibvars,gosec // URL constructed from trusted CI environment variables
 	if err != nil {
 		return nil, err
 	}
 	req.Header.Set("PRIVATE-TOKEN", token) //nolint:canonicalheader
 
 	client := &http.Client{}
-	resp, err := client.Do(req)
+	resp, err := client.Do(req) //nolint:gosec // URL constructed from trusted CI environment variables
 	if err != nil {
 		return nil, err
 	}
@@ -132,14 +132,14 @@ func getOldMergeRequestPipelines(apiURL, projectID, mrIID, token string) ([]pipe
 
 func cancelPipeline(apiURL, projectID string, pipelineID int, token string) error {
 	url := fmt.Sprintf("%s/projects/%s/pipelines/%d/cancel", apiURL, projectID, pipelineID)
-	req, err := http.NewRequest("POST", url, nil) //nolint:noctx,usestdlibvars
+	req, err := http.NewRequest("POST", url, nil) //nolint:noctx,usestdlibvars,gosec // URL constructed from trusted CI environment variables
 	if err != nil {
 		return err
 	}
 	req.Header.Set("PRIVATE-TOKEN", token) //nolint:canonicalheader
 
 	client := &http.Client{}
-	resp, err := client.Do(req)
+	resp, err := client.Do(req) //nolint:gosec // URL constructed from trusted CI environment variables
 	if err != nil {
 		return err
 	}

cmd/govulncheck-report/main.go

@@ -70,7 +70,7 @@ func main() {
 		}
 		currentBranch = string(out)
 	}
-	slog.Info("Current branch: " + currentBranch)
+	slog.Info("Current branch: " + currentBranch) //nolint:gosec // log message from trusted CI environment variables
 
 	cmd := exec.Command("govulncheck", "./...")
 	out, _ := cmd.Output()
@@ -135,7 +135,7 @@ func main() {
 }
 
 func createIssue(baseURL, token, projectID string, title, commentBody string) {
-	slog.Info("Active issue with title '" + title + "' not found in project " + projectID)
+	slog.Info("Active issue with title '" + title + "' not found in project " + projectID) //nolint:gosec // log message from trusted CI environment variables
 	// Create the issue here
 	issueData := map[string]any{
 		"title":       title,

configuration/dataplane_storage.go

@@ -51,22 +51,22 @@ func (c *Configuration) SaveClusterModeData() error {
 	cfgCertificateFetched := cfgCluster.CertificateFetched.Load()
 
 	dapiStorageCluster := storagetype.Cluster{
-		APINodesPath:       misc.StringP(cfgCluster.APINodesPath.Load()),
-		Token:              misc.StringP(cfgCluster.Token.Load()),
+		APINodesPath:       new(cfgCluster.APINodesPath.Load()),
+		Token:              new(cfgCluster.Token.Load()),
 		ClusterTLSCertDir:  &c.HAProxy.ClusterTLSCertDir,
-		ActiveBootstrapKey: misc.StringP(cfgCluster.ActiveBootstrapKey.Load()),
-		APIRegisterPath:    misc.StringP(cfgCluster.APIRegisterPath.Load()),
-		URL:                misc.StringP(cfgCluster.URL.Load()),
+		ActiveBootstrapKey: new(cfgCluster.ActiveBootstrapKey.Load()),
+		APIRegisterPath:    new(cfgCluster.APIRegisterPath.Load()),
+		URL:                new(cfgCluster.URL.Load()),
 		Port:               &dPort,
-		StorageDir:         misc.StringP(cfgCluster.StorageDir.Load()),
-		BootstrapKey:       misc.StringP(cfgCluster.BootstrapKey.Load()),
-		ID:                 misc.StringP(cfgCluster.ID.Load()),
-		APIBasePath:        misc.StringP(cfgCluster.APIBasePath.Load()),
-		CertificateDir:     misc.StringP(cfgCluster.CertificateDir.Load()),
+		StorageDir:         new(cfgCluster.StorageDir.Load()),
+		BootstrapKey:       new(cfgCluster.BootstrapKey.Load()),
+		ID:                 new(cfgCluster.ID.Load()),
+		APIBasePath:        new(cfgCluster.APIBasePath.Load()),
+		CertificateDir:     new(cfgCluster.CertificateDir.Load()),
 		CertificateFetched: &cfgCertificateFetched,
-		Name:               misc.StringP(cfgCluster.Name.Load()),
-		Description:        misc.StringP(cfgCluster.Description.Load()),
-		ClusterID:          misc.StringP(cfgCluster.ClusterID.Load()),
+		Name:               new(cfgCluster.Name.Load()),
+		Description:        new(cfgCluster.Description.Load()),
+		ClusterID:          new(cfgCluster.ClusterID.Load()),
 		ClusterLogTargets:  cfgCluster.ClusterLogTargets,
 	}
 	cfgStatus := c.Status.Load()

discovery/aws_service_discovery_instance.go

@@ -31,7 +31,6 @@ import (
 
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/log"
-	"github.com/haproxytech/dataplaneapi/misc"
 )
 
 const (
@@ -94,7 +93,7 @@ func (a awsService) GetServers() (servers []configuration.ServiceServer) {
 		var port *int64
 
 		if parsedPort > 0 {
-			port = misc.Int64P(parsedPort)
+			port = new(int64(parsedPort))
 		}
 
 		servers = append(servers, configuration.ServiceServer{

discovery/consul_service_discovery_instance.go

@@ -29,7 +29,6 @@ import (
 	"github.com/haproxytech/client-native/v6/models"
 
 	"github.com/haproxytech/dataplaneapi/log"
-	"github.com/haproxytech/dataplaneapi/misc"
 	jsoniter "github.com/json-iterator/go"
 )
 
@@ -184,15 +183,15 @@ func (c *consulInstance) convertToServers(nodes []*serviceEntry) []configuration
 				Address: node.Service.Address,
 			}
 			if node.Service.Port > 0 {
-				ss.Port = misc.Int64P(node.Service.Port)
+				ss.Port = new(int64(node.Service.Port))
 			}
 			servers = append(servers, ss)
 		} else {
 			ss := configuration.ServiceServer{
 				Address: node.Node.Address,
 			}
 			if node.Service.Port > 0 {
-				ss.Port = misc.Int64P(node.Service.Port)
+				ss.Port = new(int64(node.Service.Port))
 			}
 			servers = append(servers, ss)
 		}

discovery/utils.go

@@ -21,7 +21,6 @@ import (
 	"github.com/go-openapi/strfmt"
 	"github.com/google/uuid"
 	"github.com/haproxytech/client-native/v6/models"
-	"github.com/haproxytech/dataplaneapi/misc"
 )
 
 const (
@@ -42,10 +41,10 @@ func ValidateAWSData(data *models.AwsRegion, useValidation bool) error {
 		return err
 	}
 	if data.ServerSlotsBase == nil || *data.ServerSlotsBase < minimumServerSlotsBase {
-		data.ServerSlotsBase = misc.Int64P(10)
+		data.ServerSlotsBase = new(int64(10))
 	}
 	if data.ServerSlotsGrowthType == nil {
-		data.ServerSlotsGrowthType = misc.StringP(models.AwsRegionServerSlotsGrowthTypeExponential)
+		data.ServerSlotsGrowthType = new(models.AwsRegionServerSlotsGrowthTypeExponential)
 	}
 	if *data.ServerSlotsGrowthType == models.AwsRegionServerSlotsGrowthTypeLinear && (data.ServerSlotsGrowthIncrement == 0 || data.ServerSlotsGrowthIncrement < minimumServerSlotsBase) {
 		data.ServerSlotsGrowthIncrement = minimumServerSlotsBase
@@ -67,10 +66,10 @@ func ValidateConsulData(data *models.Consul, useValidation bool) error {
 		return err
 	}
 	if data.ServerSlotsBase == nil || *data.ServerSlotsBase < minimumServerSlotsBase {
-		data.ServerSlotsBase = misc.Int64P(minimumServerSlotsBase)
+		data.ServerSlotsBase = new(int64(minimumServerSlotsBase))
 	}
 	if data.ServerSlotsGrowthType == nil {
-		data.ServerSlotsGrowthType = misc.StringP(models.ConsulServerSlotsGrowthTypeLinear)
+		data.ServerSlotsGrowthType = new(models.ConsulServerSlotsGrowthTypeLinear)
 	}
 	if *data.ServerSlotsGrowthType == models.ConsulServerSlotsGrowthTypeLinear && (data.ServerSlotsGrowthIncrement == 0 || data.ServerSlotsGrowthIncrement < minimumServerSlotsBase) {
 		data.ServerSlotsGrowthIncrement = minimumServerSlotsBase

generate/go-generate.go

@@ -116,7 +116,7 @@ type ParseData struct {
 
 func readServerData(filePath string, pd *ParseData, structName string, attName string, groupName string, isList bool) {
 	typeStruct := fmt.Sprintf("type %s struct {", structName)
-	dat, err := os.ReadFile(filePath)
+	dat, err := os.ReadFile(filePath) //nolint:gosec // paths from trusted build tool arguments
 	if err != nil {
 		log.Panic(err)
 	}
@@ -345,7 +345,7 @@ func main() {
 	}
 	tmpl = tmpl.Funcs(funcMap)
 	filePath = path.Join(dir, "configuration", "configuration_generated.go")
-	f, err := os.Create(filePath)
+	f, err := os.Create(filePath) //nolint:gosec // paths from trusted build tool arguments
 	if err != nil {
 		log.Panic(err)
 	}
@@ -363,7 +363,7 @@ func main() {
 	}
 	tmpl = tmpl.Funcs(funcMap)
 	filePath = path.Join(dir, "dataplaneapi_generated.go")
-	f, err = os.Create(filePath)
+	f, err = os.Create(filePath) //nolint:gosec // paths from trusted build tool arguments
 	if err != nil {
 		log.Panic(err)
 	}
@@ -381,7 +381,7 @@ func main() {
 	}
 	tmpl = tmpl.Funcs(funcMap)
 	filePath = path.Join(dir, "configuration/examples/example-full.yaml")
-	f, err = os.Create(filePath)
+	f, err = os.Create(filePath) //nolint:gosec // paths from trusted build tool arguments
 	if err != nil {
 		log.Panic(err)
 	}
@@ -471,7 +471,7 @@ func processLine(line string) (Attribute, error) {
 }
 
 func fmtFile(filename string) {
-	cmd := exec.Command("gofmt", "-s", "-w", filename)
+	cmd := exec.Command("gofmt", "-s", "-w", filename) //nolint:gosec // paths from trusted build tool arguments
 	err := cmd.Run()
 	if err != nil {
 		log.Fatalf("cmd.Run() failed with %s\n", err)

handlers/bind.go

@@ -96,7 +96,7 @@ func (h *CreateBindHandlerImpl) Handle(parentType cnconstants.CnParentType, para
 		return bind.NewCreateBindFrontendDefault(int(*e.Code)).WithPayload(e)
 	}
 
-	pType, pName, err := bindTypeParams(nil, misc.StringP(string(parentType)), &params.ParentName)
+	pType, pName, err := bindTypeParams(nil, new(string(parentType)), &params.ParentName)
 	if err != nil {
 		e := misc.HandleError(err)
 		return bind.NewCreateBindFrontendDefault(int(*e.Code)).WithPayload(e)
@@ -148,7 +148,7 @@ func (h *DeleteBindHandlerImpl) Handle(parentType cnconstants.CnParentType, para
 		return bind.NewDeleteBindFrontendDefault(int(*e.Code)).WithPayload(e)
 	}
 
-	pType, pName, err := bindTypeParams(nil, misc.StringP(string(parentType)), &params.ParentName)
+	pType, pName, err := bindTypeParams(nil, new(string(parentType)), &params.ParentName)
 	if err != nil {
 		e := misc.HandleError(err)
 		return bind.NewDeleteBindFrontendDefault(int(*e.Code)).WithPayload(e)
@@ -186,7 +186,7 @@ func (h *GetBindHandlerImpl) Handle(parentType cnconstants.CnParentType, params
 		return bind.NewGetBindFrontendDefault(int(*e.Code)).WithPayload(e)
 	}
 
-	pType, pName, err := bindTypeParams(nil, misc.StringP(string(parentType)), &params.ParentName)
+	pType, pName, err := bindTypeParams(nil, new(string(parentType)), &params.ParentName)
 	if err != nil {
 		e := misc.HandleError(err)
 		return bind.NewGetBindFrontendDefault(int(*e.Code)).WithPayload(e)
@@ -212,7 +212,7 @@ func (h *GetAllBindHandlerImpl) Handle(parentType cnconstants.CnParentType, para
 		return bind.NewGetAllBindFrontendDefault(int(*e.Code)).WithPayload(e)
 	}
 
-	pType, pName, err := bindTypeParams(nil, misc.StringP(string(parentType)), &params.ParentName)
+	pType, pName, err := bindTypeParams(nil, new(string(parentType)), &params.ParentName)
 	if err != nil {
 		e := misc.HandleError(err)
 		return bind.NewGetAllBindFrontendDefault(int(*e.Code)).WithPayload(e)
@@ -255,7 +255,7 @@ func (h *ReplaceBindHandlerImpl) Handle(parentType cnconstants.CnParentType, par
 		return bind.NewReplaceBindFrontendDefault(int(*e.Code)).WithPayload(e)
 	}
 
-	pType, pName, err := bindTypeParams(nil, misc.StringP(string(parentType)), &params.ParentName)
+	pType, pName, err := bindTypeParams(nil, new(string(parentType)), &params.ParentName)
 	if err != nil {
 		e := misc.HandleError(err)
 		return bind.NewReplaceBindFrontendDefault(int(*e.Code)).WithPayload(e)

handlers/consul.go

@@ -65,8 +65,8 @@ func (c *CreateConsulHandlerImpl) Handle(params service_discovery.CreateConsulPa
 	}
 	if params.Data.HealthCheckPolicy != nil && *params.Data.HealthCheckPolicy == models.ConsulHealthCheckPolicyMin && params.Data.HealthCheckPolicyMin <= 0 {
 		e := &models.Error{
-			Message: misc.StringP("health_check_policy_min is required for 'min' health_check_policy"),
-			Code:    misc.Int64P(int(misc.ErrHTTPBadRequest)),
+			Message: new("health_check_policy_min is required for 'min' health_check_policy"),
+			Code:    new(misc.ErrHTTPBadRequest),
 		}
 		return service_discovery.NewCreateConsulDefault(int(*e.Code)).WithPayload(e)
 	}
@@ -141,8 +141,8 @@ func (c *ReplaceConsulHandlerImpl) Handle(params service_discovery.ReplaceConsul
 	}
 	if params.Data.HealthCheckPolicy != nil && *params.Data.HealthCheckPolicy == models.ConsulHealthCheckPolicyMin && params.Data.HealthCheckPolicyMin <= 0 {
 		e := &models.Error{
-			Message: misc.StringP("health_check_policy_min is required for 'min' health_check_policy"),
-			Code:    misc.Int64P(int(misc.ErrHTTPBadRequest)),
+			Message: new("health_check_policy_min is required for 'min' health_check_policy"),
+			Code:    new(misc.ErrHTTPBadRequest),
 		}
 		return service_discovery.NewCreateConsulDefault(int(*e.Code)).WithPayload(e)
 	}