refactor duplication of deletion protection attribute

Author: zac-nixon

pkg/deploy/elbv2/load_balancer_synthesizer.go

@@ -14,13 +14,10 @@ import (
 	"sigs.k8s.io/aws-load-balancer-controller/pkg/model/core"
 	elbv2model "sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2"
 	"sigs.k8s.io/aws-load-balancer-controller/pkg/runtime"
+	"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"
 	"strings"
 )
 
-const (
-	lbAttrsDeletionProtectionEnabled = "deletion_protection.enabled"
-)
-
 // NewLoadBalancerSynthesizer constructs loadBalancerSynthesizer
 func NewLoadBalancerSynthesizer(elbv2Client services.ELBV2, trackingProvider tracking.Provider, taggingManager TaggingManager,
 	lbManager LoadBalancerManager, logger logr.Logger, featureGates config.FeatureGates, controllerConfig config.ControllerConfig, stack core.Stack) *loadBalancerSynthesizer {
@@ -116,7 +113,7 @@ func (s *loadBalancerSynthesizer) disableDeletionProtection(ctx context.Context,
 	input := &elbv2sdk.ModifyLoadBalancerAttributesInput{
 		Attributes: []elbv2types.LoadBalancerAttribute{
 			{
-				Key:   awssdk.String(lbAttrsDeletionProtectionEnabled),
+				Key:   awssdk.String(shared_constants.LBAttributeDeletionProtection),
 				Value: awssdk.String("false"),
 			},
 		},

pkg/gateway/model/base_model_builder.go

@@ -15,6 +15,7 @@ import (
 	"sigs.k8s.io/aws-load-balancer-controller/pkg/model/core"
 	elbv2model "sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2"
 	"sigs.k8s.io/aws-load-balancer-controller/pkg/networking"
+	"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"
 	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
 	"strconv"
 )
@@ -118,7 +119,7 @@ func (baseBuilder *baseModelBuilder) isDeleteProtected(lbConf *elbv2gw.LoadBalan
 	}
 
 	for _, attr := range lbConf.Spec.LoadBalancerAttributes {
-		if attr.Key == deletionProtectionAttributeKey {
+		if attr.Key == shared_constants.LBAttributeDeletionProtection {
 			deletionProtectionEnabled, err := strconv.ParseBool(attr.Value)
 
 			if err != nil {

pkg/gateway/model/constants.go

@@ -3,6 +3,7 @@ package ingress
 import (
 	"context"
 	"reflect"
+	"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"
 	"strconv"
 
 	elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types"
@@ -30,8 +31,7 @@ import (
 )
 
 const (
-	lbAttrsDeletionProtectionEnabled = "deletion_protection.enabled"
-	controllerName                   = "ingress"
+	controllerName = "ingress"
 )
 
 // ModelBuilder is responsible for build mode stack for a IngressGroup.
@@ -458,8 +458,8 @@ func (t *defaultModelBuildTask) getDeletionProtectionViaAnnotation(ing *networki
 	if err != nil {
 		return false, err
 	}
-	if _, deletionProtectionSpecified := lbAttributes[lbAttrsDeletionProtectionEnabled]; deletionProtectionSpecified {
-		deletionProtectionEnabled, err := strconv.ParseBool(lbAttributes[lbAttrsDeletionProtectionEnabled])
+	if _, deletionProtectionSpecified := lbAttributes[shared_constants.LBAttributeDeletionProtection]; deletionProtectionSpecified {
+		deletionProtectionEnabled, err := strconv.ParseBool(lbAttributes[shared_constants.LBAttributeDeletionProtection])
 		if err != nil {
 			return false, err
 		}

pkg/ingress/model_builder.go

@@ -25,8 +25,6 @@ import (
 	"sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2"
 )
 
-const lbAttrsDeletionProtectionEnabled = "deletion_protection.enabled"
-
 func Test_defaultModelBuilderTask_buildLBAttributes(t *testing.T) {
 	tests := []struct {
 		testName  string
@@ -79,7 +77,7 @@ func Test_defaultModelBuilderTask_buildLBAttributes(t *testing.T) {
 					Value: "true",
 				},
 				{
-					Key:   lbAttrsDeletionProtectionEnabled,
+					Key:   shared_constants.LBAttributeDeletionProtection,
 					Value: "true",
 				},
 			},
@@ -113,7 +111,7 @@ func Test_defaultModelBuilderTask_buildLBAttributes(t *testing.T) {
 					Value: "true",
 				},
 				{
-					Key:   lbAttrsDeletionProtectionEnabled,
+					Key:   shared_constants.LBAttributeDeletionProtection,
 					Value: "true",
 				},
 				{

pkg/service/model_build_load_balancer_test.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"context"
+	"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"
 	"strconv"
 	"sync"
 
@@ -29,7 +30,6 @@ const (
 	LoadBalancerTypeExternal       = "external"
 	LoadBalancerTargetTypeIP       = "ip"
 	LoadBalancerTargetTypeInstance = "instance"
-	lbAttrsDeletionProtection      = "deletion_protection.enabled"
 	controllerName                 = "service"
 )
 
@@ -274,8 +274,8 @@ func (t *defaultModelBuildTask) getDeletionProtectionViaAnnotation(svc corev1.Se
 	if err != nil {
 		return false, err
 	}
-	if _, deletionProtectionSpecified := lbAttributes[lbAttrsDeletionProtection]; deletionProtectionSpecified {
-		deletionProtectionEnabled, err := strconv.ParseBool(lbAttributes[lbAttrsDeletionProtection])
+	if _, deletionProtectionSpecified := lbAttributes[shared_constants.LBAttributeDeletionProtection]; deletionProtectionSpecified {
+		deletionProtectionEnabled, err := strconv.ParseBool(lbAttributes[shared_constants.LBAttributeDeletionProtection])
 		if err != nil {
 			return false, err
 		}

pkg/service/model_builder.go

@@ -0,0 +1,6 @@
+package shared_constants
+
+const (
+	// LBAttributeDeletionProtection deletion protection attribute name
+	LBAttributeDeletionProtection = "deletion_protection.enabled"
+)