diff --git a/docs/user_guide/event_processors/event_plugin.md b/docs/user_guide/event_processors/event_plugin.md index 7349e3ba..5f81c748 100644 --- a/docs/user_guide/event_processors/event_plugin.md +++ b/docs/user_guide/event_processors/event_plugin.md @@ -60,7 +60,7 @@ import ( "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/formatters/event_plugin" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) const ( diff --git a/examples/plugins/demo/main.go b/examples/plugins/demo/main.go index 51a3cf23..3b114247 100644 --- a/examples/plugins/demo/main.go +++ b/examples/plugins/demo/main.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/go-plugin" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/formatters/event_plugin" - "github.com/openconfig/gnmic/pkg/types" ) const ( diff --git a/examples/plugins/event-add-hostname/event-add-hostname.go b/examples/plugins/event-add-hostname/event-add-hostname.go index c4166dba..4a475ac4 100644 --- a/examples/plugins/event-add-hostname/event-add-hostname.go +++ b/examples/plugins/event-add-hostname/event-add-hostname.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/formatters/event_plugin" - "github.com/openconfig/gnmic/pkg/types" ) const ( diff --git a/examples/plugins/event-gnmi-get/event-gnmi-get.go b/examples/plugins/event-gnmi-get/event-gnmi-get.go index 58d7db23..62ee60a2 100644 --- a/examples/plugins/event-gnmi-get/event-gnmi-get.go +++ b/examples/plugins/event-gnmi-get/event-gnmi-get.go @@ -18,12 +18,12 @@ import ( "github.com/openconfig/gnmi/proto/gnmi" "github.com/openconfig/gnmic/pkg/api" + "github.com/openconfig/gnmic/pkg/api/target" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/formatters/event_plugin" gtemplate "github.com/openconfig/gnmic/pkg/gtemplate" - gpath "github.com/openconfig/gnmic/pkg/path" - "github.com/openconfig/gnmic/pkg/target" - "github.com/openconfig/gnmic/pkg/types" + gpath "github.com/openconfig/gnmic/pkg/api/path" ) const ( diff --git a/examples/plugins/go-event-plugin/event-go-plugin.go b/examples/plugins/go-event-plugin/event-go-plugin.go index e8301fa0..3eddc02e 100644 --- a/examples/plugins/go-event-plugin/event-go-plugin.go +++ b/examples/plugins/go-event-plugin/event-go-plugin.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/formatters/event_plugin" - "github.com/openconfig/gnmic/pkg/types" ) const ( @@ -31,7 +31,7 @@ func (p *goSampleProcessorPlugin) Init(cfg interface{}, opts ...formatters.Optio if err != nil { return err } - for _, o :=range opts { + for _, o := range opts { o(p) } // initialize logger diff --git a/examples/plugins/minimal/event-my-processor.go b/examples/plugins/minimal/event-my-processor.go index 573b952c..b46da9c5 100644 --- a/examples/plugins/minimal/event-my-processor.go +++ b/examples/plugins/minimal/event-my-processor.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/formatters/event_plugin" - "github.com/openconfig/gnmic/pkg/types" ) const ( diff --git a/go.mod b/go.mod index 3102ef7e..22fd4028 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/openconfig/gnmic go 1.21.1 +replace github.com/openconfig/gnmic/pkg/api v0.1.2 => ./pkg/api + require ( github.com/Shopify/sarama v1.38.1 github.com/adrg/xdg v0.4.0 @@ -41,11 +43,6 @@ require ( github.com/openconfig/gnmi v0.10.0 github.com/openconfig/gnmic/pkg/api v0.1.2 github.com/openconfig/gnmic/pkg/cache v0.1.2 - github.com/openconfig/gnmic/pkg/path v0.1.1 - github.com/openconfig/gnmic/pkg/target v0.1.4 - github.com/openconfig/gnmic/pkg/testutils v0.1.0 - github.com/openconfig/gnmic/pkg/types v0.1.2 - github.com/openconfig/gnmic/pkg/utils v0.1.0 github.com/openconfig/goyang v1.4.5 github.com/openconfig/ygot v0.29.2 github.com/pkg/sftp v1.13.6 @@ -58,9 +55,9 @@ require ( github.com/spf13/viper v1.15.0 github.com/xdg/scram v1.0.5 go.starlark.net v0.0.0-20231121155337-90ade8b19d09 - golang.org/x/crypto v0.18.0 + golang.org/x/crypto v0.19.0 golang.org/x/sync v0.6.0 - google.golang.org/grpc v1.60.1 + google.golang.org/grpc v1.61.0 google.golang.org/protobuf v1.32.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/yaml.v2 v2.4.0 @@ -70,9 +67,9 @@ require ( ) require ( - cloud.google.com/go/compute v1.23.0 // indirect + cloud.google.com/go/compute v1.23.3 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v1.1.2 // indirect + cloud.google.com/go/iam v1.1.5 // indirect dario.cat/mergo v1.0.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Knetic/govaluate v3.0.0+incompatible // indirect @@ -103,8 +100,8 @@ require ( github.com/gomodule/redigo v2.0.0+incompatible // indirect github.com/google/gnostic v0.6.9 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/s2a-go v0.1.4 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect github.com/hairyhenderson/go-fsimpl v0.0.0-20220529183339-9deae3e35047 // indirect github.com/hairyhenderson/yaml v0.0.0-20220618171115-2d35fca545ce // indirect @@ -130,6 +127,9 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/nats-io/jwt/v2 v2.5.2 // indirect github.com/oklog/run v1.1.0 // indirect + github.com/onsi/ginkgo/v2 v2.11.0 // indirect + github.com/openconfig/gnmic/pkg/path v0.1.1 // indirect + github.com/openconfig/gnmic/pkg/utils v0.1.1 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect @@ -139,11 +139,11 @@ require ( go.uber.org/atomic v1.11.0 // indirect golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/oauth2 v0.13.0 // indirect - golang.org/x/term v0.16.0 // indirect + golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/term v0.17.0 // indirect golang.org/x/tools v0.13.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect gopkg.in/inf.v0 v0.9.1 // indirect k8s.io/klog/v2 v2.100.1 // indirect k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect @@ -153,7 +153,7 @@ require ( ) require ( - cloud.google.com/go v0.110.8 // indirect + cloud.google.com/go v0.110.10 // indirect cloud.google.com/go/storage v1.30.1 // indirect github.com/AlekSi/pointer v1.2.0 github.com/Masterminds/goutils v1.1.1 // indirect @@ -175,7 +175,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v3 v3.2.2 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect + github.com/chzyer/readline v1.5.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/deepmap/oapi-codegen v1.8.2 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect @@ -260,14 +260,14 @@ require ( go4.org/intern v0.0.0-20230205224052-192e9f60865c // indirect go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect gocloud.dev v0.25.1-0.20220408200107-09b10f7359f7 // indirect - golang.org/x/net v0.19.0 // indirect - golang.org/x/sys v0.16.0 // indirect + golang.org/x/net v0.21.0 // indirect + golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 golang.org/x/time v0.3.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.128.0 // indirect + google.golang.org/api v0.149.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect + google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/go.sum b/go.sum index de6ef6ad..85965aba 100644 --- a/go.sum +++ b/go.sum @@ -31,8 +31,8 @@ cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Ud cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= -cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME= -cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk= +cloud.google.com/go v0.110.10 h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y= +cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -43,8 +43,8 @@ cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTB cloud.google.com/go/compute v1.2.0/go.mod h1:xlogom/6gr8RJGBe7nT2eGsQYAFUbbv8dbC29qE3Xmw= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= -cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= -cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= +cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= @@ -53,8 +53,8 @@ cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c= cloud.google.com/go/iam v0.1.1/go.mod h1:CKqrcnI/suGpybEHxZ7BMehL0oA4LpdyJdUlTl9jVMw= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= -cloud.google.com/go/iam v1.1.2 h1:gacbrBdWcoVmGLozRuStX45YKvJtzIjJdAolzUs1sm4= -cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= +cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI= +cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= cloud.google.com/go/kms v1.1.0/go.mod h1:WdbppnCDMDpOvoYBMn1+gNmOeEoZYqAv+HeuKARGCXI= cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA= cloud.google.com/go/monitoring v1.1.0/go.mod h1:L81pzz7HKn14QCMaCs6NTQkdBnE87TElyanS95vIcl4= @@ -256,12 +256,15 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= +github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= +github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= +github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI= +github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04= +github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -422,8 +425,8 @@ github.com/go-resty/resty/v2 v2.11.0 h1:i7jMfNOJYMp69lq7qozJP+bjgzfAzeOhuGlyDrqx github.com/go-resty/resty/v2 v2.11.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw= github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= @@ -537,8 +540,8 @@ github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 h1:hR7/MlvK23p6+lIw9S github.com/google/pprof v0.0.0-20230602150820-91b7bce49751/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA= github.com/google/protobuf v3.11.4+incompatible/go.mod h1:lUQ9D1ePzbH2PrIS7ob/bjm9HXyH5WHB0Akwh7URreM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -547,8 +550,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8= github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= -github.com/googleapis/enterprise-certificate-proxy v0.2.4 h1:uGy6JWR/uMIILU8wbf+OkstIrNiMjGpEIyhx8f6W7s4= -github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -935,27 +938,21 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= -github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo= +github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= +github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/openconfig/gnmi v0.0.0-20200508230933-d19cebf5e7be/go.mod h1:M/EcuapNQgvzxo1DDXHK4tx3QpYM/uG4l591v33jG2A= github.com/openconfig/gnmi v0.10.0 h1:kQEZ/9ek3Vp2Y5IVuV2L/ba8/77TgjdXg505QXvYmg8= github.com/openconfig/gnmi v0.10.0/go.mod h1:Y9os75GmSkhHw2wX8sMsxfI7qRGAEcDh8NTa5a8vj6E= -github.com/openconfig/gnmic/pkg/api v0.1.2 h1:bbLOVDbn8RKAHSP2gFqbIss/TgS269iJ53qMqvkLDa8= -github.com/openconfig/gnmic/pkg/api v0.1.2/go.mod h1:yPdo5ZIV3WUb9yQJuy9LosO/kTKzD6dTKzb0X8e5AVM= github.com/openconfig/gnmic/pkg/cache v0.1.2 h1:n7TwHP4qOrRNZbRYLa+mLO0LEJlnHNiCrQ0JJSa1KBw= github.com/openconfig/gnmic/pkg/cache v0.1.2/go.mod h1:EQpcUMnkiUUvsSpAux8Jul8Tfkz6XT/wJvXbgohCyr4= github.com/openconfig/gnmic/pkg/path v0.1.1 h1:C6vZTC0NsMOGyre7ueXRS8vmYvCW9sdHKQ5cqWYiNPw= github.com/openconfig/gnmic/pkg/path v0.1.1/go.mod h1:Z2Ejm3UIO7WDxlXsnJmzE7/lnWe/0neCuXW6QDwmYHQ= -github.com/openconfig/gnmic/pkg/target v0.1.4 h1:zO7gOke9RVnkockM2lZv5MqgNdfysUSqxyp91OnEjOQ= -github.com/openconfig/gnmic/pkg/target v0.1.4/go.mod h1:hNmkYvuYFaUtbFWVm0PuvctJ70ku+fotxZxmkr5oeWM= github.com/openconfig/gnmic/pkg/testutils v0.1.0 h1:Mw6LKGqzXQnrI9fCtaCAp3pFDy2B0+rKQFtjCqQWJwM= github.com/openconfig/gnmic/pkg/testutils v0.1.0/go.mod h1:/JyhCq6rSbQdmeCbPIQjD8K3ArOqGQZFKUKKUpebonk= -github.com/openconfig/gnmic/pkg/types v0.1.2 h1:FRjERZrbcuqhwRKHZ7ux4UXr4fc1DlgXvH37Iysu4Co= -github.com/openconfig/gnmic/pkg/types v0.1.2/go.mod h1:Gwc9suBy/s17bP8BaCrp3dE5E+RkcHqVIkFqdXopog4= -github.com/openconfig/gnmic/pkg/utils v0.1.0 h1:MqRhW8oJdPpBb1UprbnpDxciBJVjl/Gw97xuNoBG3Vs= -github.com/openconfig/gnmic/pkg/utils v0.1.0/go.mod h1:DQm/e8cdRwdmUORjODWteDU0HG0CWNYBAhLWqnPQegE= +github.com/openconfig/gnmic/pkg/utils v0.1.1 h1:LgfI/c/O8VpuZg1RS9G6XEeRhAQSlOalE52/8tsdf00= +github.com/openconfig/gnmic/pkg/utils v0.1.1/go.mod h1:DQm/e8cdRwdmUORjODWteDU0HG0CWNYBAhLWqnPQegE= github.com/openconfig/goyang v0.0.0-20200115183954-d0a48929f0ea/go.mod h1:dhXaV0JgHJzdrHi2l+w0fZrwArtXL7jEFoiqLEdmkvU= github.com/openconfig/goyang v1.4.5 h1:+s3p3MeiPQ/QNsC5DL3MXhCp5cv4dag3vlGKCtszsRU= github.com/openconfig/goyang v1.4.5/go.mod h1:sdNZi/wdTZyLNBNfgLzmmbi7kISm7FskMDKKzMY+x1M= @@ -1207,7 +1204,6 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20211115234514-b4de73f9ece8/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -1217,8 +1213,8 @@ golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1322,8 +1318,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1344,8 +1340,8 @@ golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= -golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1449,6 +1445,7 @@ golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1465,8 +1462,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1477,8 +1474,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1623,8 +1620,8 @@ google.golang.org/api v0.69.0/go.mod h1:boanBiw+h5c3s+tBPgEzLDRHfFLWV0qXxRHz3ws7 google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= -google.golang.org/api v0.128.0 h1:RjPESny5CnQRn9V6siglged+DZCgfu9l6mO9dkX9VOg= -google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750= +google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY= +google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1721,12 +1718,12 @@ google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2 google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220401170504-314d38edb7de/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA+oRzP9k7cSwJlvDFiROO72uwD6i0= -google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk= -google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU= -google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 h1:6GQBEOdGkX6MMTLT9V+TjtIRZCw9VPD5Z+yHY9wMgS0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY= +google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ= +google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1757,8 +1754,8 @@ google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= -google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= +google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= +google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/pkg/actions/action.go b/pkg/actions/action.go index 86377b3c..d2cb6128 100644 --- a/pkg/actions/action.go +++ b/pkg/actions/action.go @@ -13,7 +13,7 @@ import ( "log" "github.com/mitchellh/mapstructure" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) type Action interface { diff --git a/pkg/actions/gnmi_action/gnmi_action.go b/pkg/actions/gnmi_action/gnmi_action.go index 63e549e0..eb6c51d3 100644 --- a/pkg/actions/gnmi_action/gnmi_action.go +++ b/pkg/actions/gnmi_action/gnmi_action.go @@ -26,11 +26,11 @@ import ( "github.com/openconfig/gnmic/pkg/actions" "github.com/openconfig/gnmic/pkg/api" + "github.com/openconfig/gnmic/pkg/api/target" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" - "github.com/openconfig/gnmic/pkg/target" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/actions/gnmi_action/gnmi_action_test.go b/pkg/actions/gnmi_action/gnmi_action_test.go index b9dd2efb..42727bbb 100644 --- a/pkg/actions/gnmi_action/gnmi_action_test.go +++ b/pkg/actions/gnmi_action/gnmi_action_test.go @@ -14,8 +14,8 @@ import ( "github.com/openconfig/gnmi/proto/gnmi" "github.com/openconfig/gnmic/pkg/actions" + "github.com/openconfig/gnmic/pkg/api/testutils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/testutils" ) type getRequestTestItem struct { diff --git a/pkg/actions/gnmi_action/options.go b/pkg/actions/gnmi_action/options.go index 5e1324c9..67c2581d 100644 --- a/pkg/actions/gnmi_action/options.go +++ b/pkg/actions/gnmi_action/options.go @@ -12,8 +12,8 @@ import ( "log" "os" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" ) func (g *gnmiAction) WithTargets(tcs map[string]*types.TargetConfig) { diff --git a/pkg/actions/http_action/http_action.go b/pkg/actions/http_action/http_action.go index 93d9c5f7..47ca649c 100644 --- a/pkg/actions/http_action/http_action.go +++ b/pkg/actions/http_action/http_action.go @@ -23,9 +23,9 @@ import ( "time" "github.com/openconfig/gnmic/pkg/actions" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/actions/http_action/http_action_test.go b/pkg/actions/http_action/http_action_test.go index d0a6d03c..4f5febc2 100644 --- a/pkg/actions/http_action/http_action_test.go +++ b/pkg/actions/http_action/http_action_test.go @@ -23,8 +23,8 @@ import ( "time" "github.com/openconfig/gnmic/pkg/actions" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/utils" ) type item struct { diff --git a/pkg/actions/script_action/options.go b/pkg/actions/script_action/options.go index 337b3fa1..0ecbadbe 100644 --- a/pkg/actions/script_action/options.go +++ b/pkg/actions/script_action/options.go @@ -12,8 +12,8 @@ import ( "log" "os" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" ) func (s *scriptAction) WithTargets(map[string]*types.TargetConfig) {} diff --git a/pkg/actions/template_action/options.go b/pkg/actions/template_action/options.go index a0c3ab5e..f3bd11d2 100644 --- a/pkg/actions/template_action/options.go +++ b/pkg/actions/template_action/options.go @@ -12,8 +12,8 @@ import ( "log" "os" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" ) func (t *templateAction) WithTargets(map[string]*types.TargetConfig) {} diff --git a/pkg/api/gnmi_msgs.go b/pkg/api/gnmi_msgs.go index 0b19d2a9..6e6ef379 100644 --- a/pkg/api/gnmi_msgs.go +++ b/pkg/api/gnmi_msgs.go @@ -20,7 +20,7 @@ import ( "github.com/openconfig/gnmi/proto/gnmi" "github.com/openconfig/gnmi/proto/gnmi_ext" gvalue "github.com/openconfig/gnmi/value" - "github.com/openconfig/gnmic/pkg/path" + "github.com/openconfig/gnmic/pkg/api/path" "google.golang.org/protobuf/proto" ) diff --git a/pkg/api/gnmi_msgs_test.go b/pkg/api/gnmi_msgs_test.go index 200d7598..53a9ace8 100644 --- a/pkg/api/gnmi_msgs_test.go +++ b/pkg/api/gnmi_msgs_test.go @@ -18,7 +18,7 @@ import ( "github.com/openconfig/gnmi/proto/gnmi" "github.com/openconfig/gnmi/proto/gnmi_ext" - "github.com/openconfig/gnmic/pkg/testutils" + "github.com/openconfig/gnmic/pkg/api/testutils" ) // Capabilities Request / Response tests diff --git a/pkg/api/go.mod b/pkg/api/go.mod index 3fc7d5e1..969bc45e 100644 --- a/pkg/api/go.mod +++ b/pkg/api/go.mod @@ -5,30 +5,23 @@ go 1.21.1 require ( github.com/AlekSi/pointer v1.2.0 github.com/google/go-cmp v0.6.0 + github.com/jhump/protoreflect v1.15.3 github.com/openconfig/gnmi v0.10.0 github.com/openconfig/grpctunnel v0.1.0 + golang.org/x/net v0.21.0 + golang.org/x/oauth2 v0.17.0 + google.golang.org/grpc v1.61.0 google.golang.org/protobuf v1.32.0 ) require ( - github.com/openconfig/gnmic/pkg/path v0.1.1 - github.com/openconfig/gnmic/pkg/target v0.1.4 - github.com/openconfig/gnmic/pkg/testutils v0.1.0 - github.com/openconfig/gnmic/pkg/types v0.1.2 - github.com/openconfig/gnmic/pkg/utils v0.1.0 // indirect -) - -require ( - cloud.google.com/go/compute v1.23.0 // indirect + cloud.google.com/go/compute v1.23.3 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect github.com/bufbuild/protocompile v0.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/jhump/protoreflect v1.15.3 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.13.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/grpc v1.59.0 // indirect + golang.org/x/sync v0.6.0 // indirect + golang.org/x/sys v0.17.0 // indirect + golang.org/x/text v0.14.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect ) diff --git a/pkg/api/go.sum b/pkg/api/go.sum index 877d6174..95f57b23 100644 --- a/pkg/api/go.sum +++ b/pkg/api/go.sum @@ -1,13 +1,13 @@ -cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= -cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= +cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w= github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0= github.com/bufbuild/protocompile v0.6.0 h1:Uu7WiSQ6Yj9DbkdnOe7U4mNKp58y9WDMKDn28/ZlunY= github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -17,41 +17,49 @@ github.com/jhump/protoreflect v1.15.3 h1:6SFRuqU45u9hIZPJAoZ8c28T3nK64BNdp9w6jFo github.com/jhump/protoreflect v1.15.3/go.mod h1:4ORHmSBmlCW8fh3xHmJMGyul1zNqZK4Elxc8qKP+p1k= github.com/openconfig/gnmi v0.10.0 h1:kQEZ/9ek3Vp2Y5IVuV2L/ba8/77TgjdXg505QXvYmg8= github.com/openconfig/gnmi v0.10.0/go.mod h1:Y9os75GmSkhHw2wX8sMsxfI7qRGAEcDh8NTa5a8vj6E= -github.com/openconfig/gnmic/pkg/path v0.1.1 h1:C6vZTC0NsMOGyre7ueXRS8vmYvCW9sdHKQ5cqWYiNPw= -github.com/openconfig/gnmic/pkg/path v0.1.1/go.mod h1:Z2Ejm3UIO7WDxlXsnJmzE7/lnWe/0neCuXW6QDwmYHQ= -github.com/openconfig/gnmic/pkg/target v0.1.4 h1:zO7gOke9RVnkockM2lZv5MqgNdfysUSqxyp91OnEjOQ= -github.com/openconfig/gnmic/pkg/target v0.1.4/go.mod h1:hNmkYvuYFaUtbFWVm0PuvctJ70ku+fotxZxmkr5oeWM= -github.com/openconfig/gnmic/pkg/testutils v0.1.0 h1:Mw6LKGqzXQnrI9fCtaCAp3pFDy2B0+rKQFtjCqQWJwM= -github.com/openconfig/gnmic/pkg/testutils v0.1.0/go.mod h1:/JyhCq6rSbQdmeCbPIQjD8K3ArOqGQZFKUKKUpebonk= -github.com/openconfig/gnmic/pkg/types v0.1.2 h1:FRjERZrbcuqhwRKHZ7ux4UXr4fc1DlgXvH37Iysu4Co= -github.com/openconfig/gnmic/pkg/types v0.1.2/go.mod h1:Gwc9suBy/s17bP8BaCrp3dE5E+RkcHqVIkFqdXopog4= -github.com/openconfig/gnmic/pkg/utils v0.1.0 h1:MqRhW8oJdPpBb1UprbnpDxciBJVjl/Gw97xuNoBG3Vs= -github.com/openconfig/gnmic/pkg/utils v0.1.0/go.mod h1:DQm/e8cdRwdmUORjODWteDU0HG0CWNYBAhLWqnPQegE= github.com/openconfig/grpctunnel v0.1.0 h1:EN99qtlExZczgQgp5ANnHRC/Rs62cAG+Tz2BQ5m/maM= github.com/openconfig/grpctunnel v0.1.0/go.mod h1:G04Pdu0pml98tdvXrvLaU+EBo3PxYfI9MYqpvdaEHLo= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= -golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= -google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= +google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= +google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= diff --git a/pkg/path/path.go b/pkg/api/path/path.go similarity index 100% rename from pkg/path/path.go rename to pkg/api/path/path.go diff --git a/pkg/path/path_test.go b/pkg/api/path/path_test.go similarity index 99% rename from pkg/path/path_test.go rename to pkg/api/path/path_test.go index 4e13001a..a1783e60 100644 --- a/pkg/path/path_test.go +++ b/pkg/api/path/path_test.go @@ -15,7 +15,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/openconfig/gnmi/proto/gnmi" - "github.com/openconfig/gnmic/pkg/testutils" + "github.com/openconfig/gnmic/pkg/api/testutils" ) var prefixSet = map[string]*gnmi.Path{ diff --git a/pkg/api/target.go b/pkg/api/target.go index 4cebc5d8..2ed48bac 100644 --- a/pkg/api/target.go +++ b/pkg/api/target.go @@ -15,8 +15,8 @@ import ( "github.com/AlekSi/pointer" - "github.com/openconfig/gnmic/pkg/target" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/target" + "github.com/openconfig/gnmic/pkg/api/types" ) var DefaultTargetTimeout = 10 * time.Second diff --git a/pkg/target/subscribe.go b/pkg/api/target/subscribe.go similarity index 99% rename from pkg/target/subscribe.go rename to pkg/api/target/subscribe.go index 24c513a0..758288e3 100644 --- a/pkg/target/subscribe.go +++ b/pkg/api/target/subscribe.go @@ -18,7 +18,7 @@ import ( "github.com/jhump/protoreflect/dynamic" "github.com/openconfig/gnmi/proto/gnmi" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) // Subscribe sends a gnmi.SubscribeRequest to the target *t, responses and error are sent to the target channels diff --git a/pkg/target/target.go b/pkg/api/target/target.go similarity index 99% rename from pkg/target/target.go rename to pkg/api/target/target.go index 8b1cb5b2..36efcba3 100644 --- a/pkg/target/target.go +++ b/pkg/api/target/target.go @@ -19,7 +19,7 @@ import ( "github.com/jhump/protoreflect/desc" "github.com/openconfig/gnmi/proto/gnmi" "github.com/openconfig/gnmi/proto/gnmi_ext" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" "golang.org/x/net/proxy" "golang.org/x/oauth2" "google.golang.org/grpc" diff --git a/pkg/api/target_test.go b/pkg/api/target_test.go index a5e02218..24c860ab 100644 --- a/pkg/api/target_test.go +++ b/pkg/api/target_test.go @@ -14,7 +14,7 @@ import ( "github.com/AlekSi/pointer" "github.com/google/go-cmp/cmp" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) type input struct { diff --git a/pkg/testutils/utils.go b/pkg/api/testutils/utils.go similarity index 100% rename from pkg/testutils/utils.go rename to pkg/api/testutils/utils.go diff --git a/pkg/api/tunnel_test.go b/pkg/api/tunnel_test.go index 93dd206f..ceb68908 100644 --- a/pkg/api/tunnel_test.go +++ b/pkg/api/tunnel_test.go @@ -14,7 +14,7 @@ import ( tpb "github.com/openconfig/grpctunnel/proto/tunnel" - "github.com/openconfig/gnmic/pkg/testutils" + "github.com/openconfig/gnmic/pkg/api/testutils" ) type registerOpInput struct { diff --git a/pkg/types/sasl.go b/pkg/api/types/sasl.go similarity index 100% rename from pkg/types/sasl.go rename to pkg/api/types/sasl.go diff --git a/pkg/types/subscription.go b/pkg/api/types/subscription.go similarity index 100% rename from pkg/types/subscription.go rename to pkg/api/types/subscription.go diff --git a/pkg/types/target.go b/pkg/api/types/target.go similarity index 99% rename from pkg/types/target.go rename to pkg/api/types/target.go index ea252447..379ca47a 100644 --- a/pkg/types/target.go +++ b/pkg/api/types/target.go @@ -23,7 +23,7 @@ import ( "google.golang.org/grpc/credentials/oauth" "google.golang.org/grpc/encoding/gzip" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/utils" ) // map of supported cipher suites diff --git a/pkg/types/tls.go b/pkg/api/types/tls.go similarity index 100% rename from pkg/types/tls.go rename to pkg/api/types/tls.go diff --git a/pkg/utils/tls.go b/pkg/api/utils/tls.go similarity index 100% rename from pkg/utils/tls.go rename to pkg/api/utils/tls.go diff --git a/pkg/utils/utils.go b/pkg/api/utils/utils.go similarity index 100% rename from pkg/utils/utils.go rename to pkg/api/utils/utils.go diff --git a/pkg/utils/utils_test.go b/pkg/api/utils/utils_test.go similarity index 100% rename from pkg/utils/utils_test.go rename to pkg/api/utils/utils_test.go diff --git a/pkg/app/api.go b/pkg/app/api.go index 0204caaf..10740c60 100644 --- a/pkg/app/api.go +++ b/pkg/app/api.go @@ -22,8 +22,8 @@ import ( "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" ) func (a *App) newAPIServer() (*http.Server, error) { diff --git a/pkg/app/app.go b/pkg/app/app.go index b41189c8..88448474 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -38,6 +38,7 @@ import ( "google.golang.org/protobuf/proto" "gopkg.in/yaml.v2" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/cache" "github.com/openconfig/gnmic/pkg/config" "github.com/openconfig/gnmic/pkg/formatters" @@ -45,8 +46,7 @@ import ( "github.com/openconfig/gnmic/pkg/inputs" "github.com/openconfig/gnmic/pkg/lockers" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/target" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/target" ) const ( diff --git a/pkg/app/capabilities.go b/pkg/app/capabilities.go index e4e3d97a..f316de8e 100644 --- a/pkg/app/capabilities.go +++ b/pkg/app/capabilities.go @@ -18,7 +18,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) func (a *App) CapPreRunE(cmd *cobra.Command, _ []string) error { diff --git a/pkg/app/clustering.go b/pkg/app/clustering.go index 42a75657..b6f142ed 100644 --- a/pkg/app/clustering.go +++ b/pkg/app/clustering.go @@ -22,8 +22,8 @@ import ( "strings" "time" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/lockers" - "github.com/openconfig/gnmic/pkg/types" ) const ( diff --git a/pkg/app/collector.go b/pkg/app/collector.go index c0eaf1b7..2694c939 100644 --- a/pkg/app/collector.go +++ b/pkg/app/collector.go @@ -19,10 +19,10 @@ import ( "github.com/openconfig/gnmi/proto/gnmi" "google.golang.org/protobuf/proto" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/target" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/target" ) const ( diff --git a/pkg/app/diff.go b/pkg/app/diff.go index 70d0a962..17e6511e 100644 --- a/pkg/app/diff.go +++ b/pkg/app/diff.go @@ -24,9 +24,9 @@ import ( "github.com/spf13/pflag" "google.golang.org/protobuf/proto" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/config" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" ) type targetDiffResponse struct { diff --git a/pkg/app/generate.go b/pkg/app/generate.go index 2da31c28..215295b5 100644 --- a/pkg/app/generate.go +++ b/pkg/app/generate.go @@ -24,8 +24,8 @@ import ( "github.com/spf13/pflag" "gopkg.in/yaml.v2" + "github.com/openconfig/gnmic/pkg/api/path" "github.com/openconfig/gnmic/pkg/config" - "github.com/openconfig/gnmic/pkg/path" ) // options for formatting keys when generating yaml/json payloads diff --git a/pkg/app/get.go b/pkg/app/get.go index b5227c6e..8e69e58b 100644 --- a/pkg/app/get.go +++ b/pkg/app/get.go @@ -19,9 +19,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/config" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" ) func (a *App) GetPreRunE(cmd *cobra.Command, args []string) error { diff --git a/pkg/app/getset.go b/pkg/app/getset.go index 9ce8bbbc..c3378bd3 100644 --- a/pkg/app/getset.go +++ b/pkg/app/getset.go @@ -20,9 +20,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/config" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" ) func (a *App) GetSetPreRunE(cmd *cobra.Command, args []string) error { diff --git a/pkg/app/gnmi_client.go b/pkg/app/gnmi_client.go index d9aa073d..85ba8d1c 100644 --- a/pkg/app/gnmi_client.go +++ b/pkg/app/gnmi_client.go @@ -15,7 +15,7 @@ import ( "github.com/openconfig/gnmi/proto/gnmi" "github.com/openconfig/gnmi/proto/gnmi_ext" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) func (a *App) ClientCapabilities(ctx context.Context, tc *types.TargetConfig, ext ...*gnmi_ext.Extension) (*gnmi.CapabilityResponse, error) { diff --git a/pkg/app/gnmi_client_subscribe.go b/pkg/app/gnmi_client_subscribe.go index e8b7c8ce..b64261c0 100644 --- a/pkg/app/gnmi_client_subscribe.go +++ b/pkg/app/gnmi_client_subscribe.go @@ -20,10 +20,10 @@ import ( "github.com/openconfig/grpctunnel/tunnel" "google.golang.org/grpc" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/config" "github.com/openconfig/gnmic/pkg/lockers" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" ) type subscriptionRequest struct { diff --git a/pkg/app/gnmi_server.go b/pkg/app/gnmi_server.go index edde0324..70bd5e39 100644 --- a/pkg/app/gnmi_server.go +++ b/pkg/app/gnmi_server.go @@ -31,11 +31,11 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "github.com/openconfig/gnmic/pkg/api/path" + "github.com/openconfig/gnmic/pkg/api/target" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/cache" - "github.com/openconfig/gnmic/pkg/path" - "github.com/openconfig/gnmic/pkg/target" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) type streamClient struct { diff --git a/pkg/app/inputs.go b/pkg/app/inputs.go index 4835b90c..7ec58fbf 100644 --- a/pkg/app/inputs.go +++ b/pkg/app/inputs.go @@ -11,8 +11,8 @@ package app import ( "context" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/inputs" - "github.com/openconfig/gnmic/pkg/types" ) func (a *App) InitInput(ctx context.Context, name string, tcs map[string]*types.TargetConfig) { diff --git a/pkg/app/outputs.go b/pkg/app/outputs.go index f05df37c..f08d7f47 100644 --- a/pkg/app/outputs.go +++ b/pkg/app/outputs.go @@ -13,8 +13,8 @@ import ( "fmt" "sync" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" ) func (a *App) InitOutput(ctx context.Context, name string, tcs map[string]*types.TargetConfig) { diff --git a/pkg/app/path.go b/pkg/app/path.go index 511f48b9..6a476391 100644 --- a/pkg/app/path.go +++ b/pkg/app/path.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/openconfig/gnmic/pkg/path" + "github.com/openconfig/gnmic/pkg/api/path" ) type pathGenOpts struct { diff --git a/pkg/app/set.go b/pkg/app/set.go index 0086e9f4..21927749 100644 --- a/pkg/app/set.go +++ b/pkg/app/set.go @@ -17,8 +17,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/config" - "github.com/openconfig/gnmic/pkg/types" ) func (a *App) SetPreRunE(cmd *cobra.Command, args []string) error { diff --git a/pkg/app/subscribe.go b/pkg/app/subscribe.go index e4a028d9..aca6be42 100644 --- a/pkg/app/subscribe.go +++ b/pkg/app/subscribe.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/config" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" ) const ( diff --git a/pkg/app/subscribe_prompt.go b/pkg/app/subscribe_prompt.go index 34e4d5fe..34e032c8 100644 --- a/pkg/app/subscribe_prompt.go +++ b/pkg/app/subscribe_prompt.go @@ -14,7 +14,7 @@ import ( "github.com/spf13/cobra" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) func (a *App) SubscribeRunPrompt(cmd *cobra.Command, args []string) error { diff --git a/pkg/app/target.go b/pkg/app/target.go index 0b759b0a..904c2cd9 100644 --- a/pkg/app/target.go +++ b/pkg/app/target.go @@ -14,8 +14,8 @@ import ( "github.com/fullstorydev/grpcurl" - "github.com/openconfig/gnmic/pkg/target" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/target" + "github.com/openconfig/gnmic/pkg/api/types" ) // initTarget initializes a new target given its name. diff --git a/pkg/app/tunnel.go b/pkg/app/tunnel.go index 940fbcef..0ad2cf25 100644 --- a/pkg/app/tunnel.go +++ b/pkg/app/tunnel.go @@ -23,8 +23,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" ) func (a *App) initTunnelServer(tsc tunnel.ServerConfig) error { diff --git a/pkg/cache/go.mod b/pkg/cache/go.mod index 5f640515..5c0c0c53 100644 --- a/pkg/cache/go.mod +++ b/pkg/cache/go.mod @@ -2,35 +2,37 @@ module github.com/openconfig/gnmic/pkg/cache go 1.21.1 +replace github.com/openconfig/gnmic/pkg/api v0.1.4 => ../api + require ( github.com/go-redis/redis/v8 v8.11.5 github.com/nats-io/nats-server/v2 v2.10.4 - github.com/nats-io/nats.go v1.31.0 + github.com/nats-io/nats.go v1.32.0 github.com/openconfig/gnmi v0.10.0 - github.com/openconfig/gnmic/pkg/path v0.1.1 - github.com/openconfig/gnmic/pkg/utils v0.1.0 - google.golang.org/protobuf v1.31.0 + github.com/openconfig/gnmic/pkg/api v0.1.4 + google.golang.org/protobuf v1.32.0 ) require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/golang/glog v1.1.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/klauspost/compress v1.17.2 // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/nats-io/jwt/v2 v2.5.2 // indirect - github.com/nats-io/nkeys v0.4.6 // indirect + github.com/nats-io/nkeys v0.4.7 // indirect github.com/nats-io/nuid v1.0.1 // indirect - github.com/onsi/gomega v1.27.4 // indirect - github.com/openconfig/goyang v1.4.2 // indirect + github.com/onsi/gomega v1.27.10 // indirect + github.com/openconfig/goyang v1.4.5 // indirect github.com/openconfig/ygot v0.29.2 // indirect - golang.org/x/crypto v0.14.0 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/crypto v0.19.0 // indirect + golang.org/x/net v0.21.0 // indirect + golang.org/x/sys v0.17.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.3.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/grpc v1.59.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect + google.golang.org/grpc v1.61.0 // indirect ) diff --git a/pkg/cache/go.sum b/pkg/cache/go.sum index d4c3640f..77fc90d7 100644 --- a/pkg/cache/go.sum +++ b/pkg/cache/go.sum @@ -1,18 +1,31 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/cenkalti/backoff/v4 v4.0.0/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -21,121 +34,179 @@ github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/protobuf v3.11.4+incompatible/go.mod h1:lUQ9D1ePzbH2PrIS7ob/bjm9HXyH5WHB0Akwh7URreM= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= +github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= github.com/nats-io/jwt/v2 v2.5.2 h1:DhGH+nKt+wIkDxM6qnVSKjokq5t59AZV5HRcFW0zJwU= github.com/nats-io/jwt/v2 v2.5.2/go.mod h1:24BeQtRwxRV8ruvC4CojXlx/WQ/VjuwlYiH+vu/+ibI= github.com/nats-io/nats-server/v2 v2.10.4 h1:uB9xcwon3tPXWAdmTJqqqC6cie3yuPWHJjjTBgaPNus= github.com/nats-io/nats-server/v2 v2.10.4/go.mod h1:eWm2JmHP9Lqm2oemB6/XGi0/GwsZwtWf8HIPUsh+9ns= -github.com/nats-io/nats.go v1.31.0 h1:/WFBHEc/dOKBF6qf1TZhrdEfTmOZ5JzdJ+Y3m6Y/p7E= -github.com/nats-io/nats.go v1.31.0/go.mod h1:di3Bm5MLsoB4Bx61CBTsxuarI36WbhAwOm8QrW39+i8= -github.com/nats-io/nkeys v0.4.6 h1:IzVe95ru2CT6ta874rt9saQRkWfe2nFj1NtvYSLqMzY= -github.com/nats-io/nkeys v0.4.6/go.mod h1:4DxZNzenSVd1cYQoAa8948QY3QDjrHfcfVADymtkpts= +github.com/nats-io/nats.go v1.32.0 h1:Bx9BZS+aXYlxW08k8Gd3yR2s73pV5XSoAQUyp1Kwvp0= +github.com/nats-io/nats.go v1.32.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= +github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= +github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= -github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= -github.com/openconfig/gnmi v0.0.0-20200414194230-1597cc0f2600/go.mod h1:M/EcuapNQgvzxo1DDXHK4tx3QpYM/uG4l591v33jG2A= +github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/openconfig/gnmi v0.10.0 h1:kQEZ/9ek3Vp2Y5IVuV2L/ba8/77TgjdXg505QXvYmg8= github.com/openconfig/gnmi v0.10.0/go.mod h1:Y9os75GmSkhHw2wX8sMsxfI7qRGAEcDh8NTa5a8vj6E= -github.com/openconfig/gnmic/pkg/path v0.1.1 h1:C6vZTC0NsMOGyre7ueXRS8vmYvCW9sdHKQ5cqWYiNPw= -github.com/openconfig/gnmic/pkg/path v0.1.1/go.mod h1:Z2Ejm3UIO7WDxlXsnJmzE7/lnWe/0neCuXW6QDwmYHQ= -github.com/openconfig/gnmic/pkg/testutils v0.1.0 h1:Mw6LKGqzXQnrI9fCtaCAp3pFDy2B0+rKQFtjCqQWJwM= -github.com/openconfig/gnmic/pkg/testutils v0.1.0/go.mod h1:/JyhCq6rSbQdmeCbPIQjD8K3ArOqGQZFKUKKUpebonk= -github.com/openconfig/gnmic/pkg/utils v0.1.0 h1:MqRhW8oJdPpBb1UprbnpDxciBJVjl/Gw97xuNoBG3Vs= -github.com/openconfig/gnmic/pkg/utils v0.1.0/go.mod h1:DQm/e8cdRwdmUORjODWteDU0HG0CWNYBAhLWqnPQegE= github.com/openconfig/goyang v0.0.0-20200115183954-d0a48929f0ea/go.mod h1:dhXaV0JgHJzdrHi2l+w0fZrwArtXL7jEFoiqLEdmkvU= -github.com/openconfig/goyang v1.4.2 h1:inJe/BwVSBIhDN003MVKPUNeLDlLPJrvNV+ZsXdKNxc= -github.com/openconfig/goyang v1.4.2/go.mod h1:vX61x01Q46AzbZUzG617vWqh/cB+aisc+RrNkXRd3W8= +github.com/openconfig/goyang v1.4.5 h1:+s3p3MeiPQ/QNsC5DL3MXhCp5cv4dag3vlGKCtszsRU= +github.com/openconfig/goyang v1.4.5/go.mod h1:sdNZi/wdTZyLNBNfgLzmmbi7kISm7FskMDKKzMY+x1M= +github.com/openconfig/grpctunnel v0.0.0-20220819142823-6f5422b8ca70/go.mod h1:OmTWe7RyZj2CIzIgy4ovEBzCLBJzRvWSZmn7u02U9gU= github.com/openconfig/grpctunnel v0.1.0 h1:EN99qtlExZczgQgp5ANnHRC/Rs62cAG+Tz2BQ5m/maM= github.com/openconfig/grpctunnel v0.1.0/go.mod h1:G04Pdu0pml98tdvXrvLaU+EBo3PxYfI9MYqpvdaEHLo= github.com/openconfig/ygot v0.6.0/go.mod h1:o30svNf7O0xK+R35tlx95odkDmZWS9JyWWQSmIhqwAs= github.com/openconfig/ygot v0.29.2 h1:K0cRipc6LluVEQv6+/CCyr8dJuAI9PHhOFtgJHwhCjI= github.com/openconfig/ygot v0.29.2/go.mod h1:i0wozoTfFxK7SuMBHhAigyl6+e2BTCb1QYsFW9NLmjQ= -github.com/pborman/getopt v0.0.0-20190409184431-ee0cd42419d3/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= +github.com/pborman/getopt v1.1.0/go.mod h1:FxXoW1Re00sQG/+KIkuSqRL/LwQgSkv7uyac+STFsbk= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/protocolbuffers/txtpbfmt v0.0.0-20220608084003-fc78c767cd6a/go.mod h1:KjY0wibdYKc4DYkerHSbguaf3JeIPGhNJBp2BNiFH78= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20210811021853-ddbe55d93216/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= -google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= +google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/pkg/cache/jetstream_cache.go b/pkg/cache/jetstream_cache.go index 6e521dd2..4290e4f2 100644 --- a/pkg/cache/jetstream_cache.go +++ b/pkg/cache/jetstream_cache.go @@ -25,7 +25,7 @@ import ( "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" "github.com/openconfig/gnmi/proto/gnmi" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/utils" ) const ( diff --git a/pkg/cache/nats_cache.go b/pkg/cache/nats_cache.go index bd820719..d36fdbbc 100644 --- a/pkg/cache/nats_cache.go +++ b/pkg/cache/nats_cache.go @@ -21,7 +21,7 @@ import ( "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" "github.com/openconfig/gnmi/proto/gnmi" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/utils" ) const ( diff --git a/pkg/cache/oc_cache.go b/pkg/cache/oc_cache.go index b522e6f4..f64c672a 100644 --- a/pkg/cache/oc_cache.go +++ b/pkg/cache/oc_cache.go @@ -22,8 +22,8 @@ import ( "github.com/openconfig/gnmi/path" "github.com/openconfig/gnmi/proto/gnmi" "github.com/openconfig/gnmi/subscribe" - gpath "github.com/openconfig/gnmic/pkg/path" - "github.com/openconfig/gnmic/pkg/utils" + gpath "github.com/openconfig/gnmic/pkg/api/path" + "github.com/openconfig/gnmic/pkg/api/utils" "google.golang.org/protobuf/proto" ) diff --git a/pkg/cache/redis_cache.go b/pkg/cache/redis_cache.go index 241b37dc..61d59184 100644 --- a/pkg/cache/redis_cache.go +++ b/pkg/cache/redis_cache.go @@ -21,7 +21,7 @@ import ( redis "github.com/go-redis/redis/v8" "github.com/openconfig/gnmi/proto/gnmi" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/utils" ) const ( diff --git a/pkg/cmd/listener/listener.go b/pkg/cmd/listener/listener.go index 543afaa8..37c71b86 100644 --- a/pkg/cmd/listener/listener.go +++ b/pkg/cmd/listener/listener.go @@ -31,9 +31,9 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/peer" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/app" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/utils" ) // New returns the listen command tree. diff --git a/pkg/cmd/prompt.go b/pkg/cmd/prompt.go index f60e4ab9..6958bbed 100644 --- a/pkg/cmd/prompt.go +++ b/pkg/cmd/prompt.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/cmd/get" "github.com/openconfig/gnmic/pkg/cmd/subscribe" - "github.com/openconfig/gnmic/pkg/types" ) var colorMapping = map[string]goprompt.Color{ diff --git a/pkg/config/api_server.go b/pkg/config/api_server.go index 022d5733..541adb0d 100644 --- a/pkg/config/api_server.go +++ b/pkg/config/api_server.go @@ -13,7 +13,7 @@ import ( "os" "time" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) const ( diff --git a/pkg/config/config.go b/pkg/config/config.go index 49d579bc..a79f083a 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -33,9 +33,9 @@ import ( yaml "gopkg.in/yaml.v2" "github.com/openconfig/gnmic/pkg/api" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" gfile "github.com/openconfig/gnmic/pkg/file" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index 9600f3c0..5028e081 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -18,8 +18,8 @@ import ( "github.com/openconfig/gnmi/proto/gnmi" "github.com/openconfig/gnmic/pkg/api" - "github.com/openconfig/gnmic/pkg/testutils" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/testutils" + "github.com/openconfig/gnmic/pkg/api/types" ) var createGetRequestTestSet = map[string]struct { diff --git a/pkg/config/diff.go b/pkg/config/diff.go index a6bd6a0a..747f5afd 100644 --- a/pkg/config/diff.go +++ b/pkg/config/diff.go @@ -16,7 +16,7 @@ import ( "github.com/spf13/cobra" "github.com/openconfig/gnmic/pkg/api" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) func (c *Config) CreateDiffSubscribeRequest(cmd *cobra.Command) (*gnmi.SubscribeRequest, error) { diff --git a/pkg/config/gnmi_server.go b/pkg/config/gnmi_server.go index 1f78e581..f8f53c99 100644 --- a/pkg/config/gnmi_server.go +++ b/pkg/config/gnmi_server.go @@ -14,8 +14,8 @@ import ( "strconv" "time" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/cache" - "github.com/openconfig/gnmic/pkg/types" ) const ( diff --git a/pkg/config/set_test.go b/pkg/config/set_test.go index 0ca98879..a4fcaa28 100644 --- a/pkg/config/set_test.go +++ b/pkg/config/set_test.go @@ -15,7 +15,7 @@ import ( "github.com/openconfig/gnmi/proto/gnmi" - "github.com/openconfig/gnmic/pkg/testutils" + "github.com/openconfig/gnmic/pkg/api/testutils" ) var createSetRequestFromFileTestSet = map[string]struct { diff --git a/pkg/config/subscriptions.go b/pkg/config/subscriptions.go index fad45473..486d73bc 100644 --- a/pkg/config/subscriptions.go +++ b/pkg/config/subscriptions.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "github.com/openconfig/gnmic/pkg/api" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) const ( diff --git a/pkg/config/subscriptions_test.go b/pkg/config/subscriptions_test.go index ff8eaf82..9df1550b 100644 --- a/pkg/config/subscriptions_test.go +++ b/pkg/config/subscriptions_test.go @@ -26,8 +26,8 @@ import ( "github.com/openconfig/gnmi/proto/gnmi_ext" "github.com/spf13/viper" - "github.com/openconfig/gnmic/pkg/testutils" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/testutils" + "github.com/openconfig/gnmic/pkg/api/types" ) func mustParseTime(tm string) time.Time { diff --git a/pkg/config/targets.go b/pkg/config/targets.go index 0781a9f3..f057cbca 100644 --- a/pkg/config/targets.go +++ b/pkg/config/targets.go @@ -19,7 +19,7 @@ import ( "github.com/mitchellh/mapstructure" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) const ( diff --git a/pkg/config/targets_test.go b/pkg/config/targets_test.go index 49da90fa..66dde629 100644 --- a/pkg/config/targets_test.go +++ b/pkg/config/targets_test.go @@ -17,7 +17,7 @@ import ( "github.com/AlekSi/pointer" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) var getTargetsTestSet = map[string]struct { diff --git a/pkg/config/tunnel_server.go b/pkg/config/tunnel_server.go index a7f09656..043c0125 100644 --- a/pkg/config/tunnel_server.go +++ b/pkg/config/tunnel_server.go @@ -15,8 +15,8 @@ import ( "github.com/mitchellh/mapstructure" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" ) const ( diff --git a/pkg/file/file.go b/pkg/file/file.go index 95f7756d..35e00e65 100644 --- a/pkg/file/file.go +++ b/pkg/file/file.go @@ -26,7 +26,7 @@ import ( "golang.org/x/crypto/ssh/knownhosts" "github.com/jlaffaye/ftp" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/pkg/sftp" ) diff --git a/pkg/formatters/event_add_tag/event_add_tag.go b/pkg/formatters/event_add_tag/event_add_tag.go index 98e7e254..21606af7 100644 --- a/pkg/formatters/event_add_tag/event_add_tag.go +++ b/pkg/formatters/event_add_tag/event_add_tag.go @@ -18,9 +18,9 @@ import ( "github.com/itchyny/gojq" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_allow/event_allow.go b/pkg/formatters/event_allow/event_allow.go index 01bc3989..fcbf226b 100644 --- a/pkg/formatters/event_allow/event_allow.go +++ b/pkg/formatters/event_allow/event_allow.go @@ -18,9 +18,9 @@ import ( "github.com/itchyny/gojq" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_combine/event_combine.go b/pkg/formatters/event_combine/event_combine.go index 33a71c5a..7284e31b 100644 --- a/pkg/formatters/event_combine/event_combine.go +++ b/pkg/formatters/event_combine/event_combine.go @@ -19,9 +19,9 @@ import ( "github.com/itchyny/gojq" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_convert/event_convert.go b/pkg/formatters/event_convert/event_convert.go index 6fe2106a..4ef38c21 100644 --- a/pkg/formatters/event_convert/event_convert.go +++ b/pkg/formatters/event_convert/event_convert.go @@ -19,9 +19,9 @@ import ( "regexp" "strconv" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_data_convert/event_data_convert.go b/pkg/formatters/event_data_convert/event_data_convert.go index 5692f9d8..9598420b 100644 --- a/pkg/formatters/event_data_convert/event_data_convert.go +++ b/pkg/formatters/event_data_convert/event_data_convert.go @@ -21,9 +21,9 @@ import ( units "github.com/bcicen/go-units" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_date_string/event_date_string.go b/pkg/formatters/event_date_string/event_date_string.go index a2fb9acc..178a8f02 100644 --- a/pkg/formatters/event_date_string/event_date_string.go +++ b/pkg/formatters/event_date_string/event_date_string.go @@ -18,9 +18,9 @@ import ( "strconv" "time" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_delete/event_delete.go b/pkg/formatters/event_delete/event_delete.go index d704112f..d6a21343 100644 --- a/pkg/formatters/event_delete/event_delete.go +++ b/pkg/formatters/event_delete/event_delete.go @@ -15,9 +15,9 @@ import ( "os" "regexp" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_drop/event_drop.go b/pkg/formatters/event_drop/event_drop.go index 84361f73..a141b946 100644 --- a/pkg/formatters/event_drop/event_drop.go +++ b/pkg/formatters/event_drop/event_drop.go @@ -18,9 +18,9 @@ import ( "github.com/itchyny/gojq" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_duration_convert/event_duration_convert.go b/pkg/formatters/event_duration_convert/event_duration_convert.go index a652e0e6..b870d088 100644 --- a/pkg/formatters/event_duration_convert/event_duration_convert.go +++ b/pkg/formatters/event_duration_convert/event_duration_convert.go @@ -17,9 +17,9 @@ import ( "regexp" "strconv" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_extract_tags/event_extract_tags.go b/pkg/formatters/event_extract_tags/event_extract_tags.go index 8dda6cc0..9678a79c 100644 --- a/pkg/formatters/event_extract_tags/event_extract_tags.go +++ b/pkg/formatters/event_extract_tags/event_extract_tags.go @@ -15,9 +15,9 @@ import ( "os" "regexp" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_group_by/event_group_by.go b/pkg/formatters/event_group_by/event_group_by.go index 3f206f9e..31c1dbef 100644 --- a/pkg/formatters/event_group_by/event_group_by.go +++ b/pkg/formatters/event_group_by/event_group_by.go @@ -16,9 +16,9 @@ import ( "sort" "strings" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_jq/event_jq.go b/pkg/formatters/event_jq/event_jq.go index 5d0351b3..105ed006 100644 --- a/pkg/formatters/event_jq/event_jq.go +++ b/pkg/formatters/event_jq/event_jq.go @@ -17,9 +17,9 @@ import ( "github.com/itchyny/gojq" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_jq/event_jq_test.go b/pkg/formatters/event_jq/event_jq_test.go index cb0dc953..99295562 100644 --- a/pkg/formatters/event_jq/event_jq_test.go +++ b/pkg/formatters/event_jq/event_jq_test.go @@ -14,8 +14,8 @@ import ( "reflect" "testing" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/utils" ) type item struct { diff --git a/pkg/formatters/event_merge/event_merge.go b/pkg/formatters/event_merge/event_merge.go index 05b529d1..dc678c68 100644 --- a/pkg/formatters/event_merge/event_merge.go +++ b/pkg/formatters/event_merge/event_merge.go @@ -14,9 +14,9 @@ import ( "log" "os" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_override_ts/event_override_ts.go b/pkg/formatters/event_override_ts/event_override_ts.go index 70ba0c07..3cb6c1bb 100644 --- a/pkg/formatters/event_override_ts/event_override_ts.go +++ b/pkg/formatters/event_override_ts/event_override_ts.go @@ -15,9 +15,9 @@ import ( "os" "time" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_plugin/rpc.go b/pkg/formatters/event_plugin/rpc.go index e3a2c833..b5189890 100644 --- a/pkg/formatters/event_plugin/rpc.go +++ b/pkg/formatters/event_plugin/rpc.go @@ -6,9 +6,9 @@ import ( "net/rpc" "os" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_rate_limit/event_rate_limit.go b/pkg/formatters/event_rate_limit/event_rate_limit.go index 53cbad02..47bd80af 100644 --- a/pkg/formatters/event_rate_limit/event_rate_limit.go +++ b/pkg/formatters/event_rate_limit/event_rate_limit.go @@ -13,9 +13,9 @@ import ( lru "github.com/hashicorp/golang-lru/v2" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_starlark/event_starlark.go b/pkg/formatters/event_starlark/event_starlark.go index 16abf9e2..1fe1deb0 100644 --- a/pkg/formatters/event_starlark/event_starlark.go +++ b/pkg/formatters/event_starlark/event_starlark.go @@ -22,9 +22,9 @@ import ( "go.starlark.net/starlark" "go.starlark.net/syntax" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_strings/event_strings.go b/pkg/formatters/event_strings/event_strings.go index 4c63dc6f..c5a7284f 100644 --- a/pkg/formatters/event_strings/event_strings.go +++ b/pkg/formatters/event_strings/event_strings.go @@ -20,9 +20,9 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_to_tag/event_to_tag.go b/pkg/formatters/event_to_tag/event_to_tag.go index 577a216f..aa9558fb 100644 --- a/pkg/formatters/event_to_tag/event_to_tag.go +++ b/pkg/formatters/event_to_tag/event_to_tag.go @@ -15,9 +15,9 @@ import ( "os" "regexp" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_trigger/event_trigger.go b/pkg/formatters/event_trigger/event_trigger.go index f61bb908..bea79ad1 100644 --- a/pkg/formatters/event_trigger/event_trigger.go +++ b/pkg/formatters/event_trigger/event_trigger.go @@ -25,10 +25,10 @@ import ( "github.com/openconfig/gnmic/pkg/actions" _ "github.com/openconfig/gnmic/pkg/actions/all" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" gfile "github.com/openconfig/gnmic/pkg/file" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_trigger/event_trigger_test.go b/pkg/formatters/event_trigger/event_trigger_test.go index 76542c36..94188971 100644 --- a/pkg/formatters/event_trigger/event_trigger_test.go +++ b/pkg/formatters/event_trigger/event_trigger_test.go @@ -15,8 +15,8 @@ import ( "time" "github.com/google/go-cmp/cmp" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/utils" ) type item struct { diff --git a/pkg/formatters/event_value_tag/event_value_tag.go b/pkg/formatters/event_value_tag/event_value_tag.go index ecd4f2d2..e890dab8 100644 --- a/pkg/formatters/event_value_tag/event_value_tag.go +++ b/pkg/formatters/event_value_tag/event_value_tag.go @@ -15,9 +15,9 @@ import ( "log" "os" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/event_write/event_write.go b/pkg/formatters/event_write/event_write.go index c316e0bd..d3f7e312 100644 --- a/pkg/formatters/event_write/event_write.go +++ b/pkg/formatters/event_write/event_write.go @@ -18,9 +18,9 @@ import ( "github.com/itchyny/gojq" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/formatters/flat.go b/pkg/formatters/flat.go index c1fa27b1..ca8b57c2 100644 --- a/pkg/formatters/flat.go +++ b/pkg/formatters/flat.go @@ -15,7 +15,7 @@ import ( "github.com/openconfig/gnmi/proto/gnmi" "google.golang.org/protobuf/proto" - "github.com/openconfig/gnmic/pkg/path" + "github.com/openconfig/gnmic/pkg/api/path" ) func ResponsesFlat(msgs ...proto.Message) (map[string]interface{}, error) { diff --git a/pkg/formatters/json.go b/pkg/formatters/json.go index e4f45975..8903949d 100644 --- a/pkg/formatters/json.go +++ b/pkg/formatters/json.go @@ -16,7 +16,7 @@ import ( "github.com/openconfig/gnmi/proto/gnmi" "google.golang.org/protobuf/proto" - "github.com/openconfig/gnmic/pkg/path" + "github.com/openconfig/gnmic/pkg/api/path" ) // FormatJSON formats a proto.Message and returns a []byte and an error diff --git a/pkg/formatters/processors.go b/pkg/formatters/processors.go index e0c4de94..c975e336 100644 --- a/pkg/formatters/processors.go +++ b/pkg/formatters/processors.go @@ -16,7 +16,7 @@ import ( "github.com/itchyny/gojq" "github.com/mitchellh/mapstructure" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) var EventProcessors = map[string]Initializer{} diff --git a/pkg/inputs/input.go b/pkg/inputs/input.go index ba030bef..277bb7c0 100644 --- a/pkg/inputs/input.go +++ b/pkg/inputs/input.go @@ -12,8 +12,8 @@ import ( "context" "log" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" ) type Input interface { diff --git a/pkg/inputs/kafka_input/kafka_input.go b/pkg/inputs/kafka_input/kafka_input.go index af3ab4b4..b07a1203 100644 --- a/pkg/inputs/kafka_input/kafka_input.go +++ b/pkg/inputs/kafka_input/kafka_input.go @@ -25,11 +25,11 @@ import ( "github.com/google/uuid" "google.golang.org/protobuf/proto" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/inputs" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/inputs/nats_input/nats_input.go b/pkg/inputs/nats_input/nats_input.go index 1bf075ec..a1816f07 100644 --- a/pkg/inputs/nats_input/nats_input.go +++ b/pkg/inputs/nats_input/nats_input.go @@ -23,11 +23,11 @@ import ( "github.com/google/uuid" "github.com/nats-io/nats.go" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/inputs" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/inputs/stan_input/stan_input.go b/pkg/inputs/stan_input/stan_input.go index c7bfc513..cd405592 100644 --- a/pkg/inputs/stan_input/stan_input.go +++ b/pkg/inputs/stan_input/stan_input.go @@ -18,16 +18,16 @@ import ( "sync" "time" - "google.golang.org/protobuf/proto" "github.com/google/uuid" "github.com/nats-io/nats.go" "github.com/nats-io/stan.go" + "google.golang.org/protobuf/proto" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/inputs" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/loaders/consul_loader/consul_loader.go b/pkg/loaders/consul_loader/consul_loader.go index caa16b73..9617e462 100644 --- a/pkg/loaders/consul_loader/consul_loader.go +++ b/pkg/loaders/consul_loader/consul_loader.go @@ -26,10 +26,10 @@ import ( "github.com/mitchellh/mapstructure" "github.com/openconfig/gnmic/pkg/actions" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" gfile "github.com/openconfig/gnmic/pkg/file" "github.com/openconfig/gnmic/pkg/loaders" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/loaders/consul_loader/options.go b/pkg/loaders/consul_loader/options.go index 3876a8a4..2eeba763 100644 --- a/pkg/loaders/consul_loader/options.go +++ b/pkg/loaders/consul_loader/options.go @@ -11,7 +11,7 @@ package consul_loader import ( "github.com/prometheus/client_golang/prometheus" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) func (c *consulLoader) RegisterMetrics(reg *prometheus.Registry) { diff --git a/pkg/loaders/docker_loader/docker_loader.go b/pkg/loaders/docker_loader/docker_loader.go index e65dc042..9495b4a5 100644 --- a/pkg/loaders/docker_loader/docker_loader.go +++ b/pkg/loaders/docker_loader/docker_loader.go @@ -29,10 +29,10 @@ import ( dClient "github.com/docker/docker/client" "github.com/mitchellh/mapstructure" "github.com/openconfig/gnmic/pkg/actions" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" gfile "github.com/openconfig/gnmic/pkg/file" "github.com/openconfig/gnmic/pkg/loaders" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/loaders/docker_loader/options.go b/pkg/loaders/docker_loader/options.go index a361db1a..164a362c 100644 --- a/pkg/loaders/docker_loader/options.go +++ b/pkg/loaders/docker_loader/options.go @@ -11,7 +11,7 @@ package docker_loader import ( "github.com/prometheus/client_golang/prometheus" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) func (d *dockerLoader) RegisterMetrics(reg *prometheus.Registry) { diff --git a/pkg/loaders/file_loader/file_loader.go b/pkg/loaders/file_loader/file_loader.go index eff62d7d..9f0807e1 100644 --- a/pkg/loaders/file_loader/file_loader.go +++ b/pkg/loaders/file_loader/file_loader.go @@ -24,11 +24,11 @@ import ( "gopkg.in/yaml.v2" "github.com/openconfig/gnmic/pkg/actions" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" + gfile "github.com/openconfig/gnmic/pkg/file" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/loaders" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" - gfile "github.com/openconfig/gnmic/pkg/file" ) const ( diff --git a/pkg/loaders/file_loader/options.go b/pkg/loaders/file_loader/options.go index 684e4ec0..e4bf52aa 100644 --- a/pkg/loaders/file_loader/options.go +++ b/pkg/loaders/file_loader/options.go @@ -11,7 +11,7 @@ package file_loader import ( "github.com/prometheus/client_golang/prometheus" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) func (f *fileLoader) RegisterMetrics(reg *prometheus.Registry) { diff --git a/pkg/loaders/http_loader/http_loader.go b/pkg/loaders/http_loader/http_loader.go index c677f76e..08767ab2 100644 --- a/pkg/loaders/http_loader/http_loader.go +++ b/pkg/loaders/http_loader/http_loader.go @@ -25,11 +25,11 @@ import ( "github.com/go-resty/resty/v2" "github.com/openconfig/gnmic/pkg/actions" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" + gfile "github.com/openconfig/gnmic/pkg/file" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/loaders" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" - gfile "github.com/openconfig/gnmic/pkg/file" ) const ( diff --git a/pkg/loaders/http_loader/options.go b/pkg/loaders/http_loader/options.go index 7ee68b02..734e5f70 100644 --- a/pkg/loaders/http_loader/options.go +++ b/pkg/loaders/http_loader/options.go @@ -11,7 +11,7 @@ package http_loader import ( "github.com/prometheus/client_golang/prometheus" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) func (h *httpLoader) RegisterMetrics(reg *prometheus.Registry) { diff --git a/pkg/loaders/loaders.go b/pkg/loaders/loaders.go index 3456db93..b50ee643 100644 --- a/pkg/loaders/loaders.go +++ b/pkg/loaders/loaders.go @@ -15,7 +15,7 @@ import ( "github.com/mitchellh/mapstructure" "github.com/prometheus/client_golang/prometheus" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) // TargetLoader discovers a set of target configurations for gNMIc to run RPCs against. diff --git a/pkg/loaders/loaders_test.go b/pkg/loaders/loaders_test.go index 19e084f3..a70791a1 100644 --- a/pkg/loaders/loaders_test.go +++ b/pkg/loaders/loaders_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) var testSet = map[string]struct { diff --git a/pkg/loaders/option.go b/pkg/loaders/option.go index 76553abe..9c9ed715 100644 --- a/pkg/loaders/option.go +++ b/pkg/loaders/option.go @@ -11,7 +11,7 @@ package loaders import ( "github.com/prometheus/client_golang/prometheus" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) type Option func(TargetLoader) diff --git a/pkg/lockers/consul_locker/consul_locker.go b/pkg/lockers/consul_locker/consul_locker.go index 3b0a0833..ea9de0f1 100644 --- a/pkg/lockers/consul_locker/consul_locker.go +++ b/pkg/lockers/consul_locker/consul_locker.go @@ -19,8 +19,8 @@ import ( "github.com/hashicorp/consul/api" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/lockers" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/lockers/k8s_locker/k8s_locker.go b/pkg/lockers/k8s_locker/k8s_locker.go index eda8b225..827ff4fc 100644 --- a/pkg/lockers/k8s_locker/k8s_locker.go +++ b/pkg/lockers/k8s_locker/k8s_locker.go @@ -28,8 +28,8 @@ import ( "github.com/google/uuid" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/lockers" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/lockers/redis_locker/redis_locker.go b/pkg/lockers/redis_locker/redis_locker.go index 7e4b6ae3..0596a777 100644 --- a/pkg/lockers/redis_locker/redis_locker.go +++ b/pkg/lockers/redis_locker/redis_locker.go @@ -15,8 +15,8 @@ import ( "github.com/go-redsync/redsync/v4/redis/goredis/v9" goredislib "github.com/redis/go-redis/v9" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/lockers" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/asciigraph_output/asciigraph.go b/pkg/outputs/asciigraph_output/asciigraph.go index 660a375c..2b9b3d1f 100644 --- a/pkg/outputs/asciigraph_output/asciigraph.go +++ b/pkg/outputs/asciigraph_output/asciigraph.go @@ -30,11 +30,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "google.golang.org/protobuf/proto" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/file/file_output.go b/pkg/outputs/file/file_output.go index 4750769b..1452bbae 100644 --- a/pkg/outputs/file/file_output.go +++ b/pkg/outputs/file/file_output.go @@ -24,11 +24,11 @@ import ( "github.com/prometheus/client_golang/prometheus" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/gnmi_output/gnmi_output.go b/pkg/outputs/gnmi_output/gnmi_output.go index 590f174f..06dde640 100644 --- a/pkg/outputs/gnmi_output/gnmi_output.go +++ b/pkg/outputs/gnmi_output/gnmi_output.go @@ -27,11 +27,11 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/protobuf/proto" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/gnmi_output/gnmi_server.go b/pkg/outputs/gnmi_output/gnmi_server.go index f41d660b..bbd0d9bb 100644 --- a/pkg/outputs/gnmi_output/gnmi_server.go +++ b/pkg/outputs/gnmi_output/gnmi_server.go @@ -34,7 +34,7 @@ import ( "github.com/openconfig/gnmi/path" "github.com/openconfig/gnmi/proto/gnmi" "github.com/openconfig/gnmi/subscribe" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" ) type streamClient struct { diff --git a/pkg/outputs/gnmi_output/gnmi_server_get.go b/pkg/outputs/gnmi_output/gnmi_server_get.go index 485d77d9..a8b2cad2 100644 --- a/pkg/outputs/gnmi_output/gnmi_server_get.go +++ b/pkg/outputs/gnmi_output/gnmi_server_get.go @@ -22,9 +22,9 @@ import ( "github.com/openconfig/gnmi/proto/gnmi" - "github.com/openconfig/gnmic/pkg/target" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/target" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" ) func (s *server) Get(ctx context.Context, req *gnmi.GetRequest) (*gnmi.GetResponse, error) { diff --git a/pkg/outputs/gnmi_output/gnmi_server_set.go b/pkg/outputs/gnmi_output/gnmi_server_set.go index f5d6d6c5..56cb374a 100644 --- a/pkg/outputs/gnmi_output/gnmi_server_set.go +++ b/pkg/outputs/gnmi_output/gnmi_server_set.go @@ -20,9 +20,9 @@ import ( "google.golang.org/protobuf/proto" "github.com/openconfig/gnmi/proto/gnmi" - "github.com/openconfig/gnmic/pkg/target" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" + "github.com/openconfig/gnmic/pkg/api/target" ) func (s *server) Set(ctx context.Context, req *gnmi.SetRequest) (*gnmi.SetResponse, error) { diff --git a/pkg/outputs/influxdb_output/influxdb_output.go b/pkg/outputs/influxdb_output/influxdb_output.go index 2cad08c5..48b58e2e 100644 --- a/pkg/outputs/influxdb_output/influxdb_output.go +++ b/pkg/outputs/influxdb_output/influxdb_output.go @@ -26,12 +26,12 @@ import ( "github.com/openconfig/gnmi/proto/gnmi" "github.com/prometheus/client_golang/prometheus" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/cache" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/kafka_output/kafka_output.go b/pkg/outputs/kafka_output/kafka_output.go index 25bbc20d..040ea5da 100644 --- a/pkg/outputs/kafka_output/kafka_output.go +++ b/pkg/outputs/kafka_output/kafka_output.go @@ -27,11 +27,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "google.golang.org/protobuf/proto" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/nats_outputs/jetstream/jetstream_output.go b/pkg/outputs/nats_outputs/jetstream/jetstream_output.go index 3afd3a82..0c2908b8 100644 --- a/pkg/outputs/nats_outputs/jetstream/jetstream_output.go +++ b/pkg/outputs/nats_outputs/jetstream/jetstream_output.go @@ -29,11 +29,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "google.golang.org/protobuf/proto" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/nats_outputs/nats/nats_output.go b/pkg/outputs/nats_outputs/nats/nats_output.go index 3d8b67f1..a0b12098 100644 --- a/pkg/outputs/nats_outputs/nats/nats_output.go +++ b/pkg/outputs/nats_outputs/nats/nats_output.go @@ -20,16 +20,16 @@ import ( "text/template" "time" - "google.golang.org/protobuf/proto" "github.com/google/uuid" "github.com/nats-io/nats.go" "github.com/prometheus/client_golang/prometheus" + "google.golang.org/protobuf/proto" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/nats_outputs/stan/stan_output.go b/pkg/outputs/nats_outputs/stan/stan_output.go index ce8815c3..b3a886bc 100644 --- a/pkg/outputs/nats_outputs/stan/stan_output.go +++ b/pkg/outputs/nats_outputs/stan/stan_output.go @@ -25,11 +25,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "google.golang.org/protobuf/reflect/protoreflect" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/options.go b/pkg/outputs/options.go index c837be17..2a84a381 100644 --- a/pkg/outputs/options.go +++ b/pkg/outputs/options.go @@ -11,7 +11,7 @@ package outputs import ( "log" - "github.com/openconfig/gnmic/pkg/types" + "github.com/openconfig/gnmic/pkg/api/types" "github.com/prometheus/client_golang/prometheus" ) @@ -29,7 +29,7 @@ func WithEventProcessors(eps map[string]map[string]interface{}, tcs map[string]*types.TargetConfig, acts map[string]map[string]interface{}) Option { return func(o Output) error { - return o.SetEventProcessors(eps, log, tcs, acts) + return o.SetEventProcessors(eps, log, tcs, acts) } } diff --git a/pkg/outputs/output.go b/pkg/outputs/output.go index 6973cdbb..7f514115 100644 --- a/pkg/outputs/output.go +++ b/pkg/outputs/output.go @@ -23,10 +23,10 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" _ "github.com/openconfig/gnmic/pkg/formatters/all" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) type Output interface { diff --git a/pkg/outputs/prometheus_output/prometheus_output/prometheus_output.go b/pkg/outputs/prometheus_output/prometheus_output/prometheus_output.go index 59d285b7..c530b6bb 100644 --- a/pkg/outputs/prometheus_output/prometheus_output/prometheus_output.go +++ b/pkg/outputs/prometheus_output/prometheus_output/prometheus_output.go @@ -37,13 +37,13 @@ import ( "github.com/prometheus/prometheus/prompb" "google.golang.org/protobuf/proto" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/cache" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" promcom "github.com/openconfig/gnmic/pkg/outputs/prometheus_output" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/prometheus_output/prometheus_write_output/prometheus_write_client.go b/pkg/outputs/prometheus_output/prometheus_write_output/prometheus_write_client.go index 7c92015c..10cd2b30 100644 --- a/pkg/outputs/prometheus_output/prometheus_write_output/prometheus_write_client.go +++ b/pkg/outputs/prometheus_output/prometheus_write_output/prometheus_write_client.go @@ -22,7 +22,7 @@ import ( "github.com/golang/snappy" "github.com/prometheus/prometheus/prompb" - "github.com/openconfig/gnmic/pkg/utils" + "github.com/openconfig/gnmic/pkg/api/utils" ) var ( diff --git a/pkg/outputs/prometheus_output/prometheus_write_output/prometheus_write_output.go b/pkg/outputs/prometheus_output/prometheus_write_output/prometheus_write_output.go index 0bb54138..16e26eab 100644 --- a/pkg/outputs/prometheus_output/prometheus_write_output/prometheus_write_output.go +++ b/pkg/outputs/prometheus_output/prometheus_write_output/prometheus_write_output.go @@ -27,12 +27,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/prompb" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" promcom "github.com/openconfig/gnmic/pkg/outputs/prometheus_output" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/snmp_output/snmp_output.go b/pkg/outputs/snmp_output/snmp_output.go index cd3a2ab2..193267aa 100644 --- a/pkg/outputs/snmp_output/snmp_output.go +++ b/pkg/outputs/snmp_output/snmp_output.go @@ -25,13 +25,13 @@ import ( "github.com/prometheus/client_golang/prometheus" "google.golang.org/protobuf/proto" + "github.com/openconfig/gnmic/pkg/api/path" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/cache" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/path" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/tcp_output/tcp_output.go b/pkg/outputs/tcp_output/tcp_output.go index e4598299..835b5bd4 100644 --- a/pkg/outputs/tcp_output/tcp_output.go +++ b/pkg/outputs/tcp_output/tcp_output.go @@ -22,11 +22,11 @@ import ( "github.com/prometheus/client_golang/prometheus" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/outputs/udp_output/udp_output.go b/pkg/outputs/udp_output/udp_output.go index bfe12104..6da9b1d5 100644 --- a/pkg/outputs/udp_output/udp_output.go +++ b/pkg/outputs/udp_output/udp_output.go @@ -22,11 +22,11 @@ import ( "github.com/prometheus/client_golang/prometheus" + "github.com/openconfig/gnmic/pkg/api/types" + "github.com/openconfig/gnmic/pkg/api/utils" "github.com/openconfig/gnmic/pkg/formatters" "github.com/openconfig/gnmic/pkg/gtemplate" "github.com/openconfig/gnmic/pkg/outputs" - "github.com/openconfig/gnmic/pkg/types" - "github.com/openconfig/gnmic/pkg/utils" ) const ( diff --git a/pkg/path/go.mod b/pkg/path/go.mod deleted file mode 100644 index 685e241d..00000000 --- a/pkg/path/go.mod +++ /dev/null @@ -1,20 +0,0 @@ -module github.com/openconfig/gnmic/pkg/path - -go 1.21.1 - -require ( - github.com/google/go-cmp v0.6.0 - github.com/openconfig/gnmi v0.10.0 - github.com/openconfig/gnmic/pkg/testutils v0.1.0 -) - -require ( - github.com/golang/protobuf v1.5.3 // indirect - github.com/openconfig/grpctunnel v0.1.0 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/grpc v1.59.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect -) diff --git a/pkg/path/go.sum b/pkg/path/go.sum deleted file mode 100644 index 1003c85b..00000000 --- a/pkg/path/go.sum +++ /dev/null @@ -1,27 +0,0 @@ -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/openconfig/gnmi v0.10.0 h1:kQEZ/9ek3Vp2Y5IVuV2L/ba8/77TgjdXg505QXvYmg8= -github.com/openconfig/gnmi v0.10.0/go.mod h1:Y9os75GmSkhHw2wX8sMsxfI7qRGAEcDh8NTa5a8vj6E= -github.com/openconfig/gnmic/pkg/testutils v0.1.0 h1:Mw6LKGqzXQnrI9fCtaCAp3pFDy2B0+rKQFtjCqQWJwM= -github.com/openconfig/gnmic/pkg/testutils v0.1.0/go.mod h1:/JyhCq6rSbQdmeCbPIQjD8K3ArOqGQZFKUKKUpebonk= -github.com/openconfig/grpctunnel v0.1.0 h1:EN99qtlExZczgQgp5ANnHRC/Rs62cAG+Tz2BQ5m/maM= -github.com/openconfig/grpctunnel v0.1.0/go.mod h1:G04Pdu0pml98tdvXrvLaU+EBo3PxYfI9MYqpvdaEHLo= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= -google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/pkg/target/go.mod b/pkg/target/go.mod deleted file mode 100644 index bbc07e74..00000000 --- a/pkg/target/go.mod +++ /dev/null @@ -1,26 +0,0 @@ -module github.com/openconfig/gnmic/pkg/target - -go 1.21.1 - -require ( - github.com/jhump/protoreflect v1.15.3 - github.com/openconfig/gnmi v0.10.0 - github.com/openconfig/gnmic/pkg/types v0.1.2 - golang.org/x/net v0.17.0 - golang.org/x/oauth2 v0.13.0 - google.golang.org/grpc v1.59.0 -) - -require github.com/openconfig/gnmic/pkg/utils v0.1.0 // indirect - -require ( - cloud.google.com/go/compute v1.23.0 // indirect - cloud.google.com/go/compute/metadata v0.2.3 // indirect - github.com/bufbuild/protocompile v0.6.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/protobuf v1.31.0 // indirect -) diff --git a/pkg/target/go.sum b/pkg/target/go.sum deleted file mode 100644 index c4747a0c..00000000 --- a/pkg/target/go.sum +++ /dev/null @@ -1,48 +0,0 @@ -cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= -cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= -cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= -cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -github.com/bufbuild/protocompile v0.6.0 h1:Uu7WiSQ6Yj9DbkdnOe7U4mNKp58y9WDMKDn28/ZlunY= -github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/jhump/protoreflect v1.15.3 h1:6SFRuqU45u9hIZPJAoZ8c28T3nK64BNdp9w6jFonzls= -github.com/jhump/protoreflect v1.15.3/go.mod h1:4ORHmSBmlCW8fh3xHmJMGyul1zNqZK4Elxc8qKP+p1k= -github.com/openconfig/gnmi v0.10.0 h1:kQEZ/9ek3Vp2Y5IVuV2L/ba8/77TgjdXg505QXvYmg8= -github.com/openconfig/gnmi v0.10.0/go.mod h1:Y9os75GmSkhHw2wX8sMsxfI7qRGAEcDh8NTa5a8vj6E= -github.com/openconfig/gnmic/pkg/types v0.1.2 h1:FRjERZrbcuqhwRKHZ7ux4UXr4fc1DlgXvH37Iysu4Co= -github.com/openconfig/gnmic/pkg/types v0.1.2/go.mod h1:Gwc9suBy/s17bP8BaCrp3dE5E+RkcHqVIkFqdXopog4= -github.com/openconfig/gnmic/pkg/utils v0.1.0 h1:MqRhW8oJdPpBb1UprbnpDxciBJVjl/Gw97xuNoBG3Vs= -github.com/openconfig/gnmic/pkg/utils v0.1.0/go.mod h1:DQm/e8cdRwdmUORjODWteDU0HG0CWNYBAhLWqnPQegE= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= -golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= -google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/pkg/testutils/go.mod b/pkg/testutils/go.mod deleted file mode 100644 index c13f3d4d..00000000 --- a/pkg/testutils/go.mod +++ /dev/null @@ -1,19 +0,0 @@ -module github.com/openconfig/gnmic/pkg/testutils - -go 1.21.1 - -require ( - github.com/google/go-cmp v0.6.0 - github.com/openconfig/gnmi v0.10.0 - github.com/openconfig/grpctunnel v0.1.0 -) - -require ( - github.com/golang/protobuf v1.5.3 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/grpc v1.59.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect -) diff --git a/pkg/testutils/go.sum b/pkg/testutils/go.sum deleted file mode 100644 index 75857e7f..00000000 --- a/pkg/testutils/go.sum +++ /dev/null @@ -1,25 +0,0 @@ -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/openconfig/gnmi v0.10.0 h1:kQEZ/9ek3Vp2Y5IVuV2L/ba8/77TgjdXg505QXvYmg8= -github.com/openconfig/gnmi v0.10.0/go.mod h1:Y9os75GmSkhHw2wX8sMsxfI7qRGAEcDh8NTa5a8vj6E= -github.com/openconfig/grpctunnel v0.1.0 h1:EN99qtlExZczgQgp5ANnHRC/Rs62cAG+Tz2BQ5m/maM= -github.com/openconfig/grpctunnel v0.1.0/go.mod h1:G04Pdu0pml98tdvXrvLaU+EBo3PxYfI9MYqpvdaEHLo= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= -google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/pkg/types/go.mod b/pkg/types/go.mod deleted file mode 100644 index 978c2494..00000000 --- a/pkg/types/go.mod +++ /dev/null @@ -1,21 +0,0 @@ -module github.com/openconfig/gnmic/pkg/types - -go 1.21.1 - -require ( - github.com/openconfig/gnmic/pkg/utils v0.1.0 - golang.org/x/oauth2 v0.13.0 - google.golang.org/grpc v1.59.0 -) - -require ( - cloud.google.com/go/compute v1.23.0 // indirect - cloud.google.com/go/compute/metadata v0.2.3 // indirect - github.com/golang/protobuf v1.5.3 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/protobuf v1.31.0 // indirect -) diff --git a/pkg/types/go.sum b/pkg/types/go.sum deleted file mode 100644 index 3cf55d40..00000000 --- a/pkg/types/go.sum +++ /dev/null @@ -1,38 +0,0 @@ -cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= -cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= -cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= -cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/openconfig/gnmic/pkg/utils v0.1.0 h1:MqRhW8oJdPpBb1UprbnpDxciBJVjl/Gw97xuNoBG3Vs= -github.com/openconfig/gnmic/pkg/utils v0.1.0/go.mod h1:DQm/e8cdRwdmUORjODWteDU0HG0CWNYBAhLWqnPQegE= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= -golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= -google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/pkg/utils/go.mod b/pkg/utils/go.mod deleted file mode 100644 index 9ed7926f..00000000 --- a/pkg/utils/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/openconfig/gnmic/pkg/utils - -go 1.21.1 - -require github.com/google/go-cmp v0.6.0 diff --git a/pkg/utils/go.sum b/pkg/utils/go.sum deleted file mode 100644 index 5a8d551d..00000000 --- a/pkg/utils/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 4a00e915..c22094c4 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -9,7 +9,7 @@ function testmodule cd $SCRIPTPATH/.. } -declare -a modules=("." "pkg/api" "pkg/cache" "pkg/path" "pkg/target" "pkg/testutils" "pkg/types" "pkg/utils") +declare -a modules=("." "pkg/api" "pkg/cache") SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"