Skip to content

Commit

Permalink
Remove workflow.dapr component from middleware integration test
Browse files Browse the repository at this point in the history 
metadata component checks

Signed-off-by: joshvanl <me@joshvanl.dev>
  • Loading branch information
@JoshVanL
JoshVanL committed Jan 25, 2024
1 parent c134aeb commit 5ed4391
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 44 deletions.
17 changes: 6 additions & 11 deletions tests/integration/suite/daprd/hotreload/operator/middleware/http/app/uppercase.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
u.daprd3.WaitUntilAppHealth(t, ctx)

client := util.HTTPClient(t)
assert.Len(t, util.GetMetaComponents(t, ctx, client, u.daprd1.HTTPPort()), 3)
assert.Len(t, util.GetMetaComponents(t, ctx, client, u.daprd1.HTTPPort()), 2)

t.Run("existing middleware should be loaded", func(t *testing.T) {
u.doReq(t, ctx, client, u.daprd1, u.daprd1, true)
Expand Down Expand Up @@ -171,7 +171,7 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
u.operator.ComponentUpdateEvent(t, ctx, &api.ComponentUpdateEvent{Component: &newComp, EventType: operatorv1.ResourceEventType_CREATED})

assert.EventuallyWithT(t, func(c *assert.CollectT) {
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd2.HTTPPort()), 2)
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd2.HTTPPort()), 1)
}, time.Second*5, time.Millisecond*100, "expected component to be loaded")

u.doReq(t, ctx, client, u.daprd1, u.daprd1, true)
Expand Down Expand Up @@ -200,7 +200,7 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
u.operator.ComponentUpdateEvent(t, ctx, &api.ComponentUpdateEvent{Component: &newComp, EventType: operatorv1.ResourceEventType_CREATED})

assert.EventuallyWithT(t, func(c *assert.CollectT) {
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd3.HTTPPort()), 2)
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd3.HTTPPort()), 1)
}, time.Second*5, time.Millisecond*100, "expected component to be loaded")

u.doReq(t, ctx, client, u.daprd1, u.daprd1, true)
Expand Down Expand Up @@ -234,7 +234,6 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
assert.EventuallyWithT(t, func(c *assert.CollectT) {
resp := util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{
{Name: "dapr", Type: "workflow.dapr", Version: "v1"},
{Name: "uppercase", Type: "middleware.http.routeralias", Version: "v1"},
{Name: "uppercase2", Type: "middleware.http.routeralias", Version: "v1"},
}, resp)
Expand Down Expand Up @@ -268,7 +267,6 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
assert.EventuallyWithT(t, func(c *assert.CollectT) {
resp := util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{
{Name: "dapr", Type: "workflow.dapr", Version: "v1"},
{Name: "uppercase", Type: "middleware.http.routeralias", Version: "v1"},
{Name: "uppercase2", Type: "middleware.http.uppercase", Version: "v1"},
}, resp)
Expand Down Expand Up @@ -322,12 +320,9 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
u.operator.ComponentUpdateEvent(t, ctx, &api.ComponentUpdateEvent{Component: comp4, EventType: operatorv1.ResourceEventType_DELETED})

assert.EventuallyWithT(t, func(c *assert.CollectT) {
resp := util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{{Name: "dapr", Type: "workflow.dapr", Version: "v1"}}, resp)
resp = util.GetMetaComponents(c, ctx, client, u.daprd2.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{{Name: "dapr", Type: "workflow.dapr", Version: "v1"}}, resp)
resp = util.GetMetaComponents(c, ctx, client, u.daprd3.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{{Name: "dapr", Type: "workflow.dapr", Version: "v1"}}, resp)
assert.Empty(c, util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort()))
assert.Empty(c, util.GetMetaComponents(c, ctx, client, u.daprd2.HTTPPort()))
assert.Empty(c, util.GetMetaComponents(c, ctx, client, u.daprd3.HTTPPort()))
}, time.Second*5, time.Millisecond*100, "expected component to be loaded")

u.doReq(t, ctx, client, u.daprd1, u.daprd1, false)
Expand Down
17 changes: 6 additions & 11 deletions tests/integration/suite/daprd/hotreload/operator/middleware/http/server/uppercase.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
u.daprd3.WaitUntilAppHealth(t, ctx)

client := util.HTTPClient(t)
assert.Len(t, util.GetMetaComponents(t, ctx, client, u.daprd1.HTTPPort()), 3)
assert.Len(t, util.GetMetaComponents(t, ctx, client, u.daprd1.HTTPPort()), 2)

t.Run("existing middleware should be loaded", func(t *testing.T) {
u.doReq(t, ctx, client, u.daprd1, u.daprd1, true)
Expand Down Expand Up @@ -171,7 +171,7 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
u.operator.ComponentUpdateEvent(t, ctx, &api.ComponentUpdateEvent{Component: &newComp, EventType: operatorv1.ResourceEventType_CREATED})

assert.EventuallyWithT(t, func(c *assert.CollectT) {
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd2.HTTPPort()), 2)
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd2.HTTPPort()), 1)
}, time.Second*5, time.Millisecond*100, "expected component to be loaded")

