api/server: drop unused Config struct #45083
Conversation
The Server.cfg field is never referenced by any code in package "./api/server". "./api/server".Config struct values are used by DaemonCli code, but only to pass around configuration copied out of the daemon config within the "./cmd/dockerd" package. Delete the "./api/server".Config struct definition and refactor the "./cmd/dockerd" package to pull configuration directly from cli.Config. Signed-off-by: Cory Snider <csnider@mirantis.com>
| @@ -161,9 +161,7 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) { | |||
| } | |||
| } | |||
|
|
|||
| cli.api = apiserver.New(serverConfig) | |||
There was a problem hiding this comment.
Where does the actual initialisation of the Server struct happen now? (i should probably check out the code locally 😂)
Also was scratching my head a bit why the "constructor" didn't actually construct everything, other than setting the "config" (but none of the other fields). Is that something we would "want" to be more of an actual constructor instead? Or not worth bothering?
There was a problem hiding this comment.
Where does the actual initialisation of the
Serverstruct happennow?
Initialization of the apiserver.Server struct happens in the cli.initMiddlewares and initRouter calls. That is true on master and it is true in this PR branch. The only meaningful change is that cli.api is no longer a pointer.
Also was scratching my head a bit why the "constructor" didn't actually construct everything, other than setting the "config" (but none of the other fields). Is that something we would "want" to be more of an actual constructor instead? Or not worth bothering?
I'm not convinced it's worth bothering. apiserver.Server implements the builder pattern, which seems to work well enough for this use case. I wish that its build method was named something more intuitive than Wait(), but that's out of scope for this PR.
The
Server.cfgfield is never referenced by any code in package"./api/server"."./api/server".Configstruct values are used byDaemonClicode, but only to pass around configuration copied out of the daemon config within the"./cmd/dockerd"package. Delete the"./api/server".Configstruct definition and refactor the"./cmd/dockerd"package to pull configuration directly fromcli.Config.- What I did
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)