Skip to content

Commit 9484cb7

Browse files
karimrakarimra
authored
Merge pull request #376 from openconfig/reorg-modules
reorganize submodules
2 parents 46e895f + 5b5063e commit 9484cb7

File tree

150 files changed

+439
-599
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+439
-599
lines changed

‎docs/user_guide/event_processors/event_plugin.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import (
6060
6161
"github.com/openconfig/gnmic/pkg/formatters"
6262
"github.com/openconfig/gnmic/pkg/formatters/event_plugin"
63-
"github.com/openconfig/gnmic/pkg/types"
63+
"github.com/openconfig/gnmic/pkg/api/types"
6464
)
6565
6666
const (

‎examples/plugins/demo/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77

88
"github.com/hashicorp/go-plugin"
99

10+
"github.com/openconfig/gnmic/pkg/api/types"
1011
"github.com/openconfig/gnmic/pkg/formatters"
1112
"github.com/openconfig/gnmic/pkg/formatters/event_plugin"
12-
"github.com/openconfig/gnmic/pkg/types"
1313
)
1414

1515
const (

‎examples/plugins/event-add-hostname/event-add-hostname.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"github.com/hashicorp/go-hclog"
1212
"github.com/hashicorp/go-plugin"
1313

14+
"github.com/openconfig/gnmic/pkg/api/types"
1415
"github.com/openconfig/gnmic/pkg/formatters"
1516
"github.com/openconfig/gnmic/pkg/formatters/event_plugin"
16-
"github.com/openconfig/gnmic/pkg/types"
1717
)
1818

