replace passing parameters by context with singletons

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

aci/backend.go

@@ -17,7 +17,6 @@
 package aci
 
 import (
-	"context"
 	"strings"
 
 	"github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2019-12-01/containerinstance"
@@ -68,9 +67,9 @@ func init() {
 	backend.Register(backendType, backendType, service, getCloudService)
 }
 
-func service(ctx context.Context) (backend.Service, error) {
-	contextStore := store.ContextStore(ctx)
-	currentContext := apicontext.CurrentContext(ctx)
+func service() (backend.Service, error) {
+	contextStore := store.Instance()
+	currentContext := apicontext.Current()
 	var aciContext store.AciContext
 
 	if err := contextStore.GetEndpoint(currentContext, &aciContext); err != nil {

api/backend/backend.go

@@ -17,7 +17,6 @@
 package backend
 
 import (
-	"context"
 	"errors"
 	"fmt"
 
@@ -38,7 +37,7 @@ var (
 	errTypeRegistered = errors.New("backend: already registered")
 )
 
-type initFunc func(context.Context) (Service, error)
+type initFunc func() (Service, error)
 type getCloudServiceFunc func() (cloud.Service, error)
 
 type registeredBackend struct {
@@ -52,6 +51,18 @@ var backends = struct {
 	r []*registeredBackend
 }{}
 
+var instance Service
+
+// Current return the active backend instance
+func Current() Service {
+	return instance
+}
+
+// WithBackend set the active backend instance
+func WithBackend(s Service) {
+	instance = s
+}
+
 // Service aggregates the service interfaces
 type Service interface {
 	ContainerService() containers.Service
@@ -85,10 +96,10 @@ func Register(name string, backendType string, init initFunc, getCoudService get
 
 // Get returns the backend registered for a particular type, it returns
 // an error if there is no registered backends for the given type.
-func Get(ctx context.Context, backendType string) (Service, error) {
+func Get(backendType string) (Service, error) {
 	for _, b := range backends.r {
 		if b.backendType == backendType {
-			return b.init(ctx)
+			return b.init()
 		}
 	}
 
@@ -97,7 +108,7 @@ func Get(ctx context.Context, backendType string) (Service, error) {
 
 // GetCloudService returns the backend registered for a particular type, it returns
 // an error if there is no registered backends for the given type.
-func GetCloudService(ctx context.Context, backendType string) (cloud.Service, error) {
+func GetCloudService(backendType string) (cloud.Service, error) {
 	for _, b := range backends.r {
 		if b.backendType == backendType {
 			return b.getCloudService()

api/client/client.go

@@ -25,38 +25,25 @@ import (
 	"github.com/docker/compose-cli/api/containers"
 	apicontext "github.com/docker/compose-cli/api/context"
 	"github.com/docker/compose-cli/api/context/store"
+	"github.com/docker/compose-cli/api/errdefs"
 	"github.com/docker/compose-cli/api/resources"
 	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/api/volumes"
 )
 
 // New returns a backend client associated with current context
 func New(ctx context.Context) (*Client, error) {
-	return newWithDefaultBackend(ctx, "")
-}
-
-// NewWithDefaultLocalBackend returns a backend client associated with current context or local backend if on default context type
-func NewWithDefaultLocalBackend(ctx context.Context) (*Client, error) {
-	return newWithDefaultBackend(ctx, store.LocalContextType)
-}
-
-func newWithDefaultBackend(ctx context.Context, defaultBackend string) (*Client, error) {
-	currentContext := apicontext.CurrentContext(ctx)
-	s := store.ContextStore(ctx)
+	currentContext := apicontext.Current()
+	s := store.Instance()
 
 	cc, err := s.Get(currentContext)
 	if err != nil {
 		return nil, err
 	}
 
-	backendName := cc.Type()
-	if backendName == store.DefaultContextType && defaultBackend != "" {
-		backendName = defaultBackend
-	}
-
-	service, err := backend.Get(ctx, backendName)
-	if err != nil {
-		return nil, err
+	service := backend.Current()
+	if service == nil {
+		return nil, errdefs.ErrNotFound
 	}
 
 	client := NewClient(cc.Type(), service)
@@ -73,7 +60,7 @@ func NewClient(backendType string, service backend.Service) Client {
 
 // GetCloudService returns a backend CloudService (typically login, create context)
 func GetCloudService(ctx context.Context, backendType string) (cloud.Service, error) {
-	return backend.GetCloudService(ctx, backendType)
+	return backend.GetCloudService(backendType)
 }
 
 // Client is a multi-backend client

api/config/config.go

@@ -17,7 +17,6 @@
 package config
 
 import (
-	"context"
 	"encoding/json"
 	"io/ioutil"
 	"os"
@@ -28,17 +27,16 @@ import (
 	"github.com/docker/compose-cli/api/context/store"
 )
 
-type dirKey struct{}
+var configDir string
 
 // WithDir sets the config directory path in the context
-func WithDir(ctx context.Context, path string) context.Context {
-	return context.WithValue(ctx, dirKey{}, path)
+func WithDir(path string) {
+	configDir = path
 }
 
 // Dir returns the config directory path
-func Dir(ctx context.Context) string {
-	cd, _ := ctx.Value(dirKey{}).(string)
-	return cd
+func Dir() string {
+	return configDir
 }
 
 // LoadFile loads the docker configuration

api/context/context.go

@@ -16,35 +16,14 @@
 
 package context
 
-import (
-	gocontext "context"
-
-	"golang.org/x/net/context"
-
-	cliflags "github.com/docker/cli/cli/flags"
-)
-
-type currentContextKey struct{}
-type cliOptionsKey struct{}
+var current string
 
 // WithCurrentContext sets the name of the current docker context
-func WithCurrentContext(ctx gocontext.Context, contextName string) context.Context {
-	return context.WithValue(ctx, currentContextKey{}, contextName)
-}
-
-// CurrentContext returns the current context name
-func CurrentContext(ctx context.Context) string {
-	cc, _ := ctx.Value(currentContextKey{}).(string)
-	return cc
-}
-
-// WithCliOptions sets CLI options
-func WithCliOptions(ctx gocontext.Context, options cliflags.CommonOptions) context.Context {
-	return context.WithValue(ctx, cliOptionsKey{}, options)
+func WithCurrentContext(contextName string) {
+	current = contextName
 }
 
-// CliOptions returns common cli options
-func CliOptions(ctx context.Context) cliflags.CommonOptions {
-	cc, _ := ctx.Value(cliOptionsKey{}).(cliflags.CommonOptions)
-	return cc
+// Current returns the current context name
+func Current() string {
+	return current
 }

api/context/store/store.go

@@ -17,7 +17,6 @@
 package store
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -67,17 +66,16 @@ const (
 	metaFile          = "meta.json"
 )
 
-type contextStoreKey struct{}
+var instance Store
 
 // WithContextStore adds the store to the context
-func WithContextStore(ctx context.Context, store Store) context.Context {
-	return context.WithValue(ctx, contextStoreKey{}, store)
+func WithContextStore(store Store) {
+	instance = store
 }
 
-// ContextStore returns the store from the context
-func ContextStore(ctx context.Context) Store {
-	s, _ := ctx.Value(contextStoreKey{}).(Store)
-	return s
+// Instance returns the store from the context
+func Instance() Store {
+	return instance
 }
 
 // Store is the context store

cli/cmd/compose/build.go

@@ -63,7 +63,7 @@ func buildCommand(p *projectOptions) *cobra.Command {
 }
 
 func runBuild(ctx context.Context, opts buildOptions, services []string) error {
-	c, err := client.NewWithDefaultLocalBackend(ctx)
+	c, err := client.New(ctx)
 	if err != nil {
 		return err
 	}

cli/cmd/compose/convert.go

@@ -77,7 +77,7 @@ func convertCommand(p *projectOptions) *cobra.Command {
 
 func runConvert(ctx context.Context, opts convertOptions, services []string) error {
 	var json []byte
-	c, err := client.NewWithDefaultLocalBackend(ctx)
+	c, err := client.New(ctx)
 	if err != nil {
 		return err
 	}
@@ -88,7 +88,7 @@ func runConvert(ctx context.Context, opts convertOptions, services []string) err
 	}
 
 	if opts.resolve {
-		configFile, err := cliconfig.Load(config.Dir(ctx))
+		configFile, err := cliconfig.Load(config.Dir())
 		if err != nil {
 			return err
 		}

cli/cmd/compose/down.go

@@ -69,7 +69,7 @@ func downCommand(p *projectOptions, contextType string) *cobra.Command {
 }
 
 func runDown(ctx context.Context, opts downOptions) error {
-	c, err := client.NewWithDefaultLocalBackend(ctx)
+	c, err := client.New(ctx)
 	if err != nil {
 		return err
 	}

cli/cmd/compose/events.go

@@ -51,7 +51,7 @@ func eventsCommand(p *projectOptions) *cobra.Command {
 }
 
 func runEvents(ctx context.Context, opts eventsOpts, services []string) error {
-	c, err := client.NewWithDefaultLocalBackend(ctx)
+	c, err := client.New(ctx)
 	if err != nil {
 		return err
 	}