Skip to content

Commit

Permalink
PR feedback
Browse files Browse the repository at this point in the history
Signed-off-by: Sebastian J <zeeman@zeeman.de>
  • Loading branch information
derjust committed Dec 3, 2021
1 parent d980154 commit ca04b57
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
1 change: 0 additions & 1 deletion pkg/signals/signal_posix.go
@@ -1,4 +1,3 @@
//go:build !windows
// +build !windows

package signals
Expand Down
1 change: 0 additions & 1 deletion rollout/temlateref.go
Expand Up @@ -17,7 +17,6 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
25 changes: 17 additions & 8 deletions rollout/trafficrouting/alb/alb_test.go
Expand Up @@ -323,8 +323,11 @@ func TestGetForwardActionStringMarshalsZeroCorrectly(t *testing.T) {

func TestGetForwardActionStringMarshalsDisabledStickyConfigCorrectly(t *testing.T) {
r := fakeRollout("stable", "canary", "ingress", 443)
r.Spec.Strategy.Canary.TrafficRouting.ALB.StickinessConfig.Enabled = false
r.Spec.Strategy.Canary.TrafficRouting.ALB.StickinessConfig.DurationSeconds = 0
stickinessConfig := v1alpha1.StickinessConfig{
Enabled: false,
DurationSeconds: 0,
}
r.Spec.Strategy.Canary.TrafficRouting.ALB.StickinessConfig = &stickinessConfig
forwardAction, err := getForwardActionString(r, 443, 0)
if err != nil {
t.Fatal(err)
Expand All @@ -334,23 +337,29 @@ func TestGetForwardActionStringMarshalsDisabledStickyConfigCorrectly(t *testing.

func TestGetForwardActionStringDetectsNegativeStickyConfigDuration(t *testing.T) {
r := fakeRollout("stable", "canary", "ingress", 443)
r.Spec.Strategy.Canary.TrafficRouting.ALB.StickinessConfig.Enabled = true
r.Spec.Strategy.Canary.TrafficRouting.ALB.StickinessConfig.DurationSeconds = 0
stickinessConfig := v1alpha1.StickinessConfig{
Enabled: true,
DurationSeconds: 0,
}
r.Spec.Strategy.Canary.TrafficRouting.ALB.StickinessConfig = &stickinessConfig
forwardAction, err := getForwardActionString(r, 443, 0)

assert.NotNilf(t, forwardAction, "There should be no forwardAction being generated: %v", forwardAction)
expectedErrorMsg := "asdf"
expectedErrorMsg := "TargetGroupStickinessConfig's duration must be between 1 and 604800 seconds (7 days)!"
assert.EqualErrorf(t, err, expectedErrorMsg, "Error should be: %v, got: %v", expectedErrorMsg, err)
}

func TestGetForwardActionStringDetectsTooLargeStickyConfigDuration(t *testing.T) {
r := fakeRollout("stable", "canary", "ingress", 443)
r.Spec.Strategy.Canary.TrafficRouting.ALB.StickinessConfig.Enabled = true
r.Spec.Strategy.Canary.TrafficRouting.ALB.StickinessConfig.DurationSeconds = 604800 + 1
stickinessConfig := v1alpha1.StickinessConfig{
Enabled: true,
DurationSeconds: 604800 + 1,
}
r.Spec.Strategy.Canary.TrafficRouting.ALB.StickinessConfig = &stickinessConfig
forwardAction, err := getForwardActionString(r, 443, 0)

assert.NotNilf(t, forwardAction, "There should be no forwardAction being generated: %v", forwardAction)
expectedErrorMsg := "asdf"
expectedErrorMsg := "TargetGroupStickinessConfig's duration must be between 1 and 604800 seconds (7 days)!"
assert.EqualErrorf(t, err, expectedErrorMsg, "Error should be: %v, got: %v", expectedErrorMsg, err)
}

Expand Down

0 comments on commit ca04b57

Please sign in to comment.