Updated feature gates doc and key name

haouc · haouc · commit 721523e9e6ff · 2021-11-24T12:56:20.000-08:00
diff --git a/docs/deploy/configurations.md b/docs/deploy/configurations.md
@@ -133,8 +133,9 @@ If running on EC2, the default values are obtained from the instance metadata se
 
 
 ### Feature Gates
-This is a controller to enable and disable features. You can use it as flags `--feature-gates=key1=value1,key2=value2`
-|Features-gate Supported Key             | Type                            | Default Value   | Description |
+They are a set of kye=value pairs that describe AWS load balance controller features. You can use it as flags `--feature-gates=key1=value1,key2=value2`
+
+|Features-gate Supported Key            | Type                            | Default Value   | Description |
 |---------------------------------------|---------------------------------|-----------------|-------------|
-|EnableListenerRulesTagging             | string                          | true            | Enable or disable tagging AWS load balancer listeners and rules |
-|EnableWeightedTargetGroups             | string                          | true            | Enable or disable weighted target groups |
+|ListenerRulesTagging                   | string                          | true            | Enable or disable tagging AWS load balancer listeners and rules |
+|WeightedTargetGroups                   | string                          | true            | Enable or disable weighted target groups |
diff --git a/pkg/config/feature_gates.go b/pkg/config/feature_gates.go
@@ -10,8 +10,8 @@ import (
 type Feature string
 
 const (
-	EnableListenerRulesTagging Feature = "EnableListenerRulesTagging"
-	EnableWeightedTargetGroups Feature = "EnableWeightedTargetGroups"
+	ListenerRulesTagging Feature = "ListenerRulesTagging"
+	WeightedTargetGroups Feature = "WeightedTargetGroups"
 )
 
 type FeatureGates interface {
@@ -39,8 +39,8 @@ type defaultFeatureGates struct {
 func NewFeatureGates() FeatureGates {
 	return &defaultFeatureGates{
 		featureState: map[Feature]bool{
-			EnableListenerRulesTagging: true,
-			EnableWeightedTargetGroups: true,
+			ListenerRulesTagging: true,
+			WeightedTargetGroups: true,
 		},
 	}
 }
diff --git a/pkg/deploy/elbv2/listener_manager.go b/pkg/deploy/elbv2/listener_manager.go
@@ -62,7 +62,7 @@ func (m *defaultListenerManager) Create(ctx context.Context, resLS *elbv2model.L
 		return elbv2model.ListenerStatus{}, err
 	}
 	var lsTags map[string]string
-	if m.featureGates.Enabled(config.EnableListenerRulesTagging) {
+	if m.featureGates.Enabled(config.ListenerRulesTagging) {
 		lsTags = m.trackingProvider.ResourceTags(resLS.Stack(), resLS, resLS.Spec.Tags)
 	}
 	req.Tags = convertTagsToSDKTags(lsTags)
@@ -92,7 +92,7 @@ func (m *defaultListenerManager) Create(ctx context.Context, resLS *elbv2model.L
 }
 
 func (m *defaultListenerManager) Update(ctx context.Context, resLS *elbv2model.Listener, sdkLS ListenerWithTags) (elbv2model.ListenerStatus, error) {
-	if m.featureGates.Enabled(config.EnableListenerRulesTagging) {
+	if m.featureGates.Enabled(config.ListenerRulesTagging) {
 		if err := m.updateSDKListenerWithTags(ctx, resLS, sdkLS); err != nil {
 			return elbv2model.ListenerStatus{}, err
 		}
diff --git a/pkg/deploy/elbv2/listener_rule_manager.go b/pkg/deploy/elbv2/listener_rule_manager.go
@@ -59,7 +59,7 @@ func (m *defaultListenerRuleManager) Create(ctx context.Context, resLR *elbv2mod
 		return elbv2model.ListenerRuleStatus{}, err
 	}
 	var ruleTags map[string]string
-	if m.featureGates.Enabled(config.EnableListenerRulesTagging) {
+	if m.featureGates.Enabled(config.ListenerRulesTagging) {
 		ruleTags = m.trackingProvider.ResourceTags(resLR.Stack(), resLR, resLR.Spec.Tags)
 	}
 	req.Tags = convertTagsToSDKTags(ruleTags)
@@ -90,7 +90,7 @@ func (m *defaultListenerRuleManager) Create(ctx context.Context, resLR *elbv2mod
 }
 
 func (m *defaultListenerRuleManager) Update(ctx context.Context, resLR *elbv2model.ListenerRule, sdkLR ListenerRuleWithTags) (elbv2model.ListenerRuleStatus, error) {
-	if m.featureGates.Enabled(config.EnableListenerRulesTagging) {
+	if m.featureGates.Enabled(config.ListenerRulesTagging) {
 		if err := m.updateSDKListenerRuleWithTags(ctx, resLR, sdkLR); err != nil {
 			return elbv2model.ListenerRuleStatus{}, err
 		}
diff --git a/pkg/deploy/elbv2/listener_utils.go b/pkg/deploy/elbv2/listener_utils.go
@@ -52,7 +52,7 @@ func buildSDKAction(modelAction elbv2model.Action, featureGates config.FeatureGa
 		if err != nil {
 			return nil, err
 		}
-		if !featureGates.Enabled(config.EnableWeightedTargetGroups) {
+		if !featureGates.Enabled(config.WeightedTargetGroups) {
 			if len(forwardConfig.TargetGroups) == 1 {
 				sdkObj.TargetGroupArn = forwardConfig.TargetGroups[0].TargetGroupArn
 			} else {
diff --git a/pkg/deploy/elbv2/tagging_manager.go b/pkg/deploy/elbv2/tagging_manager.go
@@ -187,7 +187,7 @@ func (m *defaultTaggingManager) ListListeners(ctx context.Context, lbARN string)
 		lsByARN[lsARN] = listener
 	}
 	var tagsByARN map[string]map[string]string
-	if m.featureGates.Enabled(config.EnableListenerRulesTagging) {
+	if m.featureGates.Enabled(config.ListenerRulesTagging) {
 		tagsByARN, err = m.describeResourceTags(ctx, lsARNs)
 		if err != nil {
 			return nil, err
@@ -220,7 +220,7 @@ func (m *defaultTaggingManager) ListListenerRules(ctx context.Context, lsARN str
 		lrByARN[lrARN] = rule
 	}
 	var tagsByARN map[string]map[string]string
-	if m.featureGates.Enabled(config.EnableListenerRulesTagging) {
+	if m.featureGates.Enabled(config.ListenerRulesTagging) {
 		tagsByARN, err = m.describeResourceTags(ctx, lrARNs)
 		if err != nil {
 			return nil, err

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`type Feature string`
`11`	`11`
`12`	`12`	`const (`
`13`		`- EnableListenerRulesTagging Feature = "EnableListenerRulesTagging"`
`14`		`- EnableWeightedTargetGroups Feature = "EnableWeightedTargetGroups"`
	`13`	`+ ListenerRulesTagging Feature = "ListenerRulesTagging"`
	`14`	`+ WeightedTargetGroups Feature = "WeightedTargetGroups"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`type FeatureGates interface {`
`@@ -39,8 +39,8 @@ type defaultFeatureGates struct {`
`39`	`39`	`func NewFeatureGates() FeatureGates {`
`40`	`40`	`return &defaultFeatureGates{`
`41`	`41`	`featureState: map[Feature]bool{`
`42`		`- EnableListenerRulesTagging: true,`
`43`		`- EnableWeightedTargetGroups: true,`
	`42`	`+ ListenerRulesTagging: true,`
	`43`	`+ WeightedTargetGroups: true,`
`44`	`44`	`},`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (m defaultListenerManager) Create(ctx context.Context, resLS elbv2model.L`
`62`	`62`	`return elbv2model.ListenerStatus{}, err`
`63`	`63`	`}`
`64`	`64`	`var lsTags map[string]string`
`65`		`- if m.featureGates.Enabled(config.EnableListenerRulesTagging) {`
	`65`	`+ if m.featureGates.Enabled(config.ListenerRulesTagging) {`
`66`	`66`	`lsTags = m.trackingProvider.ResourceTags(resLS.Stack(), resLS, resLS.Spec.Tags)`
`67`	`67`	`}`
`68`	`68`	`req.Tags = convertTagsToSDKTags(lsTags)`
`@@ -92,7 +92,7 @@ func (m defaultListenerManager) Create(ctx context.Context, resLS elbv2model.L`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`func (m defaultListenerManager) Update(ctx context.Context, resLS elbv2model.Listener, sdkLS ListenerWithTags) (elbv2model.ListenerStatus, error) {`
`95`		`- if m.featureGates.Enabled(config.EnableListenerRulesTagging) {`
	`95`	`+ if m.featureGates.Enabled(config.ListenerRulesTagging) {`
`96`	`96`	`if err := m.updateSDKListenerWithTags(ctx, resLS, sdkLS); err != nil {`
`97`	`97`	`return elbv2model.ListenerStatus{}, err`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func (m defaultListenerRuleManager) Create(ctx context.Context, resLR elbv2mod`
`59`	`59`	`return elbv2model.ListenerRuleStatus{}, err`
`60`	`60`	`}`
`61`	`61`	`var ruleTags map[string]string`
`62`		`- if m.featureGates.Enabled(config.EnableListenerRulesTagging) {`
	`62`	`+ if m.featureGates.Enabled(config.ListenerRulesTagging) {`
`63`	`63`	`ruleTags = m.trackingProvider.ResourceTags(resLR.Stack(), resLR, resLR.Spec.Tags)`
`64`	`64`	`}`
`65`	`65`	`req.Tags = convertTagsToSDKTags(ruleTags)`
`@@ -90,7 +90,7 @@ func (m defaultListenerRuleManager) Create(ctx context.Context, resLR elbv2mod`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`func (m defaultListenerRuleManager) Update(ctx context.Context, resLR elbv2model.ListenerRule, sdkLR ListenerRuleWithTags) (elbv2model.ListenerRuleStatus, error) {`
`93`		`- if m.featureGates.Enabled(config.EnableListenerRulesTagging) {`
	`93`	`+ if m.featureGates.Enabled(config.ListenerRulesTagging) {`
`94`	`94`	`if err := m.updateSDKListenerRuleWithTags(ctx, resLR, sdkLR); err != nil {`
`95`	`95`	`return elbv2model.ListenerRuleStatus{}, err`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func buildSDKAction(modelAction elbv2model.Action, featureGates config.FeatureGa`
`52`	`52`	`if err != nil {`
`53`	`53`	`return nil, err`
`54`	`54`	`}`
`55`		`- if !featureGates.Enabled(config.EnableWeightedTargetGroups) {`
	`55`	`+ if !featureGates.Enabled(config.WeightedTargetGroups) {`
`56`	`56`	`if len(forwardConfig.TargetGroups) == 1 {`
`57`	`57`	`sdkObj.TargetGroupArn = forwardConfig.TargetGroups[0].TargetGroupArn`
`58`	`58`	`} else {`