chore: Use any instead of interface{} (#3584)

Author: alexandear

.golangci.yml

@@ -106,6 +106,7 @@ linters-settings:
       - name: unexported-naming
       - name: unexported-return
       - name: unreachable-code
+      - name: use-any
       - name: var-declaration
       - name: var-naming
 issues:

github/actions_secrets.go

@@ -23,8 +23,8 @@ type PublicKey struct {
 // do not error out when unmarshaling.
 func (p *PublicKey) UnmarshalJSON(data []byte) error {
 	var pk struct {
-		KeyID interface{} `json:"key_id"`
-		Key   *string     `json:"key"`
+		KeyID any     `json:"key_id"`
+		Key   *string `json:"key"`
 	}
 
 	if err := json.Unmarshal(data, &pk); err != nil {

github/actions_workflows.go

@@ -53,7 +53,7 @@ type CreateWorkflowDispatchEventRequest struct {
 	// Inputs represents input keys and values configured in the workflow file.
 	// The maximum number of properties is 10.
 	// Default: Any default properties configured in the workflow file will be used when `inputs` are omitted.
-	Inputs map[string]interface{} `json:"inputs,omitempty"`
+	Inputs map[string]any `json:"inputs,omitempty"`
 }
 
 // ListWorkflows lists all workflows in a repository.

github/actions_workflows_test.go

@@ -237,7 +237,7 @@ func TestActionsService_CreateWorkflowDispatchEventByID(t *testing.T) {
 
 	event := CreateWorkflowDispatchEventRequest{
 		Ref: "d4cfb6e7",
-		Inputs: map[string]interface{}{
+		Inputs: map[string]any{
 			"key": "value",
 		},
 	}
@@ -281,7 +281,7 @@ func TestActionsService_CreateWorkflowDispatchEventByFileName(t *testing.T) {
 
 	event := CreateWorkflowDispatchEventRequest{
 		Ref: "d4cfb6e7",
-		Inputs: map[string]interface{}{
+		Inputs: map[string]any{
 			"key": "value",
 		},
 	}
@@ -618,7 +618,7 @@ func TestCreateWorkflowDispatchEventRequest_Marshal(t *testing.T) {
 	t.Parallel()
 	testJSONMarshal(t, &CreateWorkflowDispatchEventRequest{}, "{}")
 
-	inputs := make(map[string]interface{}, 0)
+	inputs := make(map[string]any, 0)
 	inputs["key"] = "value"
 
 	u := &CreateWorkflowDispatchEventRequest{

github/activity_events_test.go

@@ -437,7 +437,7 @@ func TestActivityService_EventParsePayload_typed(t *testing.T) {
 }
 
 // TestEvent_Payload_untyped checks that unrecognized events are parsed to an
-// interface{} value (instead of being discarded or throwing an error), for
+// any value (instead of being discarded or throwing an error), for
 // forward compatibility with new event types.
 func TestActivityService_EventParsePayload_untyped(t *testing.T) {
 	t.Parallel()
@@ -447,7 +447,7 @@ func TestActivityService_EventParsePayload_untyped(t *testing.T) {
 		t.Fatalf("Unmarshal Event returned error: %v", err)
 	}
 
-	want := map[string]interface{}{"field": "val"}
+	want := map[string]any{"field": "val"}
 	got, err := event.ParsePayload()
 	if err != nil {
 		t.Fatalf("ParsePayload returned unexpected error: %v", err)

github/copilot.go

@@ -46,14 +46,14 @@ type ListCopilotSeatsResponse struct {
 // CopilotSeatDetails represents the details of a Copilot for Business seat.
 type CopilotSeatDetails struct {
 	// Assignee can either be a User, Team, or Organization.
-	Assignee                interface{} `json:"assignee"`
-	AssigningTeam           *Team       `json:"assigning_team,omitempty"`
-	PendingCancellationDate *string     `json:"pending_cancellation_date,omitempty"`
-	LastActivityAt          *Timestamp  `json:"last_activity_at,omitempty"`
-	LastActivityEditor      *string     `json:"last_activity_editor,omitempty"`
-	CreatedAt               *Timestamp  `json:"created_at"`
-	UpdatedAt               *Timestamp  `json:"updated_at,omitempty"`
-	PlanType                *string     `json:"plan_type,omitempty"`
+	Assignee                any        `json:"assignee"`
+	AssigningTeam           *Team      `json:"assigning_team,omitempty"`
+	PendingCancellationDate *string    `json:"pending_cancellation_date,omitempty"`
+	LastActivityAt          *Timestamp `json:"last_activity_at,omitempty"`
+	LastActivityEditor      *string    `json:"last_activity_editor,omitempty"`
+	CreatedAt               *Timestamp `json:"created_at"`
+	UpdatedAt               *Timestamp `json:"updated_at,omitempty"`
+	PlanType                *string    `json:"plan_type,omitempty"`
 }
 
 // SeatAssignments represents the number of seats assigned.
@@ -203,7 +203,7 @@ func (cp *CopilotSeatDetails) UnmarshalJSON(data []byte) error {
 	cp.PlanType = seatDetail.PlanType
 
 	switch v := seatDetail.Assignee.(type) {
-	case map[string]interface{}:
+	case map[string]any:
 		jsonData, err := json.Marshal(seatDetail.Assignee)
 		if err != nil {
 			return err

github/enterprise_audit_log_test.go

@@ -61,7 +61,7 @@ func TestEnterpriseService_GetAuditLog(t *testing.T) {
 			Actor:      Ptr("testactor"),
 			CreatedAt:  &Timestamp{timestamp},
 			Org:        Ptr("o"),
-			AdditionalFields: map[string]interface{}{
+			AdditionalFields: map[string]any{
 				"completed_at":    "2021-03-07T00:35:08.000Z",
 				"conclusion":      "success",
 				"event":           "schedule",

github/event.go

@@ -27,7 +27,7 @@ func (e Event) String() string {
 
 // ParsePayload parses the event payload. For recognized event types,
 // a value of the corresponding struct type will be returned.
-func (e *Event) ParsePayload() (interface{}, error) {
+func (e *Event) ParsePayload() (any, error) {
 	// It would be nice if e.Type were the snake_case name of the event,
 	// but the existing interface uses the struct name instead.
 	payload := EventForType(typeToMessageMapping[e.GetType()])
@@ -44,7 +44,7 @@ func (e *Event) ParsePayload() (interface{}, error) {
 //
 // Deprecated: Use ParsePayload instead, which returns an error
 // rather than panics if JSON unmarshaling raw payload fails.
-func (e *Event) Payload() (payload interface{}) {
+func (e *Event) Payload() (payload any) {
 	var err error
 	payload, err = e.ParsePayload()
 	if err != nil {

github/event_test.go

@@ -49,7 +49,7 @@ func TestEvent_Marshal(t *testing.T) {
 	t.Parallel()
 	testJSONMarshal(t, &Event{}, "{}")
 
-	l := make(map[string]interface{})
+	l := make(map[string]any)
 	l["key"] = "value"
 
 	jsonMsg, _ := json.Marshal(&l)

github/event_types.go

@@ -1400,44 +1400,44 @@ func (h HeadCommit) String() string {
 
 // PushEventRepository represents the repo object in a PushEvent payload.
 type PushEventRepository struct {
-	ID               *int64                 `json:"id,omitempty"`
-	NodeID           *string                `json:"node_id,omitempty"`
-	Name             *string                `json:"name,omitempty"`
-	FullName         *string                `json:"full_name,omitempty"`
-	Owner            *User                  `json:"owner,omitempty"`
-	Private          *bool                  `json:"private,omitempty"`
-	Description      *string                `json:"description,omitempty"`
-	Fork             *bool                  `json:"fork,omitempty"`
-	CreatedAt        *Timestamp             `json:"created_at,omitempty"`
-	PushedAt         *Timestamp             `json:"pushed_at,omitempty"`
-	UpdatedAt        *Timestamp             `json:"updated_at,omitempty"`
-	Homepage         *string                `json:"homepage,omitempty"`
-	PullsURL         *string                `json:"pulls_url,omitempty"`
-	Size             *int                   `json:"size,omitempty"`
-	StargazersCount  *int                   `json:"stargazers_count,omitempty"`
-	WatchersCount    *int                   `json:"watchers_count,omitempty"`
-	Language         *string                `json:"language,omitempty"`
-	HasIssues        *bool                  `json:"has_issues,omitempty"`
-	HasDownloads     *bool                  `json:"has_downloads,omitempty"`
-	HasWiki          *bool                  `json:"has_wiki,omitempty"`
-	HasPages         *bool                  `json:"has_pages,omitempty"`
-	ForksCount       *int                   `json:"forks_count,omitempty"`
-	Archived         *bool                  `json:"archived,omitempty"`
-	Disabled         *bool                  `json:"disabled,omitempty"`
-	OpenIssuesCount  *int                   `json:"open_issues_count,omitempty"`
-	DefaultBranch    *string                `json:"default_branch,omitempty"`
-	MasterBranch     *string                `json:"master_branch,omitempty"`
-	Organization     *string                `json:"organization,omitempty"`
-	URL              *string                `json:"url,omitempty"`
-	ArchiveURL       *string                `json:"archive_url,omitempty"`
-	HTMLURL          *string                `json:"html_url,omitempty"`
-	StatusesURL      *string                `json:"statuses_url,omitempty"`
-	GitURL           *string                `json:"git_url,omitempty"`
-	SSHURL           *string                `json:"ssh_url,omitempty"`
-	CloneURL         *string                `json:"clone_url,omitempty"`
-	SVNURL           *string                `json:"svn_url,omitempty"`
-	Topics           []string               `json:"topics,omitempty"`
-	CustomProperties map[string]interface{} `json:"custom_properties,omitempty"`
+	ID               *int64         `json:"id,omitempty"`
+	NodeID           *string        `json:"node_id,omitempty"`
+	Name             *string        `json:"name,omitempty"`
+	FullName         *string        `json:"full_name,omitempty"`
+	Owner            *User          `json:"owner,omitempty"`
+	Private          *bool          `json:"private,omitempty"`
+	Description      *string        `json:"description,omitempty"`
+	Fork             *bool          `json:"fork,omitempty"`
+	CreatedAt        *Timestamp     `json:"created_at,omitempty"`
+	PushedAt         *Timestamp     `json:"pushed_at,omitempty"`
+	UpdatedAt        *Timestamp     `json:"updated_at,omitempty"`
+	Homepage         *string        `json:"homepage,omitempty"`
+	PullsURL         *string        `json:"pulls_url,omitempty"`
+	Size             *int           `json:"size,omitempty"`
+	StargazersCount  *int           `json:"stargazers_count,omitempty"`
+	WatchersCount    *int           `json:"watchers_count,omitempty"`
+	Language         *string        `json:"language,omitempty"`
+	HasIssues        *bool          `json:"has_issues,omitempty"`
+	HasDownloads     *bool          `json:"has_downloads,omitempty"`
+	HasWiki          *bool          `json:"has_wiki,omitempty"`
+	HasPages         *bool          `json:"has_pages,omitempty"`
+	ForksCount       *int           `json:"forks_count,omitempty"`
+	Archived         *bool          `json:"archived,omitempty"`
+	Disabled         *bool          `json:"disabled,omitempty"`
+	OpenIssuesCount  *int           `json:"open_issues_count,omitempty"`
+	DefaultBranch    *string        `json:"default_branch,omitempty"`
+	MasterBranch     *string        `json:"master_branch,omitempty"`
+	Organization     *string        `json:"organization,omitempty"`
+	URL              *string        `json:"url,omitempty"`
+	ArchiveURL       *string        `json:"archive_url,omitempty"`
+	HTMLURL          *string        `json:"html_url,omitempty"`
+	StatusesURL      *string        `json:"statuses_url,omitempty"`
+	GitURL           *string        `json:"git_url,omitempty"`
+	SSHURL           *string        `json:"ssh_url,omitempty"`
+	CloneURL         *string        `json:"clone_url,omitempty"`
+	SVNURL           *string        `json:"svn_url,omitempty"`
+	Topics           []string       `json:"topics,omitempty"`
+	CustomProperties map[string]any `json:"custom_properties,omitempty"`
 }
 
 // PushEventRepoOwner is a basic representation of user/org in a PushEvent payload.