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

feat: added mapper for regex #427

Closed
wants to merge 4 commits into from
Closed

feat: added mapper for regex #427

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f449f3d
feat: added regex and net types: ip, ipnet, cidr
marsom May 20, 2024
8727b63
fix: removed netip mappers because they are supported out of the box
marsom May 21, 2024
f068e3a
fix: remove all new mappers except the regex mapper
marsom May 23, 2024
4f79649
fix: removed all mappers, added failing test for questioning
marsom May 25, 2024
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
182 changes: 182 additions & 0 deletions mapper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ import (
"encoding/json"
"fmt"
"math"
"net"
"net/netip"
"net/url"
"os"
"path/filepath"
"reflect"
"regexp"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -138,6 +141,185 @@ func TestDurationMapperJSONResolver(t *testing.T) {
assert.Equal(t, time.Second*5, cli.Flag)
}

func TestIPAddress(t *testing.T) {
tests := []struct {
input string
expected string
}{
{"127.0.0.1", "127.0.0.1"},
{"2001:db8:abcd:0012::1", "2001:db8:abcd:12::1"},
}

t.Run("TestNetPackage", func(t *testing.T) {
var cli1 struct {
Flag net.IP
}
k1 := mustNew(t, &cli1)

for _, tt := range tests {
_, err := k1.Parse([]string{"--flag", tt.input})
assert.NoError(t, err)
assert.Equal(t, tt.expected, cli1.Flag.String())
}
})

t.Run("TestNetipPackage", func(t *testing.T) {
var cli1 struct {
Flag netip.Addr
}
k1 := mustNew(t, &cli1)

for _, tt := range tests {
_, err := k1.Parse([]string{"--flag", tt.input})
assert.NoError(t, err)
assert.Equal(t, tt.expected, cli1.Flag.String())
}
})
}

func TestIPAddressSlice(t *testing.T) {
tests := []struct {
input []string
expected []string
}{
{input: []string{"127.0.0.1", "192.168.0.1"}, expected: []string{"127.0.0.1", "192.168.0.1"}},
{input: []string{"2001:db8:abcd:0012::1", "::1"}, expected: []string{"2001:db8:abcd:12::1", "::1"}},
}

t.Run("TestNetPackage", func(t *testing.T) {
var cli struct {
Flag []net.IP
}
k := mustNew(t, &cli)

for _, tt := range tests {
_, err := k.Parse([]string{"--flag", strings.Join(tt.input, ",")})
assert.NoError(t, err)
assert.Equal(t, len(tt.input), len(cli.Flag))
}
})

t.Run("TestNetipPackage", func(t *testing.T) {
var cli struct {
Flag []netip.Addr
}
k := mustNew(t, &cli)

for _, tt := range tests {
_, err := k.Parse([]string{"--flag", strings.Join(tt.input, ",")})
assert.NoError(t, err)
assert.Equal(t, len(tt.input), len(cli.Flag))
}
})
}

func TestCIDR(t *testing.T) {
tests := []struct {
input string
expected string
}{
{"127.0.0.1/16", "127.0.0.1/16"},
{"2001:db8:abcd:0012::0/64", "2001:db8:abcd:12::/64"},
}

var cli1 struct {
Flag netip.Prefix
}
k1 := mustNew(t, &cli1)

for _, tt := range tests {
_, err := k1.Parse([]string{"--flag", tt.input})
assert.NoError(t, err)
assert.Equal(t, tt.expected, cli1.Flag.String())
}
}

func TestCIDRSlice(t *testing.T) {
tests := []struct {
input []string
expected []string
}{
{
[]string{"127.0.0.1/16", "192.168.1.0/20"},
[]string{"127.0.0.1/16", "192.168.1.0/20"},
},
{
[]string{"2001:db8:abcd:0012::0/64", "2001:db8:abcd:0012::0/128"},
[]string{"2001:db8:abcd:12::/64", "2001:db8:abcd:12::/128"},
},
}

var cli struct {
Flag []netip.Prefix
}
k := mustNew(t, &cli)

for _, tt := range tests {
_, err := k.Parse([]string{"--flag", strings.Join(tt.input, ",")})
assert.NoError(t, err)
assert.Equal(t, len(tt.input), len(cli.Flag))
for i := 0; i < len(cli.Flag); i++ {
assert.Equal(t, tt.expected[i], cli.Flag[i].String())
}
}
}

func TestRegex(t *testing.T) {
var cli struct {
Test regexp.Regexp
}

k := mustNew(t, &cli)
_, err := k.Parse([]string{"--test", "a.+[a-b]{2,4}"})
assert.NoError(t, err)
assert.Equal(t, "a.+[a-b]{2,4}", cli.Test.String())
}

func TestRegexPointer(t *testing.T) {
var cli struct {
Test *regexp.Regexp
}

k := mustNew(t, &cli)
_, err := k.Parse([]string{"--test", "a.+[a-b]{2,4}"})
assert.NoError(t, err)
assert.Equal(t, "a.+[a-b]{2,4}", cli.Test.String())
}

func TestRegexSlice(t *testing.T) {
var cli struct {
Test []regexp.Regexp `kong:"sep='none'"`
}

k := mustNew(t, &cli)
_, err := k.Parse([]string{
"--test", "foo.+[b-r]{2,4}",
"--test", "foo=bar",
})
assert.NoError(t, err)

assert.Equal(t, 2, len(cli.Test))
assert.Equal(t, "foo.+[b-r]{2,4}", cli.Test[0].String())
assert.Equal(t, "foo=bar", cli.Test[1].String())
}

func TestRegexPointerSlice(t *testing.T) {
var cli struct {
Test []*regexp.Regexp `kong:"sep='none'"`
}

k := mustNew(t, &cli)
_, err := k.Parse([]string{
"--test", "foo.+[b-r]{2,4}",
"--test", "foo=bar",
})
assert.NoError(t, err)

assert.Equal(t, 2, len(cli.Test))
assert.Equal(t, "foo.+[b-r]{2,4}", cli.Test[0].String())
assert.Equal(t, "foo=bar", cli.Test[1].String())
}

func TestSplitEscaped(t *testing.T) {
assert.Equal(t, []string{"a", "b"}, kong.SplitEscaped("a,b", ','))
assert.Equal(t, []string{"a,b", "c"}, kong.SplitEscaped(`a\,b,c`, ','))
Expand Down