From 267d7f9f85526f5f85384069f961557f4f7b5f37 Mon Sep 17 00:00:00 2001 From: Karim Radhouani Date: Sat, 11 Nov 2023 16:13:35 -0800 Subject: [PATCH] cleanup modules --- go.mod | 14 +++++++------- pkg/api/go.mod | 19 ++++++++++--------- pkg/api/go.sum | 10 ++++++++++ pkg/cache/go.mod | 10 +++------- pkg/cache/go.sum | 6 ++++++ pkg/path/go.mod | 4 +--- pkg/path/go.sum | 2 ++ pkg/target/go.mod | 10 ++++------ pkg/target/go.sum | 4 ++++ pkg/types/go.mod | 4 +--- pkg/types/go.sum | 2 ++ 11 files changed, 50 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index 8905979f..c920b0a6 100644 --- a/go.mod +++ b/go.mod @@ -48,13 +48,13 @@ require ( github.com/nsf/termbox-go v1.1.1 github.com/olekukonko/tablewriter v0.0.5 github.com/openconfig/gnmi v0.10.0 - github.com/openconfig/gnmic/pkg/api v0.33.0 - github.com/openconfig/gnmic/pkg/cache v0.33.0 - github.com/openconfig/gnmic/pkg/path v0.33.0 - github.com/openconfig/gnmic/pkg/target v0.33.0 - github.com/openconfig/gnmic/pkg/testutils v0.33.0 - github.com/openconfig/gnmic/pkg/types v0.33.0 - github.com/openconfig/gnmic/pkg/utils v0.33.0 + github.com/openconfig/gnmic/pkg/api v0.34.0 + github.com/openconfig/gnmic/pkg/cache v0.34.0 + github.com/openconfig/gnmic/pkg/path v0.34.0 + github.com/openconfig/gnmic/pkg/target v0.34.0 + github.com/openconfig/gnmic/pkg/testutils v0.34.0 + github.com/openconfig/gnmic/pkg/types v0.34.0 + github.com/openconfig/gnmic/pkg/utils v0.34.0 github.com/openconfig/goyang v1.4.2 github.com/openconfig/ygot v0.29.2 github.com/pkg/sftp v1.13.6 diff --git a/pkg/api/go.mod b/pkg/api/go.mod index 7a866edb..4e477552 100644 --- a/pkg/api/go.mod +++ b/pkg/api/go.mod @@ -3,24 +3,25 @@ module github.com/openconfig/gnmic/pkg/api go 1.21.1 replace ( - github.com/openconfig/gnmic/pkg/path => ../path - github.com/openconfig/gnmic/pkg/target => ../target - github.com/openconfig/gnmic/pkg/testutils => ../testutils - github.com/openconfig/gnmic/pkg/types => ../types - github.com/openconfig/gnmic/pkg/utils => ../utils + github.com/openconfig/gnmic/pkg/testutils => github.com/openconfig/gnmic/pkg/testutils v0.0.0-20231111233637-b2f2ba97c7e5 + github.com/openconfig/gnmic/pkg/types => github.com/openconfig/gnmic/pkg/types v0.0.0-20231111233637-b2f2ba97c7e5 + github.com/openconfig/gnmic/pkg/utils => github.com/openconfig/gnmic/pkg/utils v0.0.0-20231111233637-b2f2ba97c7e5 ) require ( github.com/AlekSi/pointer v1.2.0 github.com/google/go-cmp v0.6.0 github.com/openconfig/gnmi v0.10.0 - github.com/openconfig/gnmic/pkg/path v0.33.0 - github.com/openconfig/gnmic/pkg/target v0.33.0 + github.com/openconfig/grpctunnel v0.1.0 + google.golang.org/protobuf v1.31.0 +) + +require ( + github.com/openconfig/gnmic/pkg/path v0.0.0-20231111233637-b2f2ba97c7e5 + github.com/openconfig/gnmic/pkg/target v0.0.0-20231111233637-b2f2ba97c7e5 github.com/openconfig/gnmic/pkg/testutils v0.33.0 github.com/openconfig/gnmic/pkg/types v0.33.0 github.com/openconfig/gnmic/pkg/utils v0.33.0 // indirect - github.com/openconfig/grpctunnel v0.1.0 - google.golang.org/protobuf v1.31.0 ) require ( diff --git a/pkg/api/go.sum b/pkg/api/go.sum index 46872075..a2b7f4c5 100644 --- a/pkg/api/go.sum +++ b/pkg/api/go.sum @@ -17,6 +17,16 @@ 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.0.0-20231111233637-b2f2ba97c7e5 h1:CTo0N1qkN8/Gc344AVGDtMQwGwEAXFkD9SoHihXkZo0= +github.com/openconfig/gnmic/pkg/path v0.0.0-20231111233637-b2f2ba97c7e5/go.mod h1:Zdslf08cGIDFZm7snTS6H+gTi0PRRoXv7LfOj5WXQQE= +github.com/openconfig/gnmic/pkg/target v0.0.0-20231111233637-b2f2ba97c7e5 h1:AIE1Ian2O/TEyYMsn2L2Usei2rKiBYnn6MdwDlcujHI= +github.com/openconfig/gnmic/pkg/target v0.0.0-20231111233637-b2f2ba97c7e5/go.mod h1:YdfaUnGmP1Be8aSYnQobdeH7IQFNQ5Qv2FyNXikrLEA= +github.com/openconfig/gnmic/pkg/testutils v0.0.0-20231111233637-b2f2ba97c7e5 h1:hAVCM9j7v6qWvk9PTDPToVfoqXfSJD2Q7wc4obgjnuI= +github.com/openconfig/gnmic/pkg/testutils v0.0.0-20231111233637-b2f2ba97c7e5/go.mod h1:/JyhCq6rSbQdmeCbPIQjD8K3ArOqGQZFKUKKUpebonk= +github.com/openconfig/gnmic/pkg/types v0.0.0-20231111233637-b2f2ba97c7e5 h1:EPs1NhmZsYSNDBp0K2aRdx6UCKhPTJBbLqYg6kVb5tc= +github.com/openconfig/gnmic/pkg/types v0.0.0-20231111233637-b2f2ba97c7e5/go.mod h1:JeHEsiNmTz2NQjDZi5L+28sOUnqtQ6DwRaRSdZ6wxns= +github.com/openconfig/gnmic/pkg/utils v0.0.0-20231111233637-b2f2ba97c7e5 h1:mSf0eMbzKOW8NuxagiDnuMqt3f18wIo6u4c2zySo9qk= +github.com/openconfig/gnmic/pkg/utils v0.0.0-20231111233637-b2f2ba97c7e5/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= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/pkg/cache/go.mod b/pkg/cache/go.mod index ec7468a6..ce69f5e8 100644 --- a/pkg/cache/go.mod +++ b/pkg/cache/go.mod @@ -2,19 +2,15 @@ module github.com/openconfig/gnmic/pkg/cache go 1.21.1 -replace ( - github.com/openconfig/gnmic/pkg/path => ../path - github.com/openconfig/gnmic/pkg/testutils => ../testutils - github.com/openconfig/gnmic/pkg/utils => ../utils -) +replace github.com/openconfig/gnmic/pkg/testutils => github.com/openconfig/gnmic/pkg/testutils v0.0.0-20231111233637-b2f2ba97c7e5 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/openconfig/gnmi v0.10.0 - github.com/openconfig/gnmic/pkg/path v0.33.0 - github.com/openconfig/gnmic/pkg/utils v0.33.0 + github.com/openconfig/gnmic/pkg/path v0.0.0-20231111233637-b2f2ba97c7e5 + github.com/openconfig/gnmic/pkg/utils v0.0.0-20231111233637-b2f2ba97c7e5 google.golang.org/protobuf v1.31.0 ) diff --git a/pkg/cache/go.sum b/pkg/cache/go.sum index 3d4f5ab3..cb3579b4 100644 --- a/pkg/cache/go.sum +++ b/pkg/cache/go.sum @@ -61,6 +61,12 @@ github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3 github.com/openconfig/gnmi v0.0.0-20200414194230-1597cc0f2600/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/path v0.0.0-20231111233637-b2f2ba97c7e5 h1:CTo0N1qkN8/Gc344AVGDtMQwGwEAXFkD9SoHihXkZo0= +github.com/openconfig/gnmic/pkg/path v0.0.0-20231111233637-b2f2ba97c7e5/go.mod h1:Zdslf08cGIDFZm7snTS6H+gTi0PRRoXv7LfOj5WXQQE= +github.com/openconfig/gnmic/pkg/testutils v0.0.0-20231111233637-b2f2ba97c7e5 h1:hAVCM9j7v6qWvk9PTDPToVfoqXfSJD2Q7wc4obgjnuI= +github.com/openconfig/gnmic/pkg/testutils v0.0.0-20231111233637-b2f2ba97c7e5/go.mod h1:/JyhCq6rSbQdmeCbPIQjD8K3ArOqGQZFKUKKUpebonk= +github.com/openconfig/gnmic/pkg/utils v0.0.0-20231111233637-b2f2ba97c7e5 h1:mSf0eMbzKOW8NuxagiDnuMqt3f18wIo6u4c2zySo9qk= +github.com/openconfig/gnmic/pkg/utils v0.0.0-20231111233637-b2f2ba97c7e5/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= diff --git a/pkg/path/go.mod b/pkg/path/go.mod index d26cb52a..c4c1d632 100644 --- a/pkg/path/go.mod +++ b/pkg/path/go.mod @@ -2,12 +2,10 @@ module github.com/openconfig/gnmic/pkg/path go 1.21.1 -replace github.com/openconfig/gnmic/pkg/testutils => ../testutils - require ( github.com/google/go-cmp v0.6.0 github.com/openconfig/gnmi v0.10.0 - github.com/openconfig/gnmic/pkg/testutils v0.33.0 + github.com/openconfig/gnmic/pkg/testutils v0.0.0-20231111233637-b2f2ba97c7e5 ) require ( diff --git a/pkg/path/go.sum b/pkg/path/go.sum index 75857e7f..9990686b 100644 --- a/pkg/path/go.sum +++ b/pkg/path/go.sum @@ -6,6 +6,8 @@ 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.0.0-20231111233637-b2f2ba97c7e5 h1:hAVCM9j7v6qWvk9PTDPToVfoqXfSJD2Q7wc4obgjnuI= +github.com/openconfig/gnmic/pkg/testutils v0.0.0-20231111233637-b2f2ba97c7e5/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= diff --git a/pkg/target/go.mod b/pkg/target/go.mod index 2ca74988..2e5cd214 100644 --- a/pkg/target/go.mod +++ b/pkg/target/go.mod @@ -2,26 +2,24 @@ module github.com/openconfig/gnmic/pkg/target go 1.21.1 -replace ( - github.com/openconfig/gnmic/pkg/types => ../types - github.com/openconfig/gnmic/pkg/utils => ../utils -) +replace github.com/openconfig/gnmic/pkg/utils => github.com/openconfig/gnmic/pkg/utils v0.0.0-20231111233637-b2f2ba97c7e5 require ( github.com/jhump/protoreflect v1.15.3 github.com/openconfig/gnmi v0.10.0 - github.com/openconfig/gnmic/pkg/types v0.33.0 + github.com/openconfig/gnmic/pkg/types v0.0.0-20231111233637-b2f2ba97c7e5 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.33.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 - github.com/openconfig/gnmic/pkg/utils v0.33.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 diff --git a/pkg/target/go.sum b/pkg/target/go.sum index c8f1e75d..22050179 100644 --- a/pkg/target/go.sum +++ b/pkg/target/go.sum @@ -15,6 +15,10 @@ 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/types v0.0.0-20231111233637-b2f2ba97c7e5 h1:EPs1NhmZsYSNDBp0K2aRdx6UCKhPTJBbLqYg6kVb5tc= +github.com/openconfig/gnmic/pkg/types v0.0.0-20231111233637-b2f2ba97c7e5/go.mod h1:JeHEsiNmTz2NQjDZi5L+28sOUnqtQ6DwRaRSdZ6wxns= +github.com/openconfig/gnmic/pkg/utils v0.0.0-20231111233637-b2f2ba97c7e5 h1:mSf0eMbzKOW8NuxagiDnuMqt3f18wIo6u4c2zySo9qk= +github.com/openconfig/gnmic/pkg/utils v0.0.0-20231111233637-b2f2ba97c7e5/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= diff --git a/pkg/types/go.mod b/pkg/types/go.mod index ac351a7d..332d3665 100644 --- a/pkg/types/go.mod +++ b/pkg/types/go.mod @@ -2,10 +2,8 @@ module github.com/openconfig/gnmic/pkg/types go 1.21.1 -replace github.com/openconfig/gnmic/pkg/utils => ../utils - require ( - github.com/openconfig/gnmic/pkg/utils v0.33.0 + github.com/openconfig/gnmic/pkg/utils v0.0.0-20231111233637-b2f2ba97c7e5 golang.org/x/oauth2 v0.13.0 google.golang.org/grpc v1.59.0 ) diff --git a/pkg/types/go.sum b/pkg/types/go.sum index 127e7168..5d1e317d 100644 --- a/pkg/types/go.sum +++ b/pkg/types/go.sum @@ -9,6 +9,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu 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.0.0-20231111233637-b2f2ba97c7e5 h1:mSf0eMbzKOW8NuxagiDnuMqt3f18wIo6u4c2zySo9qk= +github.com/openconfig/gnmic/pkg/utils v0.0.0-20231111233637-b2f2ba97c7e5/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=