1919
const (

‎examples/plugins/event-gnmi-get/event-gnmi-get.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import (
1818
"github.com/openconfig/gnmi/proto/gnmi"
1919

2020
"github.com/openconfig/gnmic/pkg/api"
21+
"github.com/openconfig/gnmic/pkg/api/target"
22+
"github.com/openconfig/gnmic/pkg/api/types"
2123
"github.com/openconfig/gnmic/pkg/formatters"
2224
"github.com/openconfig/gnmic/pkg/formatters/event_plugin"
2325
gtemplate "github.com/openconfig/gnmic/pkg/gtemplate"
24-
gpath "github.com/openconfig/gnmic/pkg/path"
25-
"github.com/openconfig/gnmic/pkg/target"
26-
"github.com/openconfig/gnmic/pkg/types"
26+
gpath "github.com/openconfig/gnmic/pkg/api/path"
2727
)
2828

2929
const (

‎examples/plugins/go-event-plugin/event-go-plugin.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/hashicorp/go-hclog"
88
"github.com/hashicorp/go-plugin"
99

10+
"github.com/openconfig/gnmic/pkg/api/types"
1011
"github.com/openconfig/gnmic/pkg/formatters"
1112
"github.com/openconfig/gnmic/pkg/formatters/event_plugin"
12-
"github.com/openconfig/gnmic/pkg/types"
1313
)
1414

1515
const (
@@ -31,7 +31,7 @@ func (p *goSampleProcessorPlugin) Init(cfg interface{}, opts ...formatters.Optio
3131
if err != nil {
3232
return err
3333
}
34-
for _, o :=range opts {
34+
for _, o := range opts {
3535
o(p)
3636
}
3737
// initialize logger

‎examples/plugins/minimal/event-my-processor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/hashicorp/go-hclog"
88
"github.com/hashicorp/go-plugin"
99

10+
"github.com/openconfig/gnmic/pkg/api/types"
1011
"github.com/openconfig/gnmic/pkg/formatters"
1112
"github.com/openconfig/gnmic/pkg/formatters/event_plugin"
12-
"github.com/openconfig/gnmic/pkg/types"
1313
)
1414

1515
const (

‎go.mod

+21-21
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ module github.com/openconfig/gnmic
22

33
go 1.21.1
44

5+
replace github.com/openconfig/gnmic/pkg/api v0.1.2 => ./pkg/api
6+
57
require (
68
github.com/Shopify/sarama v1.38.1
79
github.com/adrg/xdg v0.4.0
@@ -41,11 +43,6 @@ require (
4143
github.com/openconfig/gnmi v0.10.0
4244
github.com/openconfig/gnmic/pkg/api v0.1.2
4345
github.com/openconfig/gnmic/pkg/cache v0.1.2
44-
github.com/openconfig/gnmic/pkg/path v0.1.1
45-
github.com/openconfig/gnmic/pkg/target v0.1.4
46-
github.com/openconfig/gnmic/pkg/testutils v0.1.0
47-
github.com/openconfig/gnmic/pkg/types v0.1.2
48-
github.com/openconfig/gnmic/pkg/utils v0.1.0
4946
github.com/openconfig/goyang v1.4.5
5047
github.com/openconfig/ygot v0.29.2
5148
github.com/pkg/sftp v1.13.6
@@ -58,9 +55,9 @@ require (
5855
github.com/spf13/viper v1.15.0
5956
github.com/xdg/scram v1.0.5
6057
go.starlark.net v0.0.0-20231121155337-90ade8b19d09
61-
golang.org/x/crypto v0.18.0
58+
golang.org/x/crypto v0.19.0
6259
golang.org/x/sync v0.6.0
63-
google.golang.org/grpc v1.60.1
60+
google.golang.org/grpc v1.61.0
6461
google.golang.org/protobuf v1.32.0
6562
gopkg.in/natefinch/lumberjack.v2 v2.2.1
6663
gopkg.in/yaml.v2 v2.4.0
@@ -70,9 +67,9 @@ require (
7067
)
7168

7269
require (
73-
cloud.google.com/go/compute v1.23.0 // indirect
70+
cloud.google.com/go/compute v1.23.3 // indirect
7471
cloud.google.com/go/compute/metadata v0.2.3 // indirect
75-
cloud.google.com/go/iam v1.1.2 // indirect
72+
cloud.google.com/go/iam v1.1.5 // indirect
7673
dario.cat/mergo v1.0.0 // indirect
7774
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
7875
github.com/Knetic/govaluate v3.0.0+incompatible // indirect
@@ -103,8 +100,8 @@ require (
103100
github.com/gomodule/redigo v2.0.0+incompatible // indirect
104101
github.com/google/gnostic v0.6.9 // indirect
105102
github.com/google/gofuzz v1.2.0 // indirect
106-
github.com/google/s2a-go v0.1.4 // indirect
107-
github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
103+
github.com/google/s2a-go v0.1.7 // indirect
104+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
108105
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
109106
github.com/hairyhenderson/go-fsimpl v0.0.0-20220529183339-9deae3e35047 // indirect
110107
github.com/hairyhenderson/yaml v0.0.0-20220618171115-2d35fca545ce // indirect
@@ -130,6 +127,9 @@ require (
130127
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
131128
github.com/nats-io/jwt/v2 v2.5.2 // indirect
132129
github.com/oklog/run v1.1.0 // indirect
130+
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
131+
github.com/openconfig/gnmic/pkg/path v0.1.1 // indirect
132+
github.com/openconfig/gnmic/pkg/utils v0.1.1 // indirect
133133
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
134134
github.com/pierrec/lz4/v4 v4.1.18 // indirect
135135
github.com/pjbgf/sha1cd v0.3.0 // indirect
@@ -139,11 +139,11 @@ require (
139139
go.uber.org/atomic v1.11.0 // indirect
140140
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
141141
golang.org/x/mod v0.12.0 // indirect
142-
golang.org/x/oauth2 v0.13.0 // indirect
143-
golang.org/x/term v0.16.0 // indirect
142+
golang.org/x/oauth2 v0.17.0 // indirect
143+
golang.org/x/term v0.17.0 // indirect
144144
golang.org/x/tools v0.13.0 // indirect
145-
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
146-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
145+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
146+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
147147
gopkg.in/inf.v0 v0.9.1 // indirect
148148
k8s.io/klog/v2 v2.100.1 // indirect
149149
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
@@ -153,7 +153,7 @@ require (
153153
)
154154

155155
require (
156-
cloud.google.com/go v0.110.8 // indirect
156+
cloud.google.com/go v0.110.10 // indirect
157157
cloud.google.com/go/storage v1.30.1 // indirect
158158
github.com/AlekSi/pointer v1.2.0
159159
github.com/Masterminds/goutils v1.1.1 // indirect
@@ -175,7 +175,7 @@ require (
175175
github.com/beorn7/perks v1.0.1 // indirect
176176
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
177177
github.com/cespare/xxhash/v2 v2.2.0 // indirect
178-
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
178+
github.com/chzyer/readline v1.5.1 // indirect
179179
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
180180
github.com/deepmap/oapi-codegen v1.8.2 // indirect
181181
github.com/docker/distribution v2.8.2+incompatible // indirect
@@ -260,14 +260,14 @@ require (
260260
go4.org/intern v0.0.0-20230205224052-192e9f60865c // indirect
261261
go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect
262262
gocloud.dev v0.25.1-0.20220408200107-09b10f7359f7 // indirect
263-
golang.org/x/net v0.19.0 // indirect
264-
golang.org/x/sys v0.16.0 // indirect
263+
golang.org/x/net v0.21.0 // indirect
264+
golang.org/x/sys v0.17.0 // indirect
265265
golang.org/x/text v0.14.0
266266
golang.org/x/time v0.3.0 // indirect
267267
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
268-
google.golang.org/api v0.128.0 // indirect
268+
google.golang.org/api v0.149.0 // indirect
269269
google.golang.org/appengine v1.6.8 // indirect
270-
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
270+
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
271271
gopkg.in/ini.v1 v1.67.0 // indirect
272272
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
273273
gopkg.in/warnings.v0 v0.1.2 // indirect

0 commit comments

Comments
 (0)