diff --git a/go.mod b/go.mod index e4738e7..404945d 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/miekg/dns v1.1.49 github.com/networkservicemesh/api v1.4.1-0.20220711153918-a59689088578 - github.com/networkservicemesh/sdk v1.4.0 + github.com/networkservicemesh/sdk v0.5.1-0.20220718171414-dc978c4c85c0 github.com/networkservicemesh/sdk-kernel v0.0.0-20220719140715-5672a60b9aa3 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 diff --git a/go.sum b/go.sum index 0c3e42a..6ed21c4 100644 --- a/go.sum +++ b/go.sum @@ -105,8 +105,8 @@ github.com/miekg/dns v1.1.49/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7Xn github.com/mna/pigeon v0.0.0-20180808201053-bb0192cfc2ae/go.mod h1:Iym28+kJVnC1hfQvv5MUtI6AiFFzvQjHcvI4RFTG/04= github.com/networkservicemesh/api v1.4.1-0.20220711153918-a59689088578 h1:2MZD6SGFULqTgMKA8BFy7F+ldRErAyxsWht7oCwCVRM= github.com/networkservicemesh/api v1.4.1-0.20220711153918-a59689088578/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v1.4.0 h1:ipVjmmjWYhnYvpo4N78JEOg7tjLB+DhYyyKbsJf5wPg= -github.com/networkservicemesh/sdk v1.4.0/go.mod h1:7cS1AlEYjHHUP60XvWBEv0tmVnIXaxMFgounaZgDmQk= +github.com/networkservicemesh/sdk v0.5.1-0.20220718171414-dc978c4c85c0 h1:g1VQrW5Q0c5xdKTBmaKc6GcfcIbbJXGTBIaxec5QHxM= +github.com/networkservicemesh/sdk v0.5.1-0.20220718171414-dc978c4c85c0/go.mod h1:aT31j34psbMwTmyxgKZweiuYv783A1levN9nSKUVVp0= github.com/networkservicemesh/sdk-kernel v0.0.0-20220719140715-5672a60b9aa3 h1:EEU9dHmKFGV6nxTYzkJ8q8svQAhuWVKH1pY/uqeB0Xg= github.com/networkservicemesh/sdk-kernel v0.0.0-20220719140715-5672a60b9aa3/go.mod h1:sxfMt9lMnjjdQeYB1wLRqeqtq5kLrB0VkOz0iXdrwKg= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= diff --git a/internal/pkg/imports/imports_linux.go b/internal/pkg/imports/imports_linux.go index c29804d..a7b039e 100644 --- a/internal/pkg/imports/imports_linux.go +++ b/internal/pkg/imports/imports_linux.go @@ -28,7 +28,7 @@ import ( _ "github.com/networkservicemesh/sdk/pkg/registry/common/sendfd" _ "github.com/networkservicemesh/sdk/pkg/tools/clientinfo" _ "github.com/networkservicemesh/sdk/pkg/tools/debug" - _ "github.com/networkservicemesh/sdk/pkg/tools/dnscontext" + _ "github.com/networkservicemesh/sdk/pkg/tools/dnsconfig" _ "github.com/networkservicemesh/sdk/pkg/tools/grpcutils" _ "github.com/networkservicemesh/sdk/pkg/tools/log" _ "github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger" diff --git a/main.go b/main.go index e17ed6f..b1ed9c1 100644 --- a/main.go +++ b/main.go @@ -63,7 +63,7 @@ import ( registrysendfd "github.com/networkservicemesh/sdk/pkg/registry/common/sendfd" "github.com/networkservicemesh/sdk/pkg/tools/clientinfo" "github.com/networkservicemesh/sdk/pkg/tools/debug" - dnstools "github.com/networkservicemesh/sdk/pkg/tools/dnscontext" + "github.com/networkservicemesh/sdk/pkg/tools/dnsconfig" "github.com/networkservicemesh/sdk/pkg/tools/grpcutils" "github.com/networkservicemesh/sdk/pkg/tools/log" "github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger" @@ -80,7 +80,7 @@ type Config struct { MaxTokenLifetime time.Duration `default:"10m" desc:"maximum lifetime of tokens" split_words:"true"` ServiceNames []string `default:"istio-proxy-responder" desc:"Name of provided services" split_words:"true"` Labels map[string]string `default:"" desc:"Endpoint labels"` - DNSConfigs dnstools.Decoder `default:"[]" desc:"DNSConfigs represents array of DNSConfig in json format. See at model definition: https://github.com/networkservicemesh/api/blob/main/pkg/api/networkservice/connectioncontext.pb.go#L426-L435" split_words:"true"` + DNSConfigs dnsconfig.Decoder `default:"[]" desc:"DNSConfigs represents array of DNSConfig in json format. See at model definition: https://github.com/networkservicemesh/api/blob/main/pkg/api/networkservice/connectioncontext.pb.go#L426-L435" split_words:"true"` CidrPrefix []string `default:"169.254.0.0/16" desc:"List of CIDR Prefix to assign IPv4 and IPv6 addresses from" split_words:"true"` IdleTimeout time.Duration `default:"0" desc:"timeout for automatic shutdown when there were no requests for specified time. Set 0 to disable auto-shutdown." split_words:"true"` LogLevel string `default:"INFO" desc:"Log level" split_words:"true"`