-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add support for external-managed-tags & prefer defaultTags (#1970)
- Loading branch information
Showing
25 changed files
with
564 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
package config | ||
|
||
import ( | ||
"github.com/pkg/errors" | ||
"github.com/stretchr/testify/assert" | ||
"testing" | ||
) | ||
|
||
func TestControllerConfig_validateDefaultTagsCollisionWithTrackingTags(t *testing.T) { | ||
type fields struct { | ||
DefaultTags map[string]string | ||
} | ||
tests := []struct { | ||
name string | ||
fields fields | ||
wantErr error | ||
}{ | ||
{ | ||
name: "default tags and tracking tags have no collision", | ||
fields: fields{ | ||
DefaultTags: map[string]string{ | ||
"tag-a": "value-a", | ||
}, | ||
}, | ||
wantErr: nil, | ||
}, | ||
{ | ||
name: "default tags and tracking tags have collision", | ||
fields: fields{ | ||
DefaultTags: map[string]string{ | ||
"elbv2.k8s.aws/cluster": "value-a", | ||
}, | ||
}, | ||
wantErr: errors.New("tag key elbv2.k8s.aws/cluster cannot be specified in default-tags flag"), | ||
}, | ||
{ | ||
name: "default tags is empty", | ||
fields: fields{ | ||
DefaultTags: nil, | ||
}, | ||
wantErr: nil, | ||
}, | ||
} | ||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
cfg := &ControllerConfig{ | ||
DefaultTags: tt.fields.DefaultTags, | ||
} | ||
err := cfg.validateDefaultTagsCollisionWithTrackingTags() | ||
if tt.wantErr != nil { | ||
assert.EqualError(t, err, tt.wantErr.Error()) | ||
} else { | ||
assert.NoError(t, err) | ||
} | ||
}) | ||
} | ||
} | ||
|
||
func TestControllerConfig_validateExternalManagedTagsCollisionWithTrackingTags(t *testing.T) { | ||
type fields struct { | ||
ExternalManagedTags []string | ||
} | ||
tests := []struct { | ||
name string | ||
fields fields | ||
wantErr error | ||
}{ | ||
{ | ||
name: "external managed tags and tracking tags have no collision", | ||
fields: fields{ | ||
ExternalManagedTags: []string{"tag-a"}, | ||
}, | ||
wantErr: nil, | ||
}, | ||
{ | ||
name: "external managed tags and tracking tags have collision", | ||
fields: fields{ | ||
ExternalManagedTags: []string{"elbv2.k8s.aws/cluster"}, | ||
}, | ||
wantErr: errors.New("tag key elbv2.k8s.aws/cluster cannot be specified in external-managed-tags flag"), | ||
}, | ||
{ | ||
name: "external managed tags is empty", | ||
fields: fields{ | ||
ExternalManagedTags: nil, | ||
}, | ||
wantErr: nil, | ||
}, | ||
} | ||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
cfg := &ControllerConfig{ | ||
ExternalManagedTags: tt.fields.ExternalManagedTags, | ||
} | ||
err := cfg.validateExternalManagedTagsCollisionWithTrackingTags() | ||
if tt.wantErr != nil { | ||
assert.EqualError(t, err, tt.wantErr.Error()) | ||
} else { | ||
assert.NoError(t, err) | ||
} | ||
}) | ||
} | ||
} | ||
|
||
func TestControllerConfig_validateExternalManagedTagsCollisionWithDefaultTags(t *testing.T) { | ||
type fields struct { | ||
DefaultTags map[string]string | ||
ExternalManagedTags []string | ||
} | ||
tests := []struct { | ||
name string | ||
fields fields | ||
wantErr error | ||
}{ | ||
{ | ||
name: "default tags and external managed tags have no collision", | ||
fields: fields{ | ||
DefaultTags: map[string]string{ | ||
"tag-a": "value-a", | ||
}, | ||
ExternalManagedTags: []string{"tag-b"}, | ||
}, | ||
wantErr: nil, | ||
}, | ||
{ | ||
name: "default tags and external managed tags have collision", | ||
fields: fields{ | ||
DefaultTags: map[string]string{ | ||
"tag-a": "value-a", | ||
}, | ||
ExternalManagedTags: []string{"tag-a"}, | ||
}, | ||
wantErr: errors.New("tag key tag-a cannot be specified in both default-tags and external-managed-tags flag"), | ||
}, | ||
{ | ||
name: "empty default tags and non-empty external managed tags", | ||
fields: fields{ | ||
DefaultTags: nil, | ||
ExternalManagedTags: []string{"tag-a"}, | ||
}, | ||
wantErr: nil, | ||
}, | ||
{ | ||
name: "empty default tags and empty external managed tags", | ||
fields: fields{ | ||
DefaultTags: nil, | ||
ExternalManagedTags: nil, | ||
}, | ||
wantErr: nil, | ||
}, | ||
} | ||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
cfg := &ControllerConfig{ | ||
DefaultTags: tt.fields.DefaultTags, | ||
ExternalManagedTags: tt.fields.ExternalManagedTags, | ||
} | ||
err := cfg.validateExternalManagedTagsCollisionWithDefaultTags() | ||
if tt.wantErr != nil { | ||
assert.EqualError(t, err, tt.wantErr.Error()) | ||
} else { | ||
assert.NoError(t, err) | ||
} | ||
}) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.