fix(cdn) linting issues

Author: cgoetz-inovex

internal/cmd/beta/cdn/distribution/create/create.go

@@ -28,7 +28,7 @@ const (
 	flagHTTPOriginRequestHeaders     = "http-origin-request-headers"
 	flagBucket                       = "bucket"
 	flagBucketURL                    = "bucket-url"
-	flagBucketCredentialsAccessKeyID = "bucket-credentials-access-key-id"
+	flagBucketCredentialsAccessKeyID = "bucket-credentials-access-key-id" //nolint:gosec // linter false positive
 	flagBucketRegion                 = "bucket-region"
 	flagBlockedCountries             = "blocked-countries"
 	flagBlockedIPs                   = "blocked-ips"
@@ -91,7 +91,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 --regions AF,EU`,
 			),
 		),
-		PreRun: func(cmd *cobra.Command, args []string) {
+		PreRun: func(cmd *cobra.Command, _ []string) {
 			// either flagHTTP or flagBucket must be set, depending on which we mark other flags as required
 			if flags.FlagToBoolValue(params.Printer, cmd, flagHTTP) {
 				err := cmd.MarkFlagRequired(flagHTTPOriginURL)
@@ -265,7 +265,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 	return &model, nil
 }
 
-func parseGeofencing(p *print.Printer, geofencingInput []string) *map[string][]string {
+func parseGeofencing(p *print.Printer, geofencingInput []string) *map[string][]string { //nolint:gocritic // ptrToRefParam is nice here because of awkward SDK API
 	geofencing := make(map[string][]string)
 	for _, in := range geofencingInput {
 		firstSpace := strings.IndexRune(in, ' ')
@@ -285,7 +285,7 @@ func parseGeofencing(p *print.Printer, geofencingInput []string) *map[string][]s
 	return &geofencing
 }
 
-func parseOriginRequestHeaders(p *print.Printer, originRequestHeadersInput []string) *map[string]string {
+func parseOriginRequestHeaders(p *print.Printer, originRequestHeadersInput []string) *map[string]string { //nolint:gocritic // ptrToRefParam is nice here because of awkward SDK API
 	originRequestHeaders := make(map[string]string)
 	for _, in := range originRequestHeadersInput {
 		parts := strings.Split(in, ":")
@@ -358,7 +358,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *cdn.APIClie
 	return req.CreateDistributionPayload(*payload)
 }
 
-func outputResult(p *print.Printer, outputFormat string, projectLabel string, resp *cdn.CreateDistributionResponse) error {
+func outputResult(p *print.Printer, outputFormat, projectLabel string, resp *cdn.CreateDistributionResponse) error {
 	if resp == nil {
 		return fmt.Errorf("create distribution response is nil")
 	}

internal/cmd/beta/cdn/distribution/describe/describe_test.go

@@ -299,16 +299,16 @@ func TestOutputResult(t *testing.T) {
 				func(r *cdn.GetDistributionResponse) {
 					r.Distribution.Waf = &cdn.DistributionWaf{
 						EnabledRules: &[]cdn.WafStatusRuleBlock{
-							{utils.Ptr("rule-id-1")},
-							{utils.Ptr("rule-id-2")},
+							{Id: utils.Ptr("rule-id-1")},
+							{Id: utils.Ptr("rule-id-2")},
 						},
 						DisabledRules: &[]cdn.WafStatusRuleBlock{
-							{utils.Ptr("rule-id-3")},
-							{utils.Ptr("rule-id-4")},
+							{Id: utils.Ptr("rule-id-3")},
+							{Id: utils.Ptr("rule-id-4")},
 						},
 						LogOnlyRules: &[]cdn.WafStatusRuleBlock{
-							{utils.Ptr("rule-id-5")},
-							{utils.Ptr("rule-id-6")},
+							{Id: utils.Ptr("rule-id-5")},
+							{Id: utils.Ptr("rule-id-6")},
 						},
 					}
 					r.Distribution.Config.Backend = &cdn.ConfigBackend{

internal/cmd/beta/cdn/distribution/update/update.go

@@ -29,7 +29,7 @@ const (
 	flagHTTPOriginRequestHeaders     = "http-origin-request-headers"
 	flagBucket                       = "bucket"
 	flagBucketURL                    = "bucket-url"
-	flagBucketCredentialsAccessKeyID = "bucket-credentials-access-key-id"
+	flagBucketCredentialsAccessKeyID = "bucket-credentials-access-key-id" //nolint:gosec // linter false positive
 	flagBucketRegion                 = "bucket-region"
 	flagBlockedCountries             = "blocked-countries"
 	flagBlockedIPs                   = "blocked-ips"
@@ -248,7 +248,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, args []string) (*inputMode
 }
 
 // TODO both parseGeofencing and parseOriginRequestHeaders copied from create.go, move to another package and make public?
-func parseGeofencing(p *print.Printer, geofencingInput []string) *map[string][]string {
+func parseGeofencing(p *print.Printer, geofencingInput []string) *map[string][]string { //nolint:gocritic // convenient for setting the SDK payload
 	geofencing := make(map[string][]string)
 	for _, in := range geofencingInput {
 		firstSpace := strings.IndexRune(in, ' ')
@@ -268,7 +268,7 @@ func parseGeofencing(p *print.Printer, geofencingInput []string) *map[string][]s
 	return &geofencing
 }
 
-func parseOriginRequestHeaders(p *print.Printer, originRequestHeadersInput []string) *map[string]string {
+func parseOriginRequestHeaders(p *print.Printer, originRequestHeadersInput []string) *map[string]string { //nolint:gocritic // convenient for setting the SDK payload
 	originRequestHeaders := make(map[string]string)
 	for _, in := range originRequestHeadersInput {
 		parts := strings.Split(in, ":")
@@ -361,7 +361,7 @@ func buildRequest(ctx context.Context, apiClient *cdn.APIClient, model *inputMod
 	return req
 }
 
-func outputResult(p *print.Printer, outputFormat string, projectLabel string, resp *cdn.PatchDistributionResponse) error {
+func outputResult(p *print.Printer, outputFormat, projectLabel string, resp *cdn.PatchDistributionResponse) error {
 	if resp == nil {
 		return fmt.Errorf("update distribution response is empty")
 	}

internal/cmd/beta/cdn/distribution/update/update_test.go

@@ -362,5 +362,4 @@ func TestOutputResult(t *testing.T) {
 			}
 		})
 	}
-
 }