Merge pull request #309 from weaveworks/decouple-provider-and-cluster

Clear separation between `api.ClusterConfig` and `api.ClusterProvider`

pkg/ami/auto_resolver_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/stretchr/testify/mock"
 	. "github.com/weaveworks/eksctl/pkg/ami"
 	"github.com/weaveworks/eksctl/pkg/eks"
-	"github.com/weaveworks/eksctl/pkg/eks/api"
 	"github.com/weaveworks/eksctl/pkg/testutils"
 )
 
@@ -170,9 +169,6 @@ func createProviders() (*eks.ClusterProvider, *testutils.MockProvider) {
 
 	c := &eks.ClusterProvider{
 		Provider: p,
-		Spec: &api.ClusterConfig{
-			Region: "eu-west-1",
-		},
 	}
 
 	return c, p

pkg/az/az_test.go

@@ -5,7 +5,6 @@ import (
 
 	. "github.com/weaveworks/eksctl/pkg/az"
 	"github.com/weaveworks/eksctl/pkg/eks"
-	"github.com/weaveworks/eksctl/pkg/eks/api"
 	"github.com/weaveworks/eksctl/pkg/testutils"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -255,9 +254,6 @@ func createProviders() (*eks.ClusterProvider, *testutils.MockProvider) {
 
 	c := &eks.ClusterProvider{
 		Provider: p,
-		Spec: &api.ClusterConfig{
-			Region: "us-west-1",
-		},
 	}
 
 	return c, p

pkg/cfn/builder/api_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/weaveworks/eksctl/pkg/eks"
 	"github.com/weaveworks/eksctl/pkg/eks/api"
 	"github.com/weaveworks/eksctl/pkg/nodebootstrap"
+	"github.com/weaveworks/eksctl/pkg/testutils"
 )
 
 const (
@@ -105,8 +106,8 @@ var _ = Describe("CloudFormation template builder API", func() {
 		cfg := api.NewClusterConfig()
 		ng := cfg.NewNodeGroup()
 
-		cfg.Region = "us-west-2"
-		cfg.ClusterName = clusterName
+		cfg.Metadata.Region = "us-west-2"
+		cfg.Metadata.Name = clusterName
 		cfg.AvailabilityZones = testAZs
 		ng.InstanceType = "t2.medium"
 		ng.AMIFamily = "AmazonLinux2"
@@ -121,8 +122,10 @@ var _ = Describe("CloudFormation template builder API", func() {
 		It("should not error", func() { Expect(err).ShouldNot(HaveOccurred()) })
 
 		expected := &api.ClusterConfig{
-			Region:                   "us-west-2",
-			ClusterName:              clusterName,
+			Metadata: &api.ClusterMeta{
+				Region: "us-west-2",
+				Name:   clusterName,
+			},
 			Endpoint:                 endpoint,
 			CertificateAuthorityData: caCertData,
 			ARN:                      arn,
@@ -197,10 +200,10 @@ var _ = Describe("CloudFormation template builder API", func() {
 		}
 
 		cfg := newClusterConfig()
-		ctl := eks.New(cfg)
+		ctl := eks.New(testutils.ProviderConfig, cfg)
 
 		It("should not error when calling SetSubnets", func() {
-			err := ctl.SetSubnets()
+			err := ctl.SetSubnets(cfg)
 			Expect(err).ShouldNot(HaveOccurred())
 		})
 
@@ -286,8 +289,8 @@ var _ = Describe("CloudFormation template builder API", func() {
 		cfg := api.NewClusterConfig()
 		ng := cfg.NewNodeGroup()
 
-		cfg.Region = "us-west-2"
-		cfg.ClusterName = clusterName
+		cfg.Metadata.Region = "us-west-2"
+		cfg.Metadata.Name = clusterName
 		cfg.AvailabilityZones = testAZs
 		ng.InstanceType = "t2.medium"
 
@@ -359,8 +362,8 @@ var _ = Describe("CloudFormation template builder API", func() {
 		cfg := api.NewClusterConfig()
 		ng := cfg.NewNodeGroup()
 
-		cfg.Region = "us-west-2"
-		cfg.ClusterName = clusterName
+		cfg.Metadata.Region = "us-west-2"
+		cfg.Metadata.Name = clusterName
 		cfg.AvailabilityZones = testAZs
 		ng.AllowSSH = true
 		ng.InstanceType = "t2.medium"
@@ -410,8 +413,8 @@ var _ = Describe("CloudFormation template builder API", func() {
 		cfg := api.NewClusterConfig()
 		ng := cfg.NewNodeGroup()
 
-		cfg.Region = "us-west-2"
-		cfg.ClusterName = clusterName
+		cfg.Metadata.Region = "us-west-2"
+		cfg.Metadata.Name = clusterName
 		cfg.AvailabilityZones = testAZs
 		ng.AllowSSH = true
 		ng.InstanceType = "t2.medium"
@@ -463,8 +466,8 @@ var _ = Describe("CloudFormation template builder API", func() {
 		cfg := api.NewClusterConfig()
 		ng := cfg.NewNodeGroup()
 
-		cfg.Region = "us-west-2"
-		cfg.ClusterName = clusterName
+		cfg.Metadata.Region = "us-west-2"
+		cfg.Metadata.Name = clusterName
 		cfg.AvailabilityZones = testAZs
 		cfg.VPC = &api.ClusterVPC{
 			Network: api.Network{

pkg/cfn/builder/cluster.go

@@ -79,7 +79,7 @@ func (c *ClusterResourceSet) addResourcesForControlPlane(version string) {
 	}
 
 	c.newResource("ControlPlane", &gfn.AWSEKSCluster{
-		Name:               gfn.NewString(c.spec.ClusterName),
+		Name:               gfn.NewString(c.spec.Metadata.Name),
 		RoleArn:            gfn.MakeFnGetAttString("ServiceRole.Arn"),
 		Version:            gfn.NewString(version),
 		ResourcesVpcConfig: clusterVPC,

pkg/cfn/builder/nodegroup.go

@@ -33,7 +33,7 @@ func NewNodeGroupResourceSet(spec *api.ClusterConfig, clusterStackName string, i
 		rs:               newResourceSet(),
 		id:               id,
 		clusterStackName: clusterStackName,
-		nodeGroupName:    fmt.Sprintf("%s-%d", spec.ClusterName, id),
+		nodeGroupName:    fmt.Sprintf("%s-%d", spec.Metadata.Name, id),
 		clusterSpec:      spec,
 		spec:             spec.NodeGroups[id],
 	}
@@ -156,7 +156,7 @@ func (n *NodeGroupResourceSet) addResourcesForNodeGroup() error {
 			"VPCZoneIdentifier":       vpcZoneIdentifier,
 			"Tags": []map[string]interface{}{
 				{"Key": "Name", "Value": fmt.Sprintf("%s-Node", n.nodeGroupName), "PropagateAtLaunch": "true"},
-				{"Key": "kubernetes.io/cluster/" + n.clusterSpec.ClusterName, "Value": "owned", "PropagateAtLaunch": "true"},
+				{"Key": "kubernetes.io/cluster/" + n.clusterSpec.Metadata.Name, "Value": "owned", "PropagateAtLaunch": "true"},
 			},
 		},
 		UpdatePolicy: map[string]map[string]string{

pkg/cfn/builder/vpc.go

@@ -129,7 +129,7 @@ func (n *NodeGroupResourceSet) addResourcesForSecurityGroups() {
 		VpcId:            makeImportValue(n.clusterStackName, cfnOutputClusterVPC),
 		GroupDescription: gfn.NewString("Communication between the control plane and " + desc),
 		Tags: []gfn.Tag{{
-			Key:   gfn.NewString("kubernetes.io/cluster/" + n.clusterSpec.ClusterName),
+			Key:   gfn.NewString("kubernetes.io/cluster/" + n.clusterSpec.Metadata.Name),
 			Value: gfn.NewString("owned"),
 		}},
 	})

pkg/cfn/manager/api.go

@@ -36,9 +36,10 @@ type ChangeSet = cloudformation.DescribeChangeSetOutput
 
 // StackCollection stores the CloudFormation stack information
 type StackCollection struct {
-	cfn  cloudformationiface.CloudFormationAPI
-	spec *api.ClusterConfig
-	tags []*cloudformation.Tag
+	cfn         cloudformationiface.CloudFormationAPI
+	waitTimeout time.Duration
+	spec        *api.ClusterConfig
+	tags        []*cloudformation.Tag
 }
 
 func newTag(key, value string) *cloudformation.Tag {
@@ -48,16 +49,17 @@ func newTag(key, value string) *cloudformation.Tag {
 // NewStackCollection create a stack manager for a single cluster
 func NewStackCollection(provider api.ClusterProvider, spec *api.ClusterConfig) *StackCollection {
 	tags := []*cloudformation.Tag{
-		newTag(ClusterNameTag, spec.ClusterName),
+		newTag(ClusterNameTag, spec.Metadata.Name),
 	}
-	for key, value := range spec.Tags {
+	for key, value := range spec.Metadata.Tags {
 		tags = append(tags, newTag(key, value))
 	}
 	logger.Debug("tags = %#v", tags)
 	return &StackCollection{
-		cfn:  provider.CloudFormation(),
-		spec: spec,
-		tags: tags,
+		cfn:         provider.CloudFormation(),
+		waitTimeout: provider.WaitTimeout(),
+		spec:        spec,
+		tags:        tags,
 	}
 }
 
@@ -203,7 +205,7 @@ func (c *StackCollection) DeleteStack(name string) (*Stack, error) {
 	}
 	i.StackId = s.StackId
 	for _, tag := range s.Tags {
-		if *tag.Key == ClusterNameTag && *tag.Value == c.spec.ClusterName {
+		if *tag.Key == ClusterNameTag && *tag.Value == c.spec.Metadata.Name {
 			input := &cloudformation.DeleteStackInput{
 				StackName: i.StackId,
 			}
@@ -217,7 +219,7 @@ func (c *StackCollection) DeleteStack(name string) (*Stack, error) {
 	}
 
 	return nil, fmt.Errorf("cannot delete stack %q as it doesn't bare our %q tag", *s.StackName,
-		fmt.Sprintf("%s:%s", ClusterNameTag, c.spec.ClusterName))
+		fmt.Sprintf("%s:%s", ClusterNameTag, c.spec.Metadata.Name))
 }
 
 // WaitDeleteStack kills a stack by name and waits for DELETED status

pkg/cfn/manager/cluster.go

@@ -7,7 +7,7 @@ import (
 )
 
 func (c *StackCollection) makeClusterStackName() string {
-	return "eksctl-" + c.spec.ClusterName + "-cluster"
+	return "eksctl-" + c.spec.Metadata.Name + "-cluster"
 }
 
 // CreateCluster creates the cluster

pkg/cfn/manager/deprecated.go

@@ -3,7 +3,7 @@ package manager
 // DeprecatedDeleteStackVPC deletes the VPC stack
 func (c *StackCollection) DeprecatedDeleteStackVPC(wait bool) error {
 	var err error
-	stackName := "EKS-" + c.spec.ClusterName + "-VPC"
+	stackName := "EKS-" + c.spec.Metadata.Name + "-VPC"
 
 	if wait {
 		err = c.WaitDeleteStack(stackName)
@@ -17,7 +17,7 @@ func (c *StackCollection) DeprecatedDeleteStackVPC(wait bool) error {
 // DeprecatedDeleteStackServiceRole deletes the service role stack
 func (c *StackCollection) DeprecatedDeleteStackServiceRole(wait bool) error {
 	var err error
-	stackName := "EKS-" + c.spec.ClusterName + "-ServiceRole"
+	stackName := "EKS-" + c.spec.Metadata.Name + "-ServiceRole"
 
 	if wait {
 		err = c.WaitDeleteStack(stackName)
@@ -31,7 +31,7 @@ func (c *StackCollection) DeprecatedDeleteStackServiceRole(wait bool) error {
 // DeprecatedDeleteStackDefaultNodeGroup deletes the default node group stack
 func (c *StackCollection) DeprecatedDeleteStackDefaultNodeGroup(wait bool) error {
 	var err error
-	stackName := "EKS-" + c.spec.ClusterName + "-DefaultNodeGroup"
+	stackName := "EKS-" + c.spec.Metadata.Name + "-DefaultNodeGroup"
 
 	if wait {
 		err = c.WaitDeleteStack(stackName)
@@ -45,7 +45,7 @@ func (c *StackCollection) DeprecatedDeleteStackDefaultNodeGroup(wait bool) error
 // DeprecatedDeleteStackControlPlane deletes the control plane stack
 func (c *StackCollection) DeprecatedDeleteStackControlPlane(wait bool) error {
 	var err error
-	stackName := "EKS-" + c.spec.ClusterName + "-ControlPlane"
+	stackName := "EKS-" + c.spec.Metadata.Name + "-ControlPlane"
 
 	if wait {
 		err = c.WaitDeleteStack(stackName)

pkg/cfn/manager/nodegroup.go

@@ -22,7 +22,7 @@ const (
 )
 
 func (c *StackCollection) makeNodeGroupStackName(id int) string {
-	return fmt.Sprintf("eksctl-%s-nodegroup-%d", c.spec.ClusterName, id)
+	return fmt.Sprintf("eksctl-%s-nodegroup-%d", c.spec.Metadata.Name, id)
 }
 
 // CreateNodeGroup creates the nodegroup
@@ -45,7 +45,7 @@ func (c *StackCollection) CreateNodeGroup(errs chan error, data interface{}) err
 }
 
 func (c *StackCollection) listAllNodeGroups() ([]string, error) {
-	stacks, err := c.ListStacks(fmt.Sprintf("^eksctl-%s-nodegroup-\\d$", c.spec.ClusterName))
+	stacks, err := c.ListStacks(fmt.Sprintf("^eksctl-%s-nodegroup-\\d$", c.spec.Metadata.Name))
 	if err != nil {
 		return nil, err
 	}

pkg/cfn/manager/waiters.go

@@ -73,7 +73,7 @@ func (c *StackCollection) waitWithAcceptors(i *Stack, acceptors []request.Waiter
 	desiredStatus := fmt.Sprintf("%v", acceptors[0].Expected)
 	msg := fmt.Sprintf("waiting for CloudFormation stack %q to reach %q status", *i.StackName, desiredStatus)
 
-	ctx, cancel := context.WithTimeout(context.Background(), c.spec.WaitTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), c.waitTimeout)
 	defer cancel()
 
 	startTime := time.Now()
@@ -118,7 +118,7 @@ func (c *StackCollection) waitWithAcceptors(i *Stack, acceptors []request.Waiter
 func (c *StackCollection) waitWithAcceptorsChangeSet(i *Stack, changesetName *string, acceptors []request.WaiterAcceptor) error {
 	desiredStatus := fmt.Sprintf("%v", acceptors[0].Expected)
 	msg := fmt.Sprintf("waiting for CloudFormation changeset %q for stack %q to reach %q status", *changesetName, *i.StackName, desiredStatus)
-	ctx, cancel := context.WithTimeout(context.Background(), c.spec.WaitTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), c.waitTimeout)
 	defer cancel()
 	startTime := time.Now()
 	w := request.Waiter{