Implement ps without need for the original compose.yaml file

close #165

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2020-07-15 16:27:24 +02:00
parent d7d5e63054
commit 37b9e74308
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
4 changed files with 51 additions and 22 deletions

View File

@ -9,13 +9,9 @@ import (
) )
func (b *Backend) Down(ctx context.Context, options cli.ProjectOptions) error { func (b *Backend) Down(ctx context.Context, options cli.ProjectOptions) error {
name := options.Name name, err2 := b.projectName(options)
if name == "" { if err2 != nil {
project, err := cli.ProjectFromOptions(&options) return err2
if err != nil {
return err
}
name = project.Name
} }
err := b.api.DeleteStack(ctx, name) err := b.api.DeleteStack(ctx, name)
@ -30,3 +26,15 @@ func (b *Backend) Down(ctx context.Context, options cli.ProjectOptions) error {
} }
return nil return nil
} }
func (b *Backend) projectName(options cli.ProjectOptions) (string, error) {
name := options.Name
if name == "" {
project, err := cli.ProjectFromOptions(&options)
if err != nil {
return "", err
}
name = project.Name
}
return name, nil
}

View File

@ -3,33 +3,34 @@ package backend
import ( import (
"context" "context"
"fmt" "fmt"
"regexp"
"strings"
"github.com/compose-spec/compose-go/cli" "github.com/compose-spec/compose-go/cli"
"github.com/docker/ecs-plugin/pkg/compose" "github.com/docker/ecs-plugin/pkg/compose"
) )
var targetGroupLogicalName = regexp.MustCompile("(.*)(TCP|UDP)([0-9]+)TargetGroup")
func (b *Backend) Ps(ctx context.Context, options cli.ProjectOptions) ([]compose.ServiceStatus, error) { func (b *Backend) Ps(ctx context.Context, options cli.ProjectOptions) ([]compose.ServiceStatus, error) {
project, err := cli.ProjectFromOptions(&options) projectName, err := b.projectName(options)
if err != nil { if err != nil {
return nil, err return nil, err
} }
parameters, err := b.api.ListStackParameters(ctx, projectName)
resources, err := b.api.ListStackResources(ctx, project.Name)
if err != nil { if err != nil {
return nil, err return nil, err
} }
loadBalancer := parameters[ParameterLoadBalancerARN]
cluster := parameters[ParameterClusterName]
loadBalancer, err := b.GetLoadBalancer(ctx, project) resources, err := b.api.ListStackResources(ctx, projectName)
if err != nil {
return nil, err
}
cluster, err := b.GetCluster(ctx, project)
if err != nil { if err != nil {
return nil, err return nil, err
} }
servicesARN := []string{} servicesARN := []string{}
targetGroups := []string{}
for _, r := range resources { for _, r := range resources {
switch r.Type { switch r.Type {
case "AWS::ECS::Service": case "AWS::ECS::Service":
@ -38,9 +39,14 @@ func (b *Backend) Ps(ctx context.Context, options cli.ProjectOptions) ([]compose
cluster = r.ARN cluster = r.ARN
case "AWS::ElasticLoadBalancingV2::LoadBalancer": case "AWS::ElasticLoadBalancingV2::LoadBalancer":
loadBalancer = r.ARN loadBalancer = r.ARN
case "AWS::ElasticLoadBalancingV2::TargetGroup":
targetGroups = append(targetGroups, r.LogicalID)
} }
} }
if len(servicesARN) == 0 {
return nil, nil
}
status, err := b.api.DescribeServices(ctx, cluster, servicesARN) status, err := b.api.DescribeServices(ctx, cluster, servicesARN)
if err != nil { if err != nil {
return nil, err return nil, err
@ -52,13 +58,12 @@ func (b *Backend) Ps(ctx context.Context, options cli.ProjectOptions) ([]compose
} }
for i, state := range status { for i, state := range status {
s, err := project.GetService(state.Name)
if err != nil {
return nil, err
}
ports := []string{} ports := []string{}
for _, p := range s.Ports { for _, tg := range targetGroups {
ports = append(ports, fmt.Sprintf("%s:%d->%d/%s", url, p.Published, p.Target, p.Protocol)) groups := targetGroupLogicalName.FindStringSubmatch(tg)
if groups[0] == state.Name {
ports = append(ports, fmt.Sprintf("%s:%s->%s/%s", url, groups[2], groups[2], strings.ToLower(groups[1])))
}
} }
state.Ports = ports state.Ports = ports
status[i] = state status[i] = state

View File

@ -18,6 +18,7 @@ type API interface {
StackExists(ctx context.Context, name string) (bool, error) StackExists(ctx context.Context, name string) (bool, error)
CreateStack(ctx context.Context, name string, template *cloudformation.Template, parameters map[string]string) error CreateStack(ctx context.Context, name string, template *cloudformation.Template, parameters map[string]string) error
DeleteStack(ctx context.Context, name string) error DeleteStack(ctx context.Context, name string) error
ListStackParameters(ctx context.Context, name string) (map[string]string, error)
ListStackResources(ctx context.Context, name string) ([]compose.StackResource, error) ListStackResources(ctx context.Context, name string) ([]compose.StackResource, error)
GetStackID(ctx context.Context, name string) (string, error) GetStackID(ctx context.Context, name string) (string, error)
WaitStackComplete(ctx context.Context, name string, operation int) error WaitStackComplete(ctx context.Context, name string, operation int) error

View File

@ -238,6 +238,21 @@ func (s sdk) DescribeStackEvents(ctx context.Context, stackID string) ([]*cloudf
} }
} }
func (s sdk) ListStackParameters(ctx context.Context, name string) (map[string]string, error) {
st, err := s.CF.DescribeStacksWithContext(ctx, &cloudformation.DescribeStacksInput{
NextToken: nil,
StackName: aws.String(name),
})
if err != nil {
return nil, err
}
parameters := map[string]string{}
for _, parameter := range st.Stacks[0].Parameters {
parameters[*parameter.ParameterKey] = *parameter.ParameterValue
}
return parameters, nil
}
func (s sdk) ListStackResources(ctx context.Context, name string) ([]compose.StackResource, error) { func (s sdk) ListStackResources(ctx context.Context, name string) ([]compose.StackResource, error) {
// FIXME handle pagination // FIXME handle pagination
res, err := s.CF.ListStackResourcesWithContext(ctx, &cloudformation.ListStackResourcesInput{ res, err := s.CF.ListStackResourcesWithContext(ctx, &cloudformation.ListStackResourcesInput{