Pin golangci-lint to v2.4.0 (#754)

Author: philippschulte

.github/workflows/pr_test.yml

@@ -1,4 +1,4 @@
-on: 
+on:
   pull_request:
     types:
       - opened
@@ -14,7 +14,7 @@ jobs:
     if: github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     steps:
-    - uses: dangoslen/changelog-enforcer@v3
+      - uses: dangoslen/changelog-enforcer@v3
   golangci:
     name: lint
     runs-on: ubuntu-latest
@@ -26,20 +26,20 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v8
         with:
-          version: v2.1
+          version: v2.4.0
   test:
     strategy:
       matrix:
         go-version: [1.24.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v5
-    - name: Install Go
-      uses: actions/setup-go@v6
-      with:
-        go-version: ${{ matrix.go-version }}
-    - name: Test
-      run: make test
-      shell: bash
+      - name: Checkout code
+        uses: actions/checkout@v5
+      - name: Install Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Test
+        run: make test
+        shell: bash

CHANGELOG.md

@@ -5,13 +5,18 @@
 [Full Changelog](https://github.com/fastly/go-fastly/compare/v11.2.0...)
 
 ### Breaking:
-- breaking(ngwaf/rules): group and multival conditions no longer accept a 'type' field
+
+- breaking(ngwaf/rules): group and multival conditions no longer accept a 'type' field ([#755](https://github.com/fastly/go-fastly/pull/755))
+- breaking(ngwaf): rename package `common` to `scope` and `ScopeType` to just `Type` ([#754](https://github.com/fastly/go-fastly/pull/754))
 
 ### Enhancements:
+
 - feat(ngwaf/rules): add support for the multival condition type ([#755](https://github.com/fastly/go-fastly/pull/755))
+
 ### Bug fixes:
 
 ### Dependencies:
+
 - build(deps): `golang.org/x/crypto` from 0.41.0 to 0.42.0 ([#751](https://github.com/fastly/go-fastly/pull/751))
 - build(deps): `golang.org/x/sys` from 0.35.0 to 0.36.0 ([#751](https://github.com/fastly/go-fastly/pull/751))
 - build(deps): `actions/setup-go` from 5 to 6 ([#752](https://github.com/fastly/go-fastly/pull/752))
@@ -21,9 +26,11 @@
 [Full Changelog](https://github.com/fastly/go-fastly/compare/v11.3.0...v11.3.1)
 
 ### Bug fixes:
+
 - fix(logging): Add CompressionCodec and GZipLevel to HTTPS update struct
 
 ### Dependencies:
+
 - build(deps): `golang.org/x/crypto` from 0.40.0 to 0.41.0 ([#740](https://github.com/fastly/go-fastly/pull/740))
 - build(deps): `golang.org/x/sys` from 0.34.0 to 0.35.0 ([#740](https://github.com/fastly/go-fastly/pull/740))
 - build(deps): `github.com/stretchr/testify` from 1.10.0 to 1.11.0 ([#742](https://github.com/fastly/go-fastly/pull/742))

fastly/ngwaf/v1/lists/api_create.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/fastly/go-fastly/v11/fastly"
-	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/common"
+	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/scope"
 )
 
 // CreateInput specifies the information needed for the Create()
@@ -20,7 +20,7 @@ type CreateInput struct {
 	Name *string `json:"name"`
 	// Scope defines where the list is located, including its type (e.g.,
 	// "workspace" or "account") and the specific IDs it applies to (required).
-	Scope *common.Scope `json:"-"`
+	Scope *scope.Scope `json:"-"`
 	// Type is the type of the list. Must be one of `string` |
 	// `wildcard` | `ip` | `country` | `signal` (required).
 	Type *string `json:"type"`
@@ -41,7 +41,7 @@ func Create(ctx context.Context, c *fastly.Client, i *CreateInput) (*List, error
 		return nil, fastly.ErrMissingScope
 	}
 
-	path, err := common.BuildPath(i.Scope, "lists", "")
+	path, err := scope.BuildPath(i.Scope, "lists", "")
 	if err != nil {
 		return nil, fmt.Errorf("failed to build API path: %w", err)
 	}

fastly/ngwaf/v1/lists/api_delete.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	"github.com/fastly/go-fastly/v11/fastly"
-	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/common"
+	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/scope"
 )
 
 // DeleteInput specifies the information needed for the Delete()
@@ -16,7 +16,7 @@ type DeleteInput struct {
 	ListID *string
 	// Scope defines where the list is applied, including its type (e.g.,
 	// "workspace" or "account") and the specific IDs it applies to (required).
-	Scope *common.Scope
+	Scope *scope.Scope
 }
 
 // Delete deletes the specified list.
@@ -28,7 +28,7 @@ func Delete(ctx context.Context, c *fastly.Client, i *DeleteInput) error {
 		return fastly.ErrMissingScope
 	}
 
-	path, err := common.BuildPath(i.Scope, "lists", *i.ListID)
+	path, err := scope.BuildPath(i.Scope, "lists", *i.ListID)
 	if err != nil {
 		return fmt.Errorf("failed to build API path: %w", err)
 	}

fastly/ngwaf/v1/lists/api_get.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/fastly/go-fastly/v11/fastly"
-	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/common"
+	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/scope"
 )
 
 // GetInput specifies the information needed for the Get() function to
@@ -16,7 +16,7 @@ type GetInput struct {
 	ListID *string
 	// Scope defines where the list is applied, including its type (e.g.,
 	// "workspace" or "account") and the specific IDs it applies to (required).
-	Scope *common.Scope
+	Scope *scope.Scope
 }
 
 // Get retrieves the specified list.
@@ -28,7 +28,7 @@ func Get(ctx context.Context, c *fastly.Client, i *GetInput) (*List, error) {
 		return nil, fastly.ErrMissingScope
 	}
 
-	path, err := common.BuildPath(i.Scope, "lists", *i.ListID)
+	path, err := scope.BuildPath(i.Scope, "lists", *i.ListID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to build API path: %w", err)
 	}

fastly/ngwaf/v1/lists/api_list.go

@@ -6,15 +6,15 @@ import (
 	"fmt"
 
 	"github.com/fastly/go-fastly/v11/fastly"
-	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/common"
+	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/scope"
 )
 
 // ListInput specifies the information needed for the List() function to perform
 // the operation.
 type ListInput struct {
 	// Scope defines where the list is located, including its type (e.g.,
 	// "workspace" or "account") and the specific IDs it applies to (required).
-	Scope *common.Scope
+	Scope *scope.Scope
 }
 
 // ListLists retrieves a list of lists for the given workspace.
@@ -23,7 +23,7 @@ func ListLists(ctx context.Context, c *fastly.Client, i *ListInput) (*Lists, err
 		return nil, fastly.ErrMissingScope
 	}
 
-	path, err := common.BuildPath(i.Scope, "lists", "")
+	path, err := scope.BuildPath(i.Scope, "lists", "")
 	if err != nil {
 		return nil, fmt.Errorf("failed to build API path: %w", err)
 	}

fastly/ngwaf/v1/lists/api_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/fastly/go-fastly/v11/fastly"
-	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/common"
+	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/scope"
 )
 
 const (
@@ -20,14 +20,14 @@ const (
 )
 
 func TestClient_Lists_WorkspaceScope(t *testing.T) {
-	runListsTest(t, common.ScopeTypeWorkspace, fastly.TestNGWAFWorkspaceID)
+	runListsTest(t, scope.ScopeTypeWorkspace, fastly.TestNGWAFWorkspaceID)
 }
 
 func TestClient_Lists_AccountScope(t *testing.T) {
-	runListsTest(t, common.ScopeTypeAccount, "*") // assuming TestNGWAFAccountID exists
+	runListsTest(t, scope.ScopeTypeAccount, "*") // assuming TestNGWAFAccountID exists
 }
 
-func runListsTest(t *testing.T, scopeType common.ScopeType, appliesToID string) {
+func runListsTest(t *testing.T, scopeType scope.Type, appliesToID string) {
 	var err error
 	listEntries := []string{listEntry}
 	testListName := listName + string(scopeType)
@@ -40,7 +40,7 @@ func runListsTest(t *testing.T, scopeType common.ScopeType, appliesToID string)
 			Description: fastly.ToPointer(listDescription),
 			Entries:     fastly.ToPointer(listEntries),
 			Name:        fastly.ToPointer(testListName),
-			Scope: &common.Scope{
+			Scope: &scope.Scope{
 				Type:      scopeType,
 				AppliesTo: []string{appliesToID},
 			},
@@ -77,7 +77,7 @@ func runListsTest(t *testing.T, scopeType common.ScopeType, appliesToID string)
 		fastly.Record(t, fmt.Sprintf("%s_delete_list", scopeType), func(c *fastly.Client) {
 			err = Delete(context.TODO(), c, &DeleteInput{
 				ListID: fastly.ToPointer(list.ListID),
-				Scope: &common.Scope{
+				Scope: &scope.Scope{
 					Type:      scopeType,
 					AppliesTo: []string{appliesToID},
 				},
@@ -93,7 +93,7 @@ func runListsTest(t *testing.T, scopeType common.ScopeType, appliesToID string)
 	fastly.Record(t, fmt.Sprintf("%s_get_list", scopeType), func(c *fastly.Client) {
 		getList, err = Get(context.TODO(), c, &GetInput{
 			ListID: fastly.ToPointer(list.ListID),
-			Scope: &common.Scope{
+			Scope: &scope.Scope{
 				Type:      scopeType,
 				AppliesTo: []string{appliesToID},
 			},
@@ -136,7 +136,7 @@ func runListsTest(t *testing.T, scopeType common.ScopeType, appliesToID string)
 			Description: fastly.ToPointer(updateListDescription),
 			Entries:     fastly.ToPointer(updateListEntries),
 			ListID:      fastly.ToPointer(list.ListID),
-			Scope: &common.Scope{
+			Scope: &scope.Scope{
 				Type:      scopeType,
 				AppliesTo: []string{appliesToID},
 			},
@@ -172,7 +172,7 @@ func runListsTest(t *testing.T, scopeType common.ScopeType, appliesToID string)
 	// List all lists.
 	fastly.Record(t, fmt.Sprintf("%s_list_lists", scopeType), func(c *fastly.Client) {
 		lists, err = ListLists(context.TODO(), c, &ListInput{
-			Scope: &common.Scope{
+			Scope: &scope.Scope{
 				Type:      scopeType,
 				AppliesTo: []string{appliesToID},
 			},

fastly/ngwaf/v1/lists/api_update.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/fastly/go-fastly/v11/fastly"
-	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/common"
+	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/scope"
 )
 
 // UpdateInput specifies the information needed for the Update()
@@ -20,7 +20,7 @@ type UpdateInput struct {
 	ListID *string
 	// Scope defines where the list is located, including its type (e.g.,
 	// "workspace" or "account") and the specific IDs it applies to (required).
-	Scope *common.Scope
+	Scope *scope.Scope
 }
 
 // Update updates the specified list.
@@ -29,7 +29,7 @@ func Update(ctx context.Context, c *fastly.Client, i *UpdateInput) (*List, error
 		return nil, fastly.ErrMissingListID
 	}
 
-	path, err := common.BuildPath(i.Scope, "lists", *i.ListID)
+	path, err := scope.BuildPath(i.Scope, "lists", *i.ListID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to build API path: %w", err)
 	}

fastly/ngwaf/v1/rules/api_create.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/fastly/go-fastly/v11/fastly"
-	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/common"
+	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/scope"
 )
 
 // CreateInput specifies the information needed for the Create()
@@ -46,7 +46,7 @@ type CreateInput struct {
 	// Scope defines where the rule is applied, including its type
 	// (e.g., "workspace" or "account") and the specific IDs it
 	// applies to (required).
-	Scope *common.Scope
+	Scope *scope.Scope
 	// Type specifies the category of the rule (e.g., "request")
 	// (required).
 	Type *string
@@ -253,7 +253,7 @@ func Create(ctx context.Context, c *fastly.Client, i *CreateInput) (*Rule, error
 		GroupOperator  *string          `json:"group_operator,omitempty"`
 		RateLimit      *CreateRateLimit `json:"rate_limit,omitempty"`
 		RequestLogging *string          `json:"request_logging,omitempty"`
-		Scope          *common.Scope    `json:"scope"`
+		Scope          *scope.Scope     `json:"scope"`
 		Type           *string          `json:"type"`
 	}{
 		Actions:        i.Actions,
@@ -268,7 +268,7 @@ func Create(ctx context.Context, c *fastly.Client, i *CreateInput) (*Rule, error
 		Type:           i.Type,
 	}
 
-	path, err := common.BuildPath(i.Scope, "rules", "")
+	path, err := scope.BuildPath(i.Scope, "rules", "")
 	if err != nil {
 		return nil, fmt.Errorf("failed to build API path: %w", err)
 	}

fastly/ngwaf/v1/rules/api_delete.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	"github.com/fastly/go-fastly/v11/fastly"
-	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/common"
+	"github.com/fastly/go-fastly/v11/fastly/ngwaf/v1/scope"
 )
 
 // DeleteInput specifies the information needed for the Delete()
@@ -17,7 +17,7 @@ type DeleteInput struct {
 	// Scope defines where the rule is applied, including its
 	// type (e.g., "workspace" or "account") and the specific
 	// IDs it applies to (required).
-	Scope *common.Scope
+	Scope *scope.Scope
 }
 
 // Delete deletes the specified rule.
@@ -29,7 +29,7 @@ func Delete(ctx context.Context, c *fastly.Client, i *DeleteInput) error {
 		return fastly.ErrMissingScope
 	}
 
-	path, err := common.BuildPath(i.Scope, "rules", *i.RuleID)
+	path, err := scope.BuildPath(i.Scope, "rules", *i.RuleID)
 	if err != nil {
 		return fmt.Errorf("failed to build API path: %w", err)
 	}