tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also move client => api/client 

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
This commit is contained in:
Guillaume Tardif 2020-09-07 13:23:06 +02:00
parent d06aa2827f
commit 64a28f6636
27 changed files with 23 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/cmd/compose/compose.go
View File

@ -23,7 +23,7 @@ import (
"github.com/spf13/cobra"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/errdefs"
)

2
cli/cmd/compose/convert.go
View File

@ -23,7 +23,7 @@ import (
"github.com/compose-spec/compose-go/cli"
"github.com/spf13/cobra"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
)
func convertCommand() *cobra.Command {

2
cli/cmd/compose/down.go
View File

@ -21,7 +21,7 @@ import (
"github.com/spf13/cobra"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/progress"
)

2
cli/cmd/compose/list.go
View File

@ -24,7 +24,7 @@ import (
"github.com/spf13/cobra"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
)
func listCommand() *cobra.Command {

2
cli/cmd/compose/logs.go
View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
)
func logsCommand() *cobra.Command {

2
cli/cmd/compose/ps.go
View File

@ -26,7 +26,7 @@ import (
"github.com/spf13/cobra"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
)
func psCommand() *cobra.Command {

2
cli/cmd/compose/up.go
View File

@ -23,7 +23,7 @@ import (
"github.com/spf13/cobra"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/progress"
)

2
cli/cmd/context/create_aci.go
View File

@ -23,7 +23,7 @@ import (
"github.com/spf13/cobra"
"github.com/docker/compose-cli/aci"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/context/store"
"github.com/docker/compose-cli/errdefs"
)

2
cli/cmd/context/create_ecs.go
View File

@ -22,7 +22,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/context/store"
"github.com/docker/compose-cli/ecs"
"github.com/docker/compose-cli/errdefs"

2
cli/cmd/exec.go
View File

@ -26,8 +26,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/client"
)
type execOpts struct {

2
cli/cmd/inspect.go
View File

@ -23,7 +23,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/formatter"
)

2
cli/cmd/kill.go
View File

@ -25,7 +25,7 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/errdefs"
)

2
cli/cmd/login/login.go
View File

@ -26,8 +26,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/cli/mobycli"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/errdefs"
)

2
cli/cmd/logout/azure.go
View File

@ -23,7 +23,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/errdefs"
)

2
cli/cmd/logs.go
View File

@ -25,8 +25,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/client"
)
type logsOpts struct {

2
cli/cmd/ps.go
View File

@ -28,7 +28,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
formatter2 "github.com/docker/compose-cli/formatter"
)

2
cli/cmd/rm.go
View File

@ -25,8 +25,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/errdefs"
)

2
cli/cmd/run/run.go
View File

@ -27,8 +27,8 @@ import (
"github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/cli/options/run"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/progress"
)

2
cli/cmd/secrets.go
View File

@ -25,8 +25,8 @@ import (
"github.com/spf13/cobra"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/secrets"
"github.com/docker/compose-cli/client"
)
type createSecretOptions struct {

2
cli/cmd/start.go
View File

@ -27,7 +27,7 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
)
// StartCommand starts containers

2
cli/cmd/stop.go
View File

@ -27,7 +27,7 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
)
type stopOpts struct {

88
client/client.go
View File

@ -1,88 +0,0 @@
/*
Copyright 2020 Docker, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package client
import (
"context"
"github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/api/secrets"
"github.com/docker/compose-cli/backend"
apicontext "github.com/docker/compose-cli/context"
"github.com/docker/compose-cli/context/cloud"
"github.com/docker/compose-cli/context/store"
)
// New returns a backend client associated with current context
func New(ctx context.Context) (*Client, error) {
currentContext := apicontext.CurrentContext(ctx)
s := store.ContextStore(ctx)
cc, err := s.Get(currentContext)
if err != nil {
return nil, err
}
service, err := backend.Get(ctx, cc.Type())
if err != nil {
return nil, err
}
return &Client{
backendType: cc.Type(),
bs: service,
}, nil
}
// GetCloudService returns a backend CloudService (typically login, create context)
func GetCloudService(ctx context.Context, backendType string) (cloud.Service, error) {
return backend.GetCloudService(ctx, backendType)
}
// Client is a multi-backend client
type Client struct {
backendType string
bs backend.Service
}
// ContainerService returns the backend service for the current context
func (c *Client) ContainerService() containers.Service {
if cs := c.bs.ContainerService(); cs != nil {
return cs
}
return &containerService{}
}
// ComposeService returns the backend service for the current context
func (c *Client) ComposeService() compose.Service {
if cs := c.bs.ComposeService(); cs != nil {
return cs
}
return &composeService{}
}
// SecretsService returns the backend service for the current context
func (c *Client) SecretsService() secrets.Service {
if ss := c.bs.SecretsService(); ss != nil {
return ss
}
return &secretsService{}
}

60
client/compose.go
View File

@ -1,60 +0,0 @@
/*
Copyright 2020 Docker, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package client
import (
"context"
"io"
"github.com/compose-spec/compose-go/types"
"github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/errdefs"
)
type composeService struct {
}
// Up executes the equivalent to a `compose up`
func (c *composeService) Up(context.Context, *types.Project) error {
return errdefs.ErrNotImplemented
}
// Down executes the equivalent to a `compose down`
func (c *composeService) Down(context.Context, string) error {
return errdefs.ErrNotImplemented
}
// Logs executes the equivalent to a `compose logs`
func (c *composeService) Logs(context.Context, string, io.Writer) error {
return errdefs.ErrNotImplemented
}
// Ps executes the equivalent to a `compose ps`
func (c *composeService) Ps(context.Context, string) ([]compose.ServiceStatus, error) {
return nil, errdefs.ErrNotImplemented
}
// List executes the equivalent to a `docker stack ls`
func (c *composeService) List(context.Context, string) ([]compose.Stack, error) {
return nil, errdefs.ErrNotImplemented
}
// Convert translate compose model into backend's native format
func (c *composeService) Convert(context.Context, *types.Project) ([]byte, error) {
return nil, errdefs.ErrNotImplemented
}

71
client/containers.go
View File

@ -1,71 +0,0 @@
/*
Copyright 2020 Docker, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package client
import (
"context"
"github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/errdefs"
)
type containerService struct {
}
// List returns all the containers
func (c *containerService) List(context.Context, bool) ([]containers.Container, error) {
return nil, errdefs.ErrNotImplemented
}
// Start starts a stopped container
func (c *containerService) Start(context.Context, string) error {
return errdefs.ErrNotImplemented
}
// Stop stops the running container
func (c *containerService) Stop(context.Context, string, *uint32) error {
return errdefs.ErrNotImplemented
}
func (c *containerService) Kill(ctx context.Context, containerID string, signal string) error {
return errdefs.ErrNotImplemented
}
// Run creates and starts a container
func (c *containerService) Run(context.Context, containers.ContainerConfig) error {
return errdefs.ErrNotImplemented
}
// Exec executes a command inside a running container
func (c *containerService) Exec(context.Context, string, containers.ExecRequest) error {
return errdefs.ErrNotImplemented
}
// Logs returns all the logs of a container
func (c *containerService) Logs(context.Context, string, containers.LogsRequest) error {
return errdefs.ErrNotImplemented
}
// Delete removes containers
func (c *containerService) Delete(context.Context, string, containers.DeleteRequest) error {
return errdefs.ErrNotImplemented
}
// Inspect get a specific container
func (c *containerService) Inspect(context.Context, string) (containers.Container, error) {
return containers.Container{}, errdefs.ErrNotImplemented
}

43
client/secrets.go
View File

@ -1,43 +0,0 @@
/*
Copyright 2020 Docker, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package client
import (
"context"
"github.com/docker/compose-cli/api/secrets"
"github.com/docker/compose-cli/errdefs"
)
type secretsService struct {
}
func (s *secretsService) CreateSecret(context.Context, secrets.Secret) (string, error) {
return "", errdefs.ErrNotImplemented
}
func (s *secretsService) InspectSecret(context.Context, string) (secrets.Secret, error) {
return secrets.Secret{}, errdefs.ErrNotImplemented
}
func (s *secretsService) ListSecrets(context.Context) ([]secrets.Secret, error) {
return nil, errdefs.ErrNotImplemented
}
func (s *secretsService) DeleteSecret(context.Context, string, bool) error {
return errdefs.ErrNotImplemented
}

2
server/interceptor.go
View File

@ -24,7 +24,7 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/metadata"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/config"
apicontext "github.com/docker/compose-cli/context"
"github.com/docker/compose-cli/context/store"

2
server/proxy/proxy.go
View File

@ -20,7 +20,7 @@ import (
"context"
"sync"
"github.com/docker/compose-cli/client"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/config"
containersv1 "github.com/docker/compose-cli/protos/containers/v1"
contextsv1 "github.com/docker/compose-cli/protos/contexts/v1"