mirror of
https://github.com/docker/compose.git
synced 2025-07-23 21:54:40 +02:00
yet another rebase
Signed-off-by: aiordache <anca.iordache@docker.com> Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
parent
cec44fbb7b
commit
4a6fec63d2
@ -1,11 +1,8 @@
|
|||||||
package amazon
|
package amazon
|
||||||
|
|
||||||
import (
|
import (
|
||||||
<<<<<<< HEAD
|
|
||||||
"context"
|
"context"
|
||||||
=======
|
|
||||||
"errors"
|
"errors"
|
||||||
>>>>>>> a0701b8... move to sdk
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@ -87,12 +84,12 @@ 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) {
|
func (c client) GetVPC(ctx context.Context, project *compose.Project) (string, error) {
|
||||||
//check compose file for the default external network
|
//check compose file for the default external network
|
||||||
if net, ok := project.Networks["default"]; ok {
|
if net, ok := project.Networks["default"]; ok {
|
||||||
if net.External.External {
|
if net.External.External {
|
||||||
vpc := net.Name
|
vpc := net.Name
|
||||||
ok, err := c.api.VpcExists(vpc)
|
ok, err := c.api.VpcExists(ctx, vpc)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
@ -102,7 +99,7 @@ func (c client) GetVPC(project *compose.Project) (string, error) {
|
|||||||
return vpc, nil
|
return vpc, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
defaultVPC, err := c.api.GetDefaultVPC()
|
defaultVPC, err := c.api.GetDefaultVPC(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user