Attempt to get around the linter?

cli/cli.go

@@ -32,7 +32,7 @@ type LoggingOpts struct {
 
 // AdminOpts is a re-export of the admin type so servers don't need to import it directly.
 type AdminOpts struct {
-	admin.Opts
+	Admin              admin.Opts
 	EnableGcpProfiling bool `long:"gcp_profiling" description:"Enable pushing profiles to GCP Cloud profiling." env:"ADMIN_GCP_PROFILING"`
 }
 
@@ -49,12 +49,12 @@ func ParseFlagsOrDie(name string, opts interface{}, loggingOpts *LoggingOpts) (s
 // ServeAdmin starts the admin HTTP server.
 // It will block forever so the caller may well want to use a goroutine.
 func ServeAdmin(serviceName string, opts AdminOpts, info logging.LogLevelInfo) {
-	opts.Logger = logging.MustGetLoggerNamed("github.com.thought-machine.http-admin")
-	opts.LogInfo = info
+	opts.Admin.Logger = logging.MustGetLoggerNamed("github.com.thought-machine.http-admin")
+	opts.Admin.LogInfo = info
 	if opts.EnableGcpProfiling {
 		setupProfiling(serviceName)
 	}
-	go admin.Serve(opts.Opts)
+	go admin.Serve(opts.Admin)
 }
 
 func setupProfiling(serviceName string) {