Use DescribeInstance to retrieve filtered AWS instances

initial implementation for issue #28

Author: trjstewart

Gopkg.lock

@@ -7,18 +7,15 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/autoscaling"
-	"github.com/aws/aws-sdk-go/service/autoscaling/autoscalingiface"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	yaml "gopkg.in/yaml.v2"
 )
 
 // AWSClient allows you to get the list of IP addresses of instanes of an Auto Scaling group. It implements the CloudProvider interface
 type AWSClient struct {
-	svcEC2         ec2iface.EC2API
-	svcAutoscaling autoscalingiface.AutoScalingAPI
-	config         *awsConfig
+	svcEC2 ec2iface.EC2API
+	config *awsConfig
 }
 
 // NewAWSClient creates and configures an AWSClient
@@ -64,10 +61,8 @@ func (client *AWSClient) configure() error {
 		return err
 	}
 
-	svcAutoscaling := autoscaling.New(session)
 	svcEC2 := ec2.New(session)
 	client.svcEC2 = svcEC2
-	client.svcAutoscaling = svcAutoscaling
 	return nil
 }
 
@@ -89,79 +84,58 @@ func parseAWSConfig(data []byte) (*awsConfig, error) {
 
 // CheckIfScalingGroupExists checks if the Auto Scaling group exists
 func (client *AWSClient) CheckIfScalingGroupExists(name string) (bool, error) {
-	_, exists, err := client.getAutoscalingGroup(name)
-	if err != nil {
-		return exists, fmt.Errorf("couldn't check if an AutoScaling group exists: %v", err)
-	}
-	return exists, nil
-}
-
-// GetPrivateIPsForScalingGroup returns the list of IP addresses of instances of the Auto Scaling group
-func (client *AWSClient) GetPrivateIPsForScalingGroup(name string) ([]string, error) {
-	group, exists, err := client.getAutoscalingGroup(name)
-	if err != nil {
-		return nil, err
-	}
-
-	if !exists {
-		return nil, fmt.Errorf("autoscaling group %v doesn't exist", name)
+	params := &ec2.DescribeInstancesInput{
+		Filters: []*ec2.Filter{
+			&ec2.Filter{
+				Name: aws.String("tag:aws:autoscaling:groupName"),
+				Values: []*string{
+					aws.String(name),
+				},
+			},
+		},
 	}
 
-	instances, err := client.getInstancesOfAutoscalingGroup(group)
+	response, err := client.svcEC2.DescribeInstances(params)
 	if err != nil {
-		return nil, err
+		return false, fmt.Errorf("couldn't check if an AutoScaling group exists: %v", err)
 	}
 
-	var result []string
-	for _, ins := range instances {
-		if len(ins.NetworkInterfaces) > 0 && ins.NetworkInterfaces[0].PrivateIpAddress != nil {
-			result = append(result, *ins.NetworkInterfaces[0].PrivateIpAddress)
-		}
+	if len(response.Reservations) == 0 {
+		return false, nil
 	}
 
-	return result, nil
+	return true, nil
 }
 
-func (client *AWSClient) getAutoscalingGroup(name string) (*autoscaling.Group, bool, error) {
-	params := &autoscaling.DescribeAutoScalingGroupsInput{
-		AutoScalingGroupNames: []*string{
-			aws.String(name),
+// GetPrivateIPsForScalingGroup returns the list of IP addresses of instances of the Auto Scaling group
+func (client *AWSClient) GetPrivateIPsForScalingGroup(name string) ([]string, error) {
+	params := &ec2.DescribeInstancesInput{
+		Filters: []*ec2.Filter{
+			&ec2.Filter{
+				Name: aws.String("tag:aws:autoscaling:groupName"),
+				Values: []*string{
+					aws.String(name),
+				},
+			},
 		},
 	}
 
-	resp, err := client.svcAutoscaling.DescribeAutoScalingGroups(params)
+	response, err := client.svcEC2.DescribeInstances(params)
 	if err != nil {
-		return nil, false, err
-	}
-
-	if len(resp.AutoScalingGroups) != 1 {
-		return nil, false, nil
-	}
-
-	return resp.AutoScalingGroups[0], true, nil
-}
-
-func (client *AWSClient) getInstancesOfAutoscalingGroup(group *autoscaling.Group) ([]*ec2.Instance, error) {
-	var result []*ec2.Instance
-
-	if len(group.Instances) == 0 {
-		return result, nil
+		return nil, err
 	}
 
-	var ids []*string
-	for _, ins := range group.Instances {
-		ids = append(ids, ins.InstanceId)
-	}
-	params := &ec2.DescribeInstancesInput{
-		InstanceIds: ids,
+	if len(response.Reservations) == 0 {
+		return nil, fmt.Errorf("autoscaling group %v doesn't exist", name)
 	}
 
-	resp, err := client.svcEC2.DescribeInstances(params)
-	if err != nil {
-		return result, err
-	}
-	for _, res := range resp.Reservations {
-		result = append(result, res.Instances...)
+	var result []string
+	for _, res := range response.Reservations {
+		for _, ins := range res.Instances {
+			if len(ins.NetworkInterfaces) > 0 && ins.NetworkInterfaces[0].PrivateIpAddress != nil {
+				result = append(result, *ins.NetworkInterfaces[0].PrivateIpAddress)
+			}
+		}
 	}
 
 	return result, nil

cmd/sync/aws.go

@@ -26,6 +26,10 @@ upstreams:
    autoscaling_group: backend-two-group
    port: 80
    kind: http
+ - name: backend
+   autoscaling_group: backend-*
+   port: 80
+   kind: http
 ```
 
 * The `api_endpoint` key defines the NGINX Plus API endpoint.
@@ -34,6 +38,6 @@ upstreams:
 * The `region` key defines the AWS region where we deploy NGINX Plus and the Auto Scaling groups.
 * The `upstreams` key defines the list of upstream groups. For each upstream group we specify:
   * `name` – The name we specified for the upstream block in the NGINX Plus configuration.
-  * `autoscaling_group` – The name of the corresponding Auto Scaling group.
+  * `autoscaling_group` – The name of the corresponding Auto Scaling group. Use of wildcards is supported.
   * `port` – The port on which our backend applications are exposed.
-  * `kind` – The protocol of the traffic NGINX Plus load balances to the backend application, here `http`. If the application uses TCP/UDP, specify `stream` instead.
+  * `kind` – The protocol of the traffic NGINX Plus load balances to the backend application, here `http`. If the application uses TCP/UDP, specify `stream` instead.