tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

move to sdk

Browse Source 
Signed-off-by: aiordache <anca.iordache@docker.com>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
aiordache 2020-04-28 14:33:40 +02:00 committed by Nicolas De Loof
parent 95c88acfb4
commit cec44fbb7b
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ecs/pkg/amazon/cloudformation.go
View File

@ -1,7 +1,11 @@
package amazon package amazon
import ( import (
<<<<<<< HEAD
"context" "context"
=======
"errors"
>>>>>>> a0701b8... move to sdk
"fmt" "fmt"
"strings" "strings"
@ -18,7 +22,7 @@ import (
func (c client) Convert(ctx context.Context, project *compose.Project) (*cloudformation.Template, error) { func (c client) Convert(ctx context.Context, project *compose.Project) (*cloudformation.Template, error) {
template := cloudformation.NewTemplate() template := cloudformation.NewTemplate()
vpc, err := c.api.GetDefaultVPC(ctx) vpc, err := c.GetVPC(ctx, project)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -83,6 +87,28 @@ func (c client) Convert(ctx context.Context, project *compose.Project) (*cloudfo
return template, nil return template, nil
} }
func (c client) GetVPC(project *compose.Project) (string, error) {
//check compose file for the default external network
if net, ok := project.Networks["default"]; ok {
if net.External.External {
vpc := net.Name
ok, err := c.api.VpcExists(vpc)
if err != nil {
return "", err
}
if !ok {
return "", errors.New("Vpc does not exist: " + vpc)
}
return vpc, nil
}
}
defaultVPC, err := c.api.GetDefaultVPC()
if err != nil {
return "", err
}
return defaultVPC, nil
}
const ECSTaskExecutionPolicy = "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy" const ECSTaskExecutionPolicy = "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy"
var defaultTaskExecutionRole string var defaultTaskExecutionRole string
@ -118,6 +144,7 @@ func (c client) GetEcsTaskExecutionRole(ctx context.Context, spec types.ServiceC
type convertAPI interface { type convertAPI interface {
GetDefaultVPC(ctx context.Context) (string, error) GetDefaultVPC(ctx context.Context) (string, error)
VpcExists(ctx context.Context, vpcID string) (bool, error)
GetSubNets(ctx context.Context, vpcID string) ([]string, error) GetSubNets(ctx context.Context, vpcID string) ([]string, error)
ListRolesForPolicy(ctx context.Context, policy string) ([]string, error) ListRolesForPolicy(ctx context.Context, policy string) ([]string, error)
GetRoleArn(ctx context.Context, name string) (string, error) GetRoleArn(ctx context.Context, name string) (string, error)

6
ecs/pkg/amazon/sdk.go
View File

@ -75,6 +75,12 @@ func (s sdk) DeleteCluster(ctx context.Context, name string) error {
return fmt.Errorf("Failed to delete cluster, status: %s" + *response.Cluster.Status) return fmt.Errorf("Failed to delete cluster, status: %s" + *response.Cluster.Status)
} }
func (s sdk) VpcExists(ctx context.Context, vpcID string) (bool, error) {
logrus.Debug("Check if VPC exists: ", vpcID)
_, err := s.EC2.DescribeVpcsWithContext(aws.Context(ctx), &ec2.DescribeVpcsInput{VpcIds: []*string{&vpcID}})
return err == nil, err
}
func (s sdk) GetDefaultVPC(ctx context.Context) (string, error) { func (s sdk) GetDefaultVPC(ctx context.Context) (string, error) {
logrus.Debug("Retrieve default VPC") logrus.Debug("Retrieve default VPC")
vpcs, err := s.EC2.DescribeVpcsWithContext(aws.Context(ctx), &ec2.DescribeVpcsInput{ vpcs, err := s.EC2.DescribeVpcsWithContext(aws.Context(ctx), &ec2.DescribeVpcsInput{