chore: replace interface{} with any

.github/workflows/tests.yml

@@ -62,6 +62,10 @@ jobs:
         go fmt ./...
         git diff --exit-code
 
+    - name: Ensure no use of empty interface (should be any)
+      run: |
+        ! egrep -R --exclude-dir .git 'interface\{\}'
+
   docs:
     runs-on: ubuntu-latest
 

client/changes.go

@@ -44,7 +44,7 @@ type Change struct {
 var ErrNoData = fmt.Errorf("data entry not found")
 
 // Get unmarshals into value the kind-specific data with the provided key.
-func (c *Change) Get(key string, value interface{}) error {
+func (c *Change) Get(key string, value any) error {
 	raw := c.data[key]
 	if raw == nil {
 		return ErrNoData
@@ -68,7 +68,7 @@ type Task struct {
 }
 
 // Get unmarshals into value the kind-specific data with the provided key.
-func (t *Task) Get(key string, value interface{}) error {
+func (t *Task) Get(key string, value any) error {
 	raw := t.Data[key]
 	if raw == nil {
 		return ErrNoData

client/checks_test.go

@@ -78,7 +78,7 @@ func (cs *clientSuite) TestStartChecks(c *check.C) {
 	c.Assert(cs.req.Method, check.Equals, "POST")
 	c.Assert(cs.req.URL.Path, check.Equals, "/v1/checks")
 
-	var body map[string]interface{}
+	var body map[string]any
 	c.Assert(json.NewDecoder(cs.req.Body).Decode(&body), check.IsNil)
 	c.Check(body, check.HasLen, 2)
 	c.Check(body["action"], check.Equals, "start")
@@ -103,7 +103,7 @@ func (cs *clientSuite) TestStopChecks(c *check.C) {
 	c.Assert(cs.req.Method, check.Equals, "POST")
 	c.Assert(cs.req.URL.Path, check.Equals, "/v1/checks")
 
-	var body map[string]interface{}
+	var body map[string]any
 	c.Assert(json.NewDecoder(cs.req.Body).Decode(&body), check.IsNil)
 	c.Check(body, check.HasLen, 2)
 	c.Check(body["action"], check.Equals, "stop")

client/client.go

@@ -74,7 +74,7 @@ type RequestResponse struct {
 // DecodeResult decodes the endpoint-specific result payload that is included as part of
 // sync and async request responses. The decoding is performed with the standard JSON
 // package, so the usual field tags should be used to prepare the type for decoding.
-func (resp *RequestResponse) DecodeResult(result interface{}) error {
+func (resp *RequestResponse) DecodeResult(result any) error {
 	reader := bytes.NewReader(resp.Result)
 	dec := json.NewDecoder(reader)
 	dec.UseNumber()
@@ -165,7 +165,7 @@ type clientWebsocket interface {
 }
 
 type jsonWriter interface {
-	WriteJSON(v interface{}) error
+	WriteJSON(v any) error
 }
 
 func New(config *Config) (*Client, error) {
@@ -386,7 +386,7 @@ func (rq *defaultRequester) Do(ctx context.Context, opts *RequestOptions) (*Requ
 	}, nil
 }
 
-func decodeInto(reader io.Reader, v interface{}) error {
+func decodeInto(reader io.Reader, v any) error {
 	dec := json.NewDecoder(reader)
 	if err := dec.Decode(v); err != nil {
 		r := dec.Buffered()
@@ -413,9 +413,9 @@ type response struct {
 
 // Error is the real value of response.Result when an error occurs.
 type Error struct {
-	Kind    string      `json:"kind"`
-	Value   interface{} `json:"value"`
-	Message string      `json:"message"`
+	Kind    string `json:"kind"`
+	Value   any    `json:"value"`
+	Message string `json:"message"`
 
 	StatusCode int
 }
@@ -497,12 +497,12 @@ func (client *Client) SysInfo() (*SysInfo, error) {
 }
 
 type debugAction struct {
-	Action string      `json:"action"`
-	Params interface{} `json:"params,omitempty"`
+	Action string `json:"action"`
+	Params any    `json:"params,omitempty"`
 }
 
 // DebugPost sends a POST debug action to the server with the provided parameters.
-func (client *Client) DebugPost(action string, params interface{}, result interface{}) error {
+func (client *Client) DebugPost(action string, params any, result any) error {
 	body, err := json.Marshal(debugAction{
 		Action: action,
 		Params: params,
@@ -528,7 +528,7 @@ func (client *Client) DebugPost(action string, params interface{}, result interf
 }
 
 // DebugGet sends a GET debug action to the server with the provided parameters.
-func (client *Client) DebugGet(action string, result interface{}, params map[string]string) error {
+func (client *Client) DebugGet(action string, result any, params map[string]string) error {
 	urlParams := url.Values{"action": []string{action}}
 	for k, v := range params {
 		urlParams.Set(k, v)

client/exec_test.go

@@ -73,8 +73,8 @@ func (s *execSuite) TestExitZero(c *C) {
 		Command: []string{"true"},
 	}
 	process, reqBody := s.exec(c, opts, 0)
-	c.Assert(reqBody, DeepEquals, map[string]interface{}{
-		"command": []interface{}{"true"},
+	c.Assert(reqBody, DeepEquals, map[string]any{
+		"command": []any{"true"},
 	})
 	err := s.wait(c, process)
 	c.Assert(err, IsNil)
@@ -85,8 +85,8 @@ func (s *execSuite) TestExitNonZero(c *C) {
 		Command: []string{"false"},
 	}
 	process, reqBody := s.exec(c, opts, 1)
-	c.Assert(reqBody, DeepEquals, map[string]interface{}{
-		"command": []interface{}{"false"},
+	c.Assert(reqBody, DeepEquals, map[string]any{
+		"command": []any{"false"},
 	})
 	err := s.wait(c, process)
 	exitError, ok := err.(*client.ExitError)
@@ -100,8 +100,8 @@ func (s *execSuite) TestTimeout(c *C) {
 		Timeout: time.Second,
 	}
 	process, reqBody := s.exec(c, opts, 0)
-	c.Assert(reqBody, DeepEquals, map[string]interface{}{
-		"command": []interface{}{"sleep", "3"},
+	c.Assert(reqBody, DeepEquals, map[string]any{
+		"command": []any{"sleep", "3"},
 		"timeout": "1s",
 	})
 	err := s.wait(c, process)
@@ -126,9 +126,9 @@ func (s *execSuite) TestOtherOptions(c *C) {
 		Stderr:      io.Discard,
 	}
 	process, reqBody := s.exec(c, opts, 0)
-	c.Assert(reqBody, DeepEquals, map[string]interface{}{
-		"command":      []interface{}{"echo", "foo"},
-		"environment":  map[string]interface{}{"K1": "V1", "K2": "V2"},
+	c.Assert(reqBody, DeepEquals, map[string]any{
+		"command":      []any{"echo", "foo"},
+		"environment":  map[string]any{"K1": "V1", "K2": "V2"},
 		"working-dir":  "WD",
 		"user-id":      1000.0,
 		"user":         "bob",
@@ -148,8 +148,8 @@ func (s *execSuite) TestWaitChangeError(c *C) {
 		Command: []string{"foo"},
 	}
 	process, reqBody := s.exec(c, opts, 0)
-	c.Assert(reqBody, DeepEquals, map[string]interface{}{
-		"command": []interface{}{"foo"},
+	c.Assert(reqBody, DeepEquals, map[string]any{
+		"command": []any{"foo"},
 	})
 
 	// Make /v1/changes/{id}/wait return a "change error"
@@ -173,8 +173,8 @@ func (s *execSuite) TestWaitTasksError(c *C) {
 		Command: []string{"foo"},
 	}
 	process, reqBody := s.exec(c, opts, 0)
-	c.Assert(reqBody, DeepEquals, map[string]interface{}{
-		"command": []interface{}{"foo"},
+	c.Assert(reqBody, DeepEquals, map[string]any{
+		"command": []any{"foo"},
 	})
 
 	// Make /v1/changes/{id}/wait return no tasks
@@ -197,8 +197,8 @@ func (s *execSuite) TestWaitExitCodeError(c *C) {
 		Command: []string{"foo"},
 	}
 	process, reqBody := s.exec(c, opts, 0)
-	c.Assert(reqBody, DeepEquals, map[string]interface{}{
-		"command": []interface{}{"foo"},
+	c.Assert(reqBody, DeepEquals, map[string]any{
+		"command": []any{"foo"},
 	})
 
 	// Make /v1/changes/{id}/wait return no exit code
@@ -225,8 +225,8 @@ func (s *execSuite) TestSendSignal(c *C) {
 		Command: []string{"server"},
 	}
 	process, reqBody := s.exec(c, opts, 0)
-	c.Assert(reqBody, DeepEquals, map[string]interface{}{
-		"command": []interface{}{"server"},
+	c.Assert(reqBody, DeepEquals, map[string]any{
+		"command": []any{"server"},
 	})
 	err := process.SendSignal("SIGHUP")
 	c.Assert(err, IsNil)
@@ -243,8 +243,8 @@ func (s *execSuite) TestSendResize(c *C) {
 		Command: []string{"server"},
 	}
 	process, reqBody := s.exec(c, opts, 0)
-	c.Assert(reqBody, DeepEquals, map[string]interface{}{
-		"command": []interface{}{"server"},
+	c.Assert(reqBody, DeepEquals, map[string]any{
+		"command": []any{"server"},
 	})
 	err := process.SendResize(150, 50)
 	c.Assert(err, IsNil)
@@ -268,8 +268,8 @@ func (s *execSuite) TestOutputCombined(c *C) {
 		Stdout:  &stdout,
 	}
 	process, reqBody := s.exec(c, opts, 0)
-	c.Assert(reqBody, DeepEquals, map[string]interface{}{
-		"command": []interface{}{"/bin/sh", "-c", "echo OUT; echo ERR >err"},
+	c.Assert(reqBody, DeepEquals, map[string]any{
+		"command": []any{"/bin/sh", "-c", "echo OUT; echo ERR >err"},
 	})
 	err := s.wait(c, process)
 	c.Assert(err, IsNil)
@@ -293,8 +293,8 @@ func (s *execSuite) TestOutputSplit(c *C) {
 		Stderr:  &stderr,
 	}
 	process, reqBody := s.exec(c, opts, 0)
-	c.Assert(reqBody, DeepEquals, map[string]interface{}{
-		"command":      []interface{}{"/bin/sh", "-c", "echo OUT; echo ERR >err"},
+	c.Assert(reqBody, DeepEquals, map[string]any{
+		"command":      []any{"/bin/sh", "-c", "echo OUT; echo ERR >err"},
 		"split-stderr": true,
 	})
 	err := s.wait(c, process)
@@ -315,8 +315,8 @@ func (s *execSuite) TestStdinAndStdout(c *C) {
 		Stdout:  &stdout,
 	}
 	process, reqBody := s.exec(c, opts, 0)
-	c.Assert(reqBody, DeepEquals, map[string]interface{}{
-		"command": []interface{}{"awk", "{ print toupper($0) }"},
+	c.Assert(reqBody, DeepEquals, map[string]any{
+		"command": []any{"awk", "{ print toupper($0) }"},
 	})
 	err := s.wait(c, process)
 	c.Assert(err, IsNil)
@@ -360,7 +360,7 @@ func (w *testWebsocket) Close() error {
 	return nil
 }
 
-func (w *testWebsocket) WriteJSON(v interface{}) error {
+func (w *testWebsocket) WriteJSON(v any) error {
 	data, err := json.Marshal(v)
 	if err != nil {
 		return err
@@ -369,7 +369,7 @@ func (w *testWebsocket) WriteJSON(v interface{}) error {
 	return nil
 }
 
-func (s *execSuite) exec(c *C, opts *client.ExecOptions, exitCode int) (process *client.ExecProcess, requestBody map[string]interface{}) {
+func (s *execSuite) exec(c *C, opts *client.ExecOptions, exitCode int) (process *client.ExecProcess, requestBody map[string]any) {
 	s.addResponses("123", exitCode)
 	process, err := s.cli.Exec(opts)
 	c.Assert(err, IsNil)

client/files.go

@@ -85,7 +85,7 @@ func (fi *FileInfo) IsDir() bool {
 }
 
 // Sys returns the underlying data source (always nil for client.FileInfo).
-func (fi *FileInfo) Sys() interface{} {
+func (fi *FileInfo) Sys() any {
 	return nil
 }
 

client/plan_test.go

@@ -61,9 +61,9 @@ services:
 		c.Check(cs.req.Method, check.Equals, "POST")
 		c.Check(cs.req.URL.Path, check.Equals, "/v1/layers")
 		c.Check(cs.req.URL.Query(), check.HasLen, 0)
-		var body map[string]interface{}
+		var body map[string]any
 		c.Assert(json.NewDecoder(cs.req.Body).Decode(&body), check.IsNil)
-		c.Assert(body, check.DeepEquals, map[string]interface{}{
+		c.Assert(body, check.DeepEquals, map[string]any{
 			"action":  "add",
 			"combine": option.combine,
 			"label":   "foo",

client/services_test.go

@@ -53,11 +53,11 @@ func (cs *clientSuite) TestStartStop(c *check.C) {
 		c.Check(cs.req.Method, check.Equals, "POST")
 		c.Check(cs.req.URL.Path, check.Equals, "/v1/services")
 
-		var body map[string]interface{}
+		var body map[string]any
 		c.Assert(json.NewDecoder(cs.req.Body).Decode(&body), check.IsNil)
 		c.Check(body, check.HasLen, 2)
 		c.Check(body["action"], check.Equals, action)
-		c.Check(body["services"], check.DeepEquals, []interface{}{"one", "two"})
+		c.Check(body["services"], check.DeepEquals, []any{"one", "two"})
 	}
 }
 
@@ -78,7 +78,7 @@ func (cs *clientSuite) TestAutostart(c *check.C) {
 	c.Check(cs.req.Method, check.Equals, "POST")
 	c.Check(cs.req.URL.Path, check.Equals, "/v1/services")
 
-	var body map[string]interface{}
+	var body map[string]any
 	c.Assert(json.NewDecoder(cs.req.Body).Decode(&body), check.IsNil)
 	c.Check(body, check.HasLen, 2)
 	c.Check(body["action"], check.Equals, "autostart")
@@ -130,11 +130,11 @@ func (cs *clientSuite) TestRestart(c *check.C) {
 	c.Check(cs.req.Method, check.Equals, "POST")
 	c.Check(cs.req.URL.Path, check.Equals, "/v1/services")
 
-	var body map[string]interface{}
+	var body map[string]any
 	c.Assert(json.NewDecoder(cs.req.Body).Decode(&body), check.IsNil)
 	c.Check(body, check.HasLen, 2)
 	c.Check(body["action"], check.Equals, "restart")
-	c.Check(body["services"], check.DeepEquals, []interface{}{"one", "two"})
+	c.Check(body["services"], check.DeepEquals, []any{"one", "two"})
 }
 
 func (cs *clientSuite) TestReplan(c *check.C) {
@@ -154,7 +154,7 @@ func (cs *clientSuite) TestReplan(c *check.C) {
 	c.Check(cs.req.Method, check.Equals, "POST")
 	c.Check(cs.req.URL.Path, check.Equals, "/v1/services")
 
-	var body map[string]interface{}
+	var body map[string]any
 	c.Assert(json.NewDecoder(cs.req.Body).Decode(&body), check.IsNil)
 	c.Check(body, check.HasLen, 2)
 	c.Check(body["action"], check.Equals, "replan")

client/signals_test.go

@@ -37,11 +37,11 @@ func (cs *clientSuite) TestSignals(c *C) {
 	c.Check(cs.req.Method, Equals, "POST")
 	c.Check(cs.req.URL.Path, Equals, "/v1/signals")
 
-	var body map[string]interface{}
+	var body map[string]any
 	err = json.NewDecoder(cs.req.Body).Decode(&body)
 	c.Assert(err, IsNil)
-	c.Assert(body, DeepEquals, map[string]interface{}{
+	c.Assert(body, DeepEquals, map[string]any{
 		"signal":   "SIGHUP",
-		"services": []interface{}{"s1", "s2"},
+		"services": []any{"s1", "s2"},
 	})
 }

internals/cli/cli_test.go

@@ -98,8 +98,8 @@ func (s *BasePebbleSuite) RedirectClientToTestServer(handler func(http.ResponseW
 }
 
 // DecodedRequestBody returns the JSON-decoded body of the request.
-func DecodedRequestBody(c *C, r *http.Request) map[string]interface{} {
-	var body map[string]interface{}
+func DecodedRequestBody(c *C, r *http.Request) map[string]any {
+	var body map[string]any
 	decoder := json.NewDecoder(r.Body)
 	decoder.UseNumber()
 	err := decoder.Decode(&body)
@@ -108,7 +108,7 @@ func DecodedRequestBody(c *C, r *http.Request) map[string]interface{} {
 }
 
 // EncodeResponseBody writes JSON-serialized body to the response writer.
-func EncodeResponseBody(c *C, w http.ResponseWriter, body interface{}) {
+func EncodeResponseBody(c *C, w http.ResponseWriter, body any) {
 	encoder := json.NewEncoder(w)
 	err := encoder.Encode(body)
 	c.Assert(err, IsNil)

internals/cli/cmd_add_test.go

@@ -52,7 +52,7 @@ services:
 	}
 }`)
 			} else {
-				c.Check(body, check.DeepEquals, map[string]interface{}{
+				c.Check(body, check.DeepEquals, map[string]any{
 					"action":  "add",
 					"combine": combine,
 					"label":   "foo",