add support for security group filter type

configs/config.yaml

@@ -1,5 +1,6 @@
 syncInterval: 10s
 filter:
+  filterType: LoadBalancer
   labelName: whitelister
   labelValue: true
 ipProviders:

configs/testConfigs/configWithIncorrectFilterType.yaml

@@ -0,0 +1,19 @@
+syncInterval: 10s
+filter:
+  filterType: InCorrectType
+  labelName: whitelister
+  labelValue: true
+ipProviders:
+  - name: kubernetes
+    params:
+      FromPort: 0 
+      ToPort: 65535
+      IpProtocol: tcp
+provider:
+  name: aws
+  params:
+    KeepRuleDescriptionPrefix: "DO NOT REMOVE -"
+    RemoveRule: true
+    RoleArn: "arn:aws:iam::111111111111:role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling"
+    Region: us-west-2
+

configs/testConfigs/correctAwsGitConfig.yaml

@@ -1,5 +1,6 @@
 syncInterval: 10s
 filter:
+  filterType: LoadBalancer
   labelName: whitelister
   labelValue: true
 ipProviders:

configs/testConfigs/correctAwsGitConfigWithSG.yaml

@@ -0,0 +1,19 @@
+syncInterval: 10s
+filter:
+  filterType: SecurityGroup
+  labelName: whitelister
+  labelValue: true
+ipProviders:
+  - name: git
+    params:
+      AccessToken: "access-token"
+      URL: "http://github.com/stakater/whitelister-config.git"
+      Config: "config.yaml"
+provider:
+  name: aws
+  params:
+    KeepRuleDescriptionPrefix: "DO NOT REMOVE -"
+    RemoveRule: true
+    RoleArn: "arn:aws:iam::111111111111:role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling"
+    Region: us-west-2
+

configs/testConfigs/correctAwsKubernetesConfig.yaml

@@ -1,5 +1,6 @@
 syncInterval: 10s
 filter:
+  filterType: LoadBalancer
   labelName: whitelister
   labelValue: true
 ipProviders:

configs/testConfigs/noIpProviderConfig.yaml

@@ -1,4 +1,5 @@
 syncInterval: 10s
 filter:
+  filterType: LoadBalancer
   labelName: whitelister
   labelValue: true

configs/testConfigs/noProviderConfig.yaml

@@ -1,5 +1,6 @@
 syncInterval: 10s
 filter:
+  filterType: LoadBalancer
   labelName: whitelister
   labelValue: true
 ipProviders:

internal/pkg/config/config.go

