Skip to content

Commit

Permalink
Make TestRouteHardStopAfterTestZeroLengthDuration set the emtpy string
Browse files Browse the repository at this point in the history
  • Loading branch information
@frobware
frobware committed Jan 12, 2021
1 parent b3aa257 commit 31ee8ab
Showing 1 changed file with 29 additions and 17 deletions.
46 changes: 29 additions & 17 deletions test/e2e/hard_stop_after_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
)

type hardStopAfterUpdateStrategy int

const (
// Unconditionally set the duration value.
hardStopAfterSetValue hardStopAfterUpdateStrategy = iota

// Unconditionally delete the annotation.
hardStopAfterDeleteAnnotation
)

const (
// hardStopAfterRetryTimeout duration for retrying operations.
hardStopAfterRetryTimeout = 5 * time.Minute
Expand All @@ -39,7 +49,7 @@ func TestRouteHardStopAfterEnableOnIngressConfig(t *testing.T) {
t.Fatalf("test assertions failed: %v", err)
}

if err := setHardStopAfterDurationForIngressConfig(t, kclient, hardStopAfterRetryTimeout, "", ingressConfig); err != nil {
if err := setHardStopAfterDurationForIngressConfig(t, kclient, hardStopAfterRetryTimeout, "", hardStopAfterDeleteAnnotation, ingressConfig); err != nil {
t.Fatalf("failed to clear hard-stop-after on ingress config: %v", err)
}
if err := waitForHardStopAfterUnsetInAllComponents(kclient, hardStopAfterRetryTimeout, ic, ingressConfig, routerDeployment); err != nil {
Expand All @@ -59,7 +69,7 @@ func TestRouteHardStopAfterEnableOnIngressController(t *testing.T) {
t.Fatalf("test assertions failed: %v", err)
}

if err := setHardStopAfterDurationForIngressController(t, kclient, hardStopAfterRetryTimeout, "", ic); err != nil {
if err := setHardStopAfterDurationForIngressController(t, kclient, hardStopAfterRetryTimeout, "", hardStopAfterDeleteAnnotation, ic); err != nil {
t.Fatalf("failed to clear hard-stop-after on ingresscontroller: %v", err)
}
if err := waitForHardStopAfterUnsetInAllComponents(kclient, hardStopAfterRetryTimeout, ic, ingressConfig, routerDeployment); err != nil {
Expand All @@ -86,7 +96,7 @@ func TestRouteHardStopAfterEnableOnIngressControllerHasPriorityOverIngressConfig
}

// Remove the controller setting.
if err := setHardStopAfterDurationForIngressController(t, kclient, hardStopAfterRetryTimeout, "", ic); err != nil {
if err := setHardStopAfterDurationForIngressController(t, kclient, hardStopAfterRetryTimeout, "", hardStopAfterDeleteAnnotation, ic); err != nil {
t.Fatalf("failed to clear hard-stop-after on ingresscontroller: %v", err)
}

Expand All @@ -95,7 +105,7 @@ func TestRouteHardStopAfterEnableOnIngressControllerHasPriorityOverIngressConfig
t.Fatalf("expected router deployment to have hard-stop-after configured: %v", err)
}

if err := setHardStopAfterDurationForIngressConfig(t, kclient, hardStopAfterRetryTimeout, "", ingressConfig); err != nil {
if err := setHardStopAfterDurationForIngressConfig(t, kclient, hardStopAfterRetryTimeout, "", hardStopAfterDeleteAnnotation, ingressConfig); err != nil {
t.Fatalf("failed to clear hard-stop-after on ingress config: %v", err)
}
if err := waitForHardStopAfterUnsetInAllComponents(kclient, hardStopAfterRetryTimeout, ic, ingressConfig, routerDeployment); err != nil {
Expand All @@ -113,7 +123,7 @@ func TestRouteHardStopAfterTestInvalidDuration(t *testing.T) {
t.Fatalf("test assertions failed: %v", err)
}

if err := setHardStopAfterDurationForIngressController(t, kclient, hardStopAfterRetryTimeout, "mañana", ic); err != nil {
if err := setHardStopAfterDurationForIngressController(t, kclient, hardStopAfterRetryTimeout, "mañana", hardStopAfterSetValue, ic); err != nil {
t.Fatalf("failed to clear hard-stop-after on ingresscontroller: %v", err)
}

Expand All @@ -135,7 +145,7 @@ func TestRouteHardStopAfterTestZeroLengthDuration(t *testing.T) {
t.Fatalf("test assertions failed: %v", err)
}

if err := setHardStopAfterDurationForIngressController(t, kclient, hardStopAfterRetryTimeout, "", ic); err != nil {
if err := setHardStopAfterDurationForIngressController(t, kclient, hardStopAfterRetryTimeout, "", hardStopAfterSetValue, ic); err != nil {
t.Fatalf("failed to clear hard-stop-after on ingresscontroller: %v", err)
}

Expand All @@ -157,7 +167,7 @@ func TestRouteHardStopAfterTestOneDayDuration(t *testing.T) {
t.Fatalf("test assertions failed: %v", err)
}

if err := setHardStopAfterDurationForIngressController(t, kclient, hardStopAfterRetryTimeout, "", ic); err != nil {
if err := setHardStopAfterDurationForIngressController(t, kclient, hardStopAfterRetryTimeout, "", hardStopAfterDeleteAnnotation, ic); err != nil {
t.Fatalf("failed to clear hard-stop-after on ingresscontroller: %v", err)
}

Expand All @@ -184,7 +194,7 @@ func hardStopAfterTestSetup(t *testing.T, client client.Client, timeout time.Dur
}

func hardStopAfterTestIngressConfig(t *testing.T, client client.Client, ingressConfig *configv1.Ingress, routerDeployment *appsv1.Deployment, duration string) error {
if err := setHardStopAfterDurationForIngressConfig(t, client, hardStopAfterRetryTimeout, duration, ingressConfig); err != nil {
if err := setHardStopAfterDurationForIngressConfig(t, client, hardStopAfterRetryTimeout, duration, hardStopAfterSetValue, ingressConfig); err != nil {
return fmt.Errorf("failed to update ingress config: %v", err)
}
if err := waitForIngressControllerCondition(t, client, hardStopAfterRetryTimeout, defaultName, defaultAvailableConditions...); err != nil {
Expand All @@ -200,7 +210,7 @@ func hardStopAfterTestIngressConfig(t *testing.T, client client.Client, ingressC
}

func hardStopAfterTestIngressController(t *testing.T, client client.Client, ic *operatorv1.IngressController, routerDeployment *appsv1.Deployment, duration string) error {
if err := setHardStopAfterDurationForIngressController(t, client, hardStopAfterRetryTimeout, duration, ic); err != nil {
if err := setHardStopAfterDurationForIngressController(t, client, hardStopAfterRetryTimeout, duration, hardStopAfterSetValue, ic); err != nil {
t.Fatalf("failed to update ingresscontroller: %v", err)
}
if err := waitForIngressControllerCondition(t, client, hardStopAfterRetryTimeout, defaultName, defaultAvailableConditions...); err != nil {
Expand Down Expand Up @@ -317,7 +327,7 @@ func waitForRouterDeploymentHardStopAfterToBeUnset(client client.Client, timeout
})
}

func setHardStopAfterDurationForIngressConfig(t *testing.T, client client.Client, timeout time.Duration, hardStopAfter string, c *configv1.Ingress) error {
func setHardStopAfterDurationForIngressConfig(t *testing.T, client client.Client, timeout time.Duration, hardStopAfterDuration string, updateStrategy hardStopAfterUpdateStrategy, c *configv1.Ingress) error {
name := types.NamespacedName{Namespace: c.Namespace, Name: c.Name}

return wait.PollImmediate(1*time.Second, timeout, func() (bool, error) {
Expand All @@ -328,10 +338,11 @@ func setHardStopAfterDurationForIngressConfig(t *testing.T, client client.Client
if c.Annotations == nil {
c.Annotations = map[string]string{}
}
if len(hardStopAfter) == 0 {
switch updateStrategy {
case hardStopAfterSetValue:
c.Annotations[ingress.RouterHardStopAfterAnnotation] = hardStopAfterDuration
case hardStopAfterDeleteAnnotation:
delete(c.Annotations, ingress.RouterHardStopAfterAnnotation)
} else {
c.Annotations[ingress.RouterHardStopAfterAnnotation] = hardStopAfter
}
if err := client.Update(context.TODO(), c); err != nil {
t.Logf("Update %q failed: %v, retrying...", name, err)
Expand All @@ -341,7 +352,7 @@ func setHardStopAfterDurationForIngressConfig(t *testing.T, client client.Client
})
}

func setHardStopAfterDurationForIngressController(t *testing.T, client client.Client, timeout time.Duration, hardStopAfter string, c *operatorv1.IngressController) error {
func setHardStopAfterDurationForIngressController(t *testing.T, client client.Client, timeout time.Duration, hardStopAfterDuration string, updateStrategy hardStopAfterUpdateStrategy, c *operatorv1.IngressController) error {
name := types.NamespacedName{Namespace: c.Namespace, Name: c.Name}

return wait.PollImmediate(1*time.Second, timeout, func() (bool, error) {
Expand All @@ -352,10 +363,11 @@ func setHardStopAfterDurationForIngressController(t *testing.T, client client.Cl
if c.Annotations == nil {
c.Annotations = map[string]string{}
}
if len(hardStopAfter) == 0 {
switch updateStrategy {
case hardStopAfterSetValue:
c.Annotations[ingress.RouterHardStopAfterAnnotation] = hardStopAfterDuration
case hardStopAfterDeleteAnnotation:
delete(c.Annotations, ingress.RouterHardStopAfterAnnotation)
} else {
c.Annotations[ingress.RouterHardStopAfterAnnotation] = hardStopAfter
}
if err := client.Update(context.TODO(), c); err != nil {
t.Logf("Update %q failed: %v, retrying...", name, err)
Expand Down

0 comments on commit 31ee8ab

Please sign in to comment.