pr fix: Expose daemon.api

canonical · Jul 31, 2023 · 98186fe · 98186fe
1 parent 8704de8
commit 98186fe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/internals/daemon/api.go b/internals/daemon/api.go
@@ -24,7 +24,7 @@ import (
 	"github.com/canonical/pebble/internals/overlord/state"
 )
 
-var api = []*Command{{
+var Api = []*Command{{
 	// See daemon.go:canAccess for details how the access is controlled.
 	Path:    "/v1/system-info",
 	GuestOK: true,
@@ -117,7 +117,3 @@ func v1SystemInfo(c *Command, r *http.Request, _ *UserState) Response {
 	}
 	return SyncResponse(result)
 }
-
-func Register(c *Command) {
-	api = append(api, c)
-}
diff --git a/internals/daemon/api_test.go b/internals/daemon/api_test.go
@@ -64,7 +64,7 @@ func (s *apiSuite) daemon(c *check.C) *Daemon {
 }
 
 func apiCmd(path string) *Command {
-	for _, cmd := range api {
+	for _, cmd := range Api {
 		if cmd.Path == path {
 			return cmd
 		}

diff --git a/internals/daemon/daemon.go b/internals/daemon/daemon.go
@@ -108,7 +108,10 @@ type Daemon struct {
 	mu sync.Mutex
 }
 
-// XXX Placeholder for now.
+// UserState represents the state of an authenticated API user.
+//
+// The struct is currently empty as the behaviors haven't been implemented
+// yet.
 type UserState struct{}
 
 // A ResponseFunc handles one of the individual verbs for a method
@@ -402,7 +405,7 @@ func (d *Daemon) SetDegradedMode(err error) {
 func (d *Daemon) addRoutes() {
 	d.router = mux.NewRouter()
 
-	for _, c := range api {
+	for _, c := range Api {
 		c.d = d
 		if c.PathPrefix == "" {
 			d.router.Handle(c.Path, c).Name(c.Path)

diff --git a/internals/daemon/daemon_test.go b/internals/daemon/daemon_test.go
@@ -110,7 +110,7 @@ func (s *daemonSuite) TestRegisterCommand(c *C) {
 		GuestOK: true,
 		GET:     getCallback,
 	}
-	Register(&command)
+	Api = append(Api, &command)
 
 	d := s.newDaemon(c)
 	d.Init()
@@ -421,16 +421,16 @@ func (s *daemonSuite) TestSuperAccess(c *check.C) {
 func (s *daemonSuite) TestAddRoutes(c *check.C) {
 	d := s.newDaemon(c)
 
-	expected := make([]string, len(api))
-	for i, v := range api {
+	expected := make([]string, len(Api))
+	for i, v := range Api {
 		if v.PathPrefix != "" {
 			expected[i] = v.PathPrefix
 			continue
 		}
 		expected[i] = v.Path
 	}
 
-	got := make([]string, 0, len(api))
+	got := make([]string, 0, len(Api))
 	c.Assert(d.router.Walk(func(route *mux.Route, router *mux.Router, ancestors []*mux.Route) error {
 		got = append(got, route.GetName())
 		return nil