Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix workload and identity filters #1109

Merged
merged 2 commits into from
Jul 6, 2023
Merged

fix workload and identity filters #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e623a58
observe: fix --from-workload and --to-workload
kaworu Jul 6, 2023
955437a
observe: fix --from-identity and --to-identity
kaworu Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/observe/flows_filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,12 +503,12 @@ func (of *flowFilter) set(f *filterTracker, name, val string, track bool) error
})
case "from-workload":
workload := parseWorkload(val)
f.applyLeft(func(f *flowpb.FlowFilter) {
f.apply(func(f *flowpb.FlowFilter) {
f.SourceWorkload = append(f.SourceWorkload, workload)
})
case "to-workload":
workload := parseWorkload(val)
f.applyRight(func(f *flowpb.FlowFilter) {
f.apply(func(f *flowpb.FlowFilter) {
f.DestinationWorkload = append(f.DestinationWorkload, workload)
})

Expand All @@ -529,15 +529,15 @@ func (of *flowFilter) set(f *filterTracker, name, val string, track bool) error
if err != nil {
return fmt.Errorf("invalid security identity, expected one of %v or a numeric value", reservedIdentitiesNames())
}
f.applyLeft(func(f *flowpb.FlowFilter) {
f.apply(func(f *flowpb.FlowFilter) {
f.SourceIdentity = append(f.SourceIdentity, identity.Uint32())
})
case "to-identity":
identity, err := parseIdentity(val)
if err != nil {
return fmt.Errorf("invalid security identity, expected one of %v or a numeric value", reservedIdentitiesNames())
}
f.applyRight(func(f *flowpb.FlowFilter) {
f.apply(func(f *flowpb.FlowFilter) {
f.DestinationIdentity = append(f.DestinationIdentity, identity.Uint32())
})

Expand Down
83 changes: 83 additions & 0 deletions cmd/observe/flows_filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,52 @@ func TestLabels(t *testing.T) {
assert.Nil(t, f.blacklist)
}

func TestFromToWorkloadCombined(t *testing.T) {
t.Run("single filter", func(t *testing.T) {
f := newFlowFilter()
cmd := newFlowsCmdWithFilter(viper.New(), f)

require.NoError(t, cmd.Flags().Parse([]string{"--from-pod", "cilium", "--to-workload", "app"}))
if diff := cmp.Diff(
[]*flowpb.FlowFilter{
{
SourcePod: []string{"cilium"},
DestinationWorkload: []*flowpb.Workload{{Name: "app"}},
},
},
f.whitelist.flowFilters(),
cmpopts.IgnoreUnexported(flowpb.FlowFilter{}, flowpb.Workload{}),
); diff != "" {
t.Errorf("mismatch (-want +got):\n%s", diff)
}
assert.Nil(t, f.blacklist)
})

t.Run("two filters", func(t *testing.T) {
f := newFlowFilter()
cmd := newFlowsCmdWithFilter(viper.New(), f)

require.NoError(t, cmd.Flags().Parse([]string{"--pod", "cilium", "--to-workload", "app"}))
if diff := cmp.Diff(
[]*flowpb.FlowFilter{
{
SourcePod: []string{"cilium"},
DestinationWorkload: []*flowpb.Workload{{Name: "app"}},
},
{
DestinationPod: []string{"cilium"},
DestinationWorkload: []*flowpb.Workload{{Name: "app"}},
},
},
f.whitelist.flowFilters(),
cmpopts.IgnoreUnexported(flowpb.FlowFilter{}, flowpb.Workload{}),
); diff != "" {
t.Errorf("mismatch (-want +got):\n%s", diff)
}
assert.Nil(t, f.blacklist)
})
}

func TestIdentity(t *testing.T) {
f := newFlowFilter()
cmd := newFlowsCmdWithFilter(viper.New(), f)
Expand Down Expand Up @@ -389,6 +435,43 @@ func TestToIdentity(t *testing.T) {
}
}

func TestFromToIdentityCombined(t *testing.T) {
t.Run("single filter", func(t *testing.T) {
f := newFlowFilter()
cmd := newFlowsCmdWithFilter(viper.New(), f)

require.NoError(t, cmd.Flags().Parse([]string{"--from-pod", "cilium", "--to-identity", "42"}))
if diff := cmp.Diff(
[]*flowpb.FlowFilter{
{SourcePod: []string{"cilium"}, DestinationIdentity: []uint32{42}},
},
f.whitelist.flowFilters(),
cmpopts.IgnoreUnexported(flowpb.FlowFilter{}),
); diff != "" {
t.Errorf("mismatch (-want +got):\n%s", diff)
}
assert.Nil(t, f.blacklist)
})

t.Run("two filters", func(t *testing.T) {
f := newFlowFilter()
cmd := newFlowsCmdWithFilter(viper.New(), f)

require.NoError(t, cmd.Flags().Parse([]string{"--pod", "cilium", "--to-identity", "42"}))
if diff := cmp.Diff(
[]*flowpb.FlowFilter{
{SourcePod: []string{"cilium"}, DestinationIdentity: []uint32{42}},
{DestinationPod: []string{"cilium"}, DestinationIdentity: []uint32{42}},
},
f.whitelist.flowFilters(),
cmpopts.IgnoreUnexported(flowpb.FlowFilter{}),
); diff != "" {
t.Errorf("mismatch (-want +got):\n%s", diff)
}
assert.Nil(t, f.blacklist)
})
}

func TestInvalidIdentity(t *testing.T) {
f := newFlowFilter()
cmd := newFlowsCmdWithFilter(viper.New(), f)
Expand Down