u.doReq(t, ctx, client, u.daprd1, u.daprd1, true)
Expand Down Expand Up @@ -200,7 +200,7 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
u.operator.ComponentUpdateEvent(t, ctx, &api.ComponentUpdateEvent{Component: &newComp, EventType: operatorv1.ResourceEventType_CREATED})

assert.EventuallyWithT(t, func(c *assert.CollectT) {
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd3.HTTPPort()), 2)
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd3.HTTPPort()), 1)
}, time.Second*5, time.Millisecond*100, "expected component to be loaded")

u.doReq(t, ctx, client, u.daprd1, u.daprd1, true)
Expand Down Expand Up @@ -234,7 +234,6 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
assert.EventuallyWithT(t, func(c *assert.CollectT) {
resp := util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{
{Name: "dapr", Type: "workflow.dapr", Version: "v1"},
{Name: "uppercase", Type: "middleware.http.routeralias", Version: "v1"},
{Name: "uppercase2", Type: "middleware.http.routeralias", Version: "v1"},
}, resp)
Expand Down Expand Up @@ -268,7 +267,6 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
assert.EventuallyWithT(t, func(c *assert.CollectT) {
resp := util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{
{Name: "dapr", Type: "workflow.dapr", Version: "v1"},
{Name: "uppercase", Type: "middleware.http.routeralias", Version: "v1"},
{Name: "uppercase2", Type: "middleware.http.uppercase", Version: "v1"},
}, resp)
Expand Down Expand Up @@ -322,12 +320,9 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
u.operator.ComponentUpdateEvent(t, ctx, &api.ComponentUpdateEvent{Component: comp4, EventType: operatorv1.ResourceEventType_DELETED})

assert.EventuallyWithT(t, func(c *assert.CollectT) {
resp := util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{{Name: "dapr", Type: "workflow.dapr", Version: "v1"}}, resp)
resp = util.GetMetaComponents(c, ctx, client, u.daprd2.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{{Name: "dapr", Type: "workflow.dapr", Version: "v1"}}, resp)
resp = util.GetMetaComponents(c, ctx, client, u.daprd3.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{{Name: "dapr", Type: "workflow.dapr", Version: "v1"}}, resp)
assert.Empty(c, util.GetMetaComponents(t, ctx, client, u.daprd1.HTTPPort()))
assert.Empty(c, util.GetMetaComponents(t, ctx, client, u.daprd2.HTTPPort()))
assert.Empty(c, util.GetMetaComponents(t, ctx, client, u.daprd3.HTTPPort()))
}, time.Second*5, time.Millisecond*100, "expected component to be loaded")

u.doReq(t, ctx, client, u.daprd1, u.daprd1, false)
Expand Down
17 changes: 6 additions & 11 deletions tests/integration/suite/daprd/hotreload/selfhosted/middleware/http/app/uppercase.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
u.daprd3.WaitUntilAppHealth(t, ctx)

client := util.HTTPClient(t)
assert.Len(t, util.GetMetaComponents(t, ctx, client, u.daprd1.HTTPPort()), 3)
assert.Len(t, util.GetMetaComponents(t, ctx, client, u.daprd1.HTTPPort()), 2)

t.Run("existing middleware should be loaded", func(t *testing.T) {
u.doReq(t, ctx, client, u.daprd1, u.daprd1, true)
Expand All @@ -152,7 +152,7 @@ spec:
`), 0o600))

assert.EventuallyWithT(t, func(c *assert.CollectT) {
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd2.HTTPPort()), 2)
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd2.HTTPPort()), 1)
}, time.Second*5, time.Millisecond*100, "expected component to be loaded")

u.doReq(t, ctx, client, u.daprd1, u.daprd1, true)
Expand All @@ -178,7 +178,7 @@ spec:
`), 0o600))

assert.EventuallyWithT(t, func(c *assert.CollectT) {
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd3.HTTPPort()), 2)
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd3.HTTPPort()), 1)
}, time.Second*5, time.Millisecond*100, "expected component to be loaded")

