add tests for other tags overriding default tags

Author: mwhittington21

pkg/algorithm/maps.go

@@ -1,9 +1,8 @@
 package algorithm
 
 import (
-"strings"
-
 "k8s.io/apimachinery/pkg/util/sets"
+"strings"
 )
 
 // MapFindFirst get from list of maps until first found.

pkg/config/controller_config.go

@@ -1,11 +1,10 @@
 package config
 
 import (
+"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"
 "strings"
 "time"
 
-"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"
-
 "github.com/pkg/errors"
 "github.com/spf13/pflag"
 "k8s.io/apimachinery/pkg/util/sets"

pkg/deploy/elbv2/tagging_manager.go

@@ -2,11 +2,10 @@ package elbv2
 
 import (
 "context"
+elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types"
 "sync"
 "time"
 
-elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types"
-
 "k8s.io/apimachinery/pkg/util/cache"
 
 awssdk "github.com/aws/aws-sdk-go-v2/aws"

pkg/deploy/tracking/provider.go

@@ -2,7 +2,6 @@ package tracking
 
 import (
 "fmt"
-
 "sigs.k8s.io/aws-load-balancer-controller/pkg/algorithm"
 "sigs.k8s.io/aws-load-balancer-controller/pkg/model/core"
 "sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"

pkg/ingress/model_build_frontend_nlb_test.go

@@ -15,6 +15,7 @@ import (
 "k8s.io/apimachinery/pkg/util/intstr"
 "sigs.k8s.io/aws-load-balancer-controller/pkg/annotations"
 "sigs.k8s.io/aws-load-balancer-controller/pkg/aws/services"
+"sigs.k8s.io/aws-load-balancer-controller/pkg/config"
 "sigs.k8s.io/aws-load-balancer-controller/pkg/model/core"
 "sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2"
 elbv2model "sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2"
@@ -987,7 +988,8 @@ func Test_buildFrontendNlbTags(t *testing.T) {
 ingGroup: tt.ingGroup,
 annotationParser: annotations.NewSuffixAnnotationParser("alb.ingress.kubernetes.io"),
 // Default implementation will return an empty map when no tags are specified
-defaultTags: tt.defaultTags,
+defaultTags: tt.defaultTags,
+featureGates: config.NewFeatureGates(),
 }
 
 got, err := task.buildFrontendNlbTags(context.Background(), nil)

pkg/ingress/model_build_listener_rules_test.go

@@ -1,11 +1,16 @@
 package ingress
 
 import (
+"context"
+"testing"
+
 awssdk "github.com/aws/aws-sdk-go-v2/aws"
 "github.com/pkg/errors"
 "github.com/stretchr/testify/assert"
 networking "k8s.io/api/networking/v1"
-"testing"
+metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+"sigs.k8s.io/aws-load-balancer-controller/pkg/annotations"
+"sigs.k8s.io/aws-load-balancer-controller/pkg/config"
 )
 
 func Test_defaultModelBuildTask_sortIngressPath(t *testing.T) {
@@ -675,3 +680,213 @@ func Test_defaultModelBuildTask_buildPathPatternsForPrefixPathType(t *testing.T)
 })
 }
 }
+
+func Test_defaultModelBuildTask_buildListenerRuleTags(t *testing.T) {
+type fields struct {
+ing ClassifiedIngress
+defaultTags map[string]string
+}
+tests := []struct {
+name string
+fields fields
+want map[string]string
+wantErr error
+}{
+{
+name: "empty default tags, no tags annotation",
+fields: fields{
+ing: ClassifiedIngress{
+Ing: &networking.Ingress{
+ObjectMeta: metav1.ObjectMeta{
+Namespace: "awesome-ns",
+Name: "ing-1",
+Annotations: map[string]string{},
+},
+},
+},
+defaultTags: nil,
+},
+want: map[string]string{},
+},
+{
+name: "empty default tags, non-empty tags annotation",
+fields: fields{
+ing: ClassifiedIngress{
+Ing: &networking.Ingress{
+ObjectMeta: metav1.ObjectMeta{
+Namespace: "awesome-ns",
+Name: "ing-1",
+Annotations: map[string]string{
+"alb.ingress.kubernetes.io/tags": "k1=v1,k2=v2",
+},
+},
+},
+},
+defaultTags: nil,
+},
+want: map[string]string{
+"k1": "v1",
+"k2": "v2",
+},
+},
+{
+name: "non-empty default tags, empty tags annotation",
+fields: fields{
+ing: ClassifiedIngress{
+Ing: &networking.Ingress{
+ObjectMeta: metav1.ObjectMeta{
+Namespace: "awesome-ns",
+Name: "ing-1",
+Annotations: map[string]string{},
+},
+},
+},
+defaultTags: map[string]string{
+"k3": "v3",
+"k4": "v4",
+},
+},
+want: map[string]string{
+"k3": "v3",
+"k4": "v4",
+},
+},
+{
+name: "non-empty default tags, non-empty tags annotation",
+fields: fields{
+ing: ClassifiedIngress{
+Ing: &networking.Ingress{
+ObjectMeta: metav1.ObjectMeta{
+Namespace: "awesome-ns",
+Name: "ing-1",
+Annotations: map[string]string{
+"alb.ingress.kubernetes.io/tags": "k1=v1,k2=v2,k3=v3a",
+},
+},
+},
+},
+defaultTags: map[string]string{
+"k3": "v3",
+"k4": "v4",
+},
+},
+want: map[string]string{
+"k1": "v1",
+"k2": "v2",
+"k3": "v3",
+"k4": "v4",
+},
+},
+}
+for _, tt := range tests {
+t.Run(tt.name, func(t *testing.T) {
+task := &defaultModelBuildTask{
+defaultTags: tt.fields.defaultTags,
+annotationParser: annotations.NewSuffixAnnotationParser("alb.ingress.kubernetes.io"),
+featureGates: config.NewFeatureGates(),
+}
+got, err := task.buildListenerRuleTags(context.Background(), tt.fields.ing)
+if tt.wantErr != nil {
+assert.EqualError(t, err, tt.wantErr.Error())
+} else {
+assert.NoError(t, err)
+assert.Equal(t, tt.want, got)
+}
+})
+}
+}
+
+func Test_defaultModelBuildTask_buildListenerRuleTags_FeatureGate(t *testing.T) {
+type fields struct {
+ing ClassifiedIngress
+defaultTags map[string]string
+enabledFeatureGates func() config.FeatureGates
+}
+tests := []struct {
+name string
+fields fields
+want map[string]string
+wantErr error
+}{
+{
+name: "default tags take priority when feature gate disabled",
+fields: fields{
+ing: ClassifiedIngress{
+Ing: &networking.Ingress{
+ObjectMeta: metav1.ObjectMeta{
+Namespace: "awesome-ns",
+Name: "ing-1",
+Annotations: map[string]string{
+"alb.ingress.kubernetes.io/tags": "k1=v1,k2=v2,k3=v3",
+},
+},
+},
+},
+defaultTags: map[string]string{
+"k1": "v10",
+"k2": "v20",
+},
+enabledFeatureGates: func() config.FeatureGates {
+featureGates := config.NewFeatureGates()
+featureGates.Disable(config.EnableDefaultTagsLowPriority)
+return featureGates
+},
+},
+want: map[string]string{
+"k1": "v10",
+"k2": "v20",
+"k3": "v3",
+},
+},
+{
+name: "annotation tags take priority when feature gate enabled",
+fields: fields{
+ing: ClassifiedIngress{
+Ing: &networking.Ingress{
+ObjectMeta: metav1.ObjectMeta{
+Namespace: "awesome-ns",
+Name: "ing-1",
+Annotations: map[string]string{
+"alb.ingress.kubernetes.io/tags": "k1=v1,k2=v2,k3=v3",
+},
+},
+},
+},
+defaultTags: map[string]string{
+"k1": "v10",
+"k2": "v20",
+},
+enabledFeatureGates: func() config.FeatureGates {
+featureGates := config.NewFeatureGates()
+featureGates.Enable(config.EnableDefaultTagsLowPriority)
+return featureGates
+},
+},
+want: map[string]string{
+"k1": "v1",
+"k2": "v2",
+"k3": "v3",
+},
+},
+}
+for _, tt := range tests {
+t.Run(tt.name, func(t *testing.T) {
+task := &defaultModelBuildTask{
+defaultTags: tt.fields.defaultTags,
+annotationParser: annotations.NewSuffixAnnotationParser("alb.ingress.kubernetes.io"),
+featureGates: tt.fields.enabledFeatureGates(),
+}
+got, err := task.buildListenerRuleTags(context.Background(), tt.fields.ing)
+if tt.wantErr != nil {
+assert.EqualError(t, err, tt.wantErr.Error())
+} else {
+assert.NoError(t, err)
+assert.Equal(t, tt.want, got)
+}
+for key, value := range tt.want {
+assert.Contains(t, got, key)
+assert.Equal(t, value, got[key])
+}
+})
+}
+}