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