u.doReq(t, ctx, client, u.daprd1, u.daprd1, true)
Expand Down Expand Up @@ -220,7 +220,6 @@ spec:
assert.EventuallyWithT(t, func(c *assert.CollectT) {
resp := util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{
{Name: "dapr", Type: "workflow.dapr", Version: "v1"},
{Name: "uppercase", Type: "middleware.http.routeralias", Version: "v1"},
{Name: "uppercase2", Type: "middleware.http.routeralias", Version: "v1"},
}, resp)
Expand Down Expand Up @@ -262,7 +261,6 @@ spec:
assert.EventuallyWithT(t, func(c *assert.CollectT) {
resp := util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{
{Name: "dapr", Type: "workflow.dapr", Version: "v1"},
{Name: "uppercase", Type: "middleware.http.routeralias", Version: "v1"},
{Name: "uppercase2", Type: "middleware.http.uppercase", Version: "v1"},
}, resp)
Expand All @@ -285,12 +283,9 @@ spec:
require.NoError(t, os.Remove(filepath.Join(u.resDir3, "3.yaml")))

assert.EventuallyWithT(t, func(c *assert.CollectT) {
resp := util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{{Name: "dapr", Type: "workflow.dapr", Version: "v1"}}, resp)
resp = util.GetMetaComponents(c, ctx, client, u.daprd2.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{{Name: "dapr", Type: "workflow.dapr", Version: "v1"}}, resp)
resp = util.GetMetaComponents(c, ctx, client, u.daprd3.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{{Name: "dapr", Type: "workflow.dapr", Version: "v1"}}, resp)
assert.Empty(c, util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort()))
assert.Empty(c, util.GetMetaComponents(c, ctx, client, u.daprd2.HTTPPort()))
assert.Empty(c, util.GetMetaComponents(c, ctx, client, u.daprd3.HTTPPort()))
}, time.Second*5, time.Millisecond*100, "expected component to be loaded")

u.doReq(t, ctx, client, u.daprd1, u.daprd1, false)
Expand Down
17 changes: 6 additions & 11 deletions tests/integration/suite/daprd/hotreload/selfhosted/middleware/http/server/uppercase.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func (u *uppercase) Run(t *testing.T, ctx context.Context) {
u.daprd3.WaitUntilAppHealth(t, ctx)

client := util.HTTPClient(t)
assert.Len(t, util.GetMetaComponents(t, ctx, client, u.daprd1.HTTPPort()), 3)
assert.Len(t, util.GetMetaComponents(t, ctx, client, u.daprd1.HTTPPort()), 2)

t.Run("existing middleware should be loaded", func(t *testing.T) {
u.doReq(t, ctx, client, u.daprd1, u.daprd1, true)
Expand All @@ -152,7 +152,7 @@ spec:
`), 0o600))

assert.EventuallyWithT(t, func(c *assert.CollectT) {
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd2.HTTPPort()), 2)
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd2.HTTPPort()), 1)
}, time.Second*5, time.Millisecond*100, "expected component to be loaded")

u.doReq(t, ctx, client, u.daprd1, u.daprd1, true)
Expand All @@ -178,7 +178,7 @@ spec:
`), 0o600))

assert.EventuallyWithT(t, func(c *assert.CollectT) {
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd3.HTTPPort()), 2)
assert.Len(c, util.GetMetaComponents(t, ctx, client, u.daprd3.HTTPPort()), 1)
}, time.Second*5, time.Millisecond*100, "expected component to be loaded")

u.doReq(t, ctx, client, u.daprd1, u.daprd1, true)
Expand Down Expand Up @@ -220,7 +220,6 @@ spec:
assert.EventuallyWithT(t, func(c *assert.CollectT) {
resp := util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{
{Name: "dapr", Type: "workflow.dapr", Version: "v1"},
{Name: "uppercase", Type: "middleware.http.routeralias", Version: "v1"},
{Name: "uppercase2", Type: "middleware.http.routeralias", Version: "v1"},
}, resp)
Expand Down Expand Up @@ -262,7 +261,6 @@ spec:
assert.EventuallyWithT(t, func(c *assert.CollectT) {
resp := util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{
{Name: "dapr", Type: "workflow.dapr", Version: "v1"},
{Name: "uppercase", Type: "middleware.http.routeralias", Version: "v1"},
{Name: "uppercase2", Type: "middleware.http.uppercase", Version: "v1"},
}, resp)
Expand All @@ -285,12 +283,9 @@ spec:
require.NoError(t, os.Remove(filepath.Join(u.resDir3, "3.yaml")))

assert.EventuallyWithT(t, func(c *assert.CollectT) {
resp := util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{{Name: "dapr", Type: "workflow.dapr", Version: "v1"}}, resp)
resp = util.GetMetaComponents(c, ctx, client, u.daprd2.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{{Name: "dapr", Type: "workflow.dapr", Version: "v1"}}, resp)
resp = util.GetMetaComponents(c, ctx, client, u.daprd3.HTTPPort())
assert.ElementsMatch(c, []*rtv1.RegisteredComponents{{Name: "dapr", Type: "workflow.dapr", Version: "v1"}}, resp)
assert.Empty(c, util.GetMetaComponents(c, ctx, client, u.daprd1.HTTPPort()))
assert.Empty(c, util.GetMetaComponents(c, ctx, client, u.daprd2.HTTPPort()))
assert.Empty(c, util.GetMetaComponents(c, ctx, client, u.daprd3.HTTPPort()))
}, time.Second*5, time.Millisecond*100, "expected component to be loaded")

u.doReq(t, ctx, client, u.daprd1, u.daprd1, false)
Expand Down

0 comments on commit 5ed4391

Please sign in to comment.