@@ -10,10 +10,10 @@ import (
 
 // Config which would be read from the config.yaml
 type Config struct {
-	SyncInterval    string       `yaml:"syncInterval"`
-	IpProviders     []IpProvider `yaml:"ipProviders"`
-	Provider        Provider     `yaml:"provider"`
-	Filter          Filter       `yaml:"filter"`
+	SyncInterval string       `yaml:"syncInterval"`
+	IpProviders  []IpProvider `yaml:"ipProviders"`
+	Provider     Provider     `yaml:"provider"`
+	Filter       Filter       `yaml:"filter"`
 }
 
 // IpProvider that the controller will be using to gather whitelist IPs
@@ -30,8 +30,9 @@ type Provider struct {
 
 // Filter that will be used to filter resources on the provider
 type Filter struct {
-	LabelName  string `yaml:"labelName"`
-	LabelValue string `yaml:"labelValue"`
+	FilterType FilterType `yaml:"filterType"`
+	LabelName  string     `yaml:"labelName"`
+	LabelValue string     `yaml:"labelValue"`
 }
 
 // ReadConfig function that reads the yaml file

internal/pkg/config/config_test.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"errors"
 	"reflect"
 	"testing"
 )
@@ -14,10 +15,11 @@ func TestReadConfig(t *testing.T) {
 		filePath string
 	}
 	tests := []struct {
-		name    string
-		args    args
-		want    Config
-		wantErr bool
+		name     string
+		args     args
+		want     Config
+		wantErr  bool
+		errValue error
 	}{
 		{
 			name: "TestingWithCorrectValues",
@@ -44,15 +46,56 @@ func TestReadConfig(t *testing.T) {
 					},
 				},
 				Filter: Filter{
+					FilterType: LoadBalancer,
 					LabelName:  "whitelister",
 					LabelValue: "true",
 				},
 			},
+			wantErr: false,
 		},
 		{
-			name: "TestingWithEmptyFile",
-			args: args{filePath: configFilePath + "Empty.yaml"},
-			want: Config{},
+			name: "TestingWithCorrectValuesForSecurityGroupFilter",
+			args: args{filePath: configFilePath + "correctAwsGitConfigWithSG.yaml"},
+			want: Config{
+				SyncInterval: "10s",
+				IpProviders: []IpProvider{
+					{
+						Name: "git",
+						Params: map[interface{}]interface{}{
+							"AccessToken": "access-token",
+							"URL":         "http://github.com/stakater/whitelister-config.git",
+							"Config":      "config.yaml",
+						},
+					},
+				},
+				Provider: Provider{
+					Name: "aws",
+					Params: map[interface{}]interface{}{
+						"RoleArn":                   "arn:aws:iam::111111111111:role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling",
+						"Region":                    "us-west-2",
+						"RemoveRule":                true,
+						"KeepRuleDescriptionPrefix": "DO NOT REMOVE -",
+					},
+				},
+				Filter: Filter{
+					FilterType: SecurityGroup,
+					LabelName:  "whitelister",
+					LabelValue: "true",
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name:     "TestingWithIncorrectFilterType",
+			args:     args{filePath: configFilePath + "configWithIncorrectFilterType.yaml"},
+			wantErr:  true,
+			errValue: errors.New("incorrect FilterType :InCorrectType provided"),
+		},
+		{
+			name:    "TestingWithEmptyFile",
+			args:    args{filePath: configFilePath + "Empty.yaml"},
+			want:    Config{},
+			wantErr: false,
 		},
 		{
 			name:    "TestingWithFileNotPresent",
@@ -63,10 +106,17 @@ func TestReadConfig(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := ReadConfig(tt.args.filePath)
-			if (err != nil) != tt.wantErr {
+			if (err == nil && tt.wantErr) || (!tt.wantErr && err != nil) {
 				t.Errorf("ReadConfig() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
+			if err != nil && tt.wantErr && tt.errValue != nil {
+				if err.Error() != tt.errValue.Error() {
+					t.Errorf("ReadConfig() error %v, wantErr %v", err, tt.errValue)
+					return
+				}
+				return
+			}
 			if !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("ReadConfig() = %v, want %v", got, tt.want)
 			}

internal/pkg/config/filtertype.go

@@ -0,0 +1,56 @@
+package config
+
+import "fmt"
+
+type FilterType int
+
+const (
+	LoadBalancer FilterType = iota
+	SecurityGroup
+)
+
+var loadBalancerStr = "LoadBalancer"
+var securityGroupStr = "SecurityGroup"
+
+func (filterType FilterType) String() string {
+	filterTypes := [...]string{
+		loadBalancerStr,
+		securityGroupStr,
+	}
+
+	if filterType < LoadBalancer || filterType > SecurityGroup {
+		return "Unknown"
+	}
+
+	return filterTypes[filterType]
+}
+
+func toFilterType(filterTypeStr string) (filterType FilterType, err error) {
+	switch filterTypeStr {
+	case loadBalancerStr:
+		filterType = LoadBalancer
+
+	case securityGroupStr:
+		filterType = SecurityGroup
+
+	default:
+		err = fmt.Errorf("incorrect FilterType :%s provided", filterTypeStr)
+	}
+	return
+}
+
+func (filterType *FilterType) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	var value string
+
+	if err := unmarshal(&value); err != nil {
+		return err
+	}
+
+	FilterType, err := toFilterType(value)
+	if err != nil {
+		return err
+	}
+	*filterType = FilterType
+
+	return nil
+}

internal/pkg/controller/controller.go

@@ -32,7 +32,7 @@ func NewController(clientset clientset.Interface, config config.Config) (*Contro
 	if len(controller.ipProviders) == 0 {
 		return nil, errors.New("No Ip Provider specified")
 	}
-	controller.provider = providers.PopulateFromConfig(config.Provider)
+	controller.provider = providers.PopulateFromConfig(config.Provider, clientset)
 	if controller.provider == nil {
 		return nil, errors.New("No Provider specified")
 	}