Skip to content

Commit 92f4f5c

Browse files
authored
deps: update/delete onos-lib-go dependency, atlas binary in the Docker image (#25)
* deps: bump onos-lib-go dependency * Bump atlas version * Delete unused onos-lib-go deps
1 parent bfa0b6c commit 92f4f5c

File tree

15 files changed

+10
-138
lines changed

15 files changed

+10
-138
lines changed

api/.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ linters-settings:
9696
- github.com/labstack/echo/v4
9797
- github.com/labstack/echo-contrib/echoprometheus
9898
- github.com/modern-go/reflect2
99-
- github.com/onosproject/onos-lib-go
10099
- github.com/stretchr/testify
101100
- github.com/viant/xunsafe
102101
- github.com/grpc-ecosystem/go-grpc-middleware
@@ -118,7 +117,6 @@ linters-settings:
118117
- github.com/open-edge-platform
119118
- github.com/google/uuid
120119
- github.com/mennanov/fmutils
121-
- github.com/onosproject/onos-lib-go
122120
- github.com/labstack/echo/v4
123121
- github.com/grpc-ecosystem/go-grpc-middleware
124122
- github.com/stretchr/testify/assert

apiv2/.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ linters-settings:
9292
- github.com/labstack/echo/v4
9393
- github.com/labstack/echo-contrib/echoprometheus
9494
- github.com/modern-go/reflect2
95-
- github.com/onosproject/onos-lib-go
9695
- github.com/stretchr/testify
9796
- github.com/viant/xunsafe
9897
- github.com/grpc-ecosystem/go-grpc-middleware
@@ -116,7 +115,6 @@ linters-settings:
116115
- github.com/open-edge-platform
117116
- github.com/google/uuid
118117
- github.com/mennanov/fmutils
119-
- github.com/onosproject/onos-lib-go
120118
- github.com/labstack/echo/v4
121119
- github.com/grpc-ecosystem/go-grpc-middleware
122120
- github.com/stretchr/testify/assert

bulk-import-tools/.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ linters-settings:
154154
- github.com/grpc-ecosystem
155155
- github.com/mennanov/fmutils
156156
- github.com/labstack/echo
157-
- github.com/onosproject
158157
- github.com/open-policy-agent
159158
- github.com/pkg/errors
160159
- github.com/rs/zerolog
@@ -174,7 +173,6 @@ linters-settings:
174173
- github.com/google
175174
- github.com/grpc-ecosystem
176175
- github.com/mennanov/fmutils
177-
- github.com/onosproject
178176
- github.com/rs/zerolog
179177
- github.com/stretchr/testify/require
180178
- github.com/stretchr/testify/assert

exporters-inventory/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.18.1-dev
1+
1.18.1

exporters-inventory/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module github.com/open-edge-platform/infra-core/exporters-inventory
66
go 1.24.1
77

88
require (
9-
github.com/onosproject/onos-lib-go v0.10.28
9+
github.com/onosproject/onos-lib-go v0.10.29-0.20241209125119-55579ffad35f
1010
github.com/open-edge-platform/infra-core/api v1.32.0
1111
github.com/open-edge-platform/infra-core/inventory/v2 v2.23.0
1212
github.com/open-edge-platform/infra-managers/host v1.21.0

exporters-inventory/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,8 +767,8 @@ github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletI
767767
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o=
768768
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
769769
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
770-
github.com/onosproject/onos-lib-go v0.10.28 h1:7XCWxaO6r6a26qL9UHSap7po/mEVM86L0/t7s6aZToQ=
771-
github.com/onosproject/onos-lib-go v0.10.28/go.mod h1:O2ov3sou5onYt+PmLFDkv46z7lEubpUXssBQF3gZOJg=
770+
github.com/onosproject/onos-lib-go v0.10.29-0.20241209125119-55579ffad35f h1:/uKCsLU8qn5/41xH0/UW8zwNVNpdj5oRhSmVBiHUUKU=
771+
github.com/onosproject/onos-lib-go v0.10.29-0.20241209125119-55579ffad35f/go.mod h1:O2ov3sou5onYt+PmLFDkv46z7lEubpUXssBQF3gZOJg=
772772
github.com/open-edge-platform/infra-core/api v1.32.0 h1:p7YMG6mBIW5cVDWa9TbpjwwnDzptzRl8DAkqxKe2eGs=
773773
github.com/open-edge-platform/infra-core/api v1.32.0/go.mod h1:6bwFbs40HRwUhYTM0iohBuG1QDbUS0P/RMdbrscIJyo=
774774
github.com/open-edge-platform/infra-core/inventory/v2 v2.23.0 h1:fq25w9Ky6gvE5pTtqf/N9DLrfvZRnIzAJB+VzsiFSnA=

inventory/.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ linters-settings:
154154
- github.com/grpc-ecosystem
155155
- github.com/mennanov/fmutils
156156
- github.com/labstack/echo
157-
- github.com/onosproject
158157
- github.com/open-policy-agent
159158
- github.com/pkg/errors
160159
- github.com/rs/zerolog
@@ -188,7 +187,6 @@ linters-settings:
188187
- github.com/google
189188
- github.com/grpc-ecosystem
190189
- github.com/mennanov/fmutils
191-
- github.com/onosproject
192190
- github.com/rs/zerolog
193191
- github.com/stretchr/testify/require
194192
- github.com/stretchr/testify/assert

inventory/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ WORKDIR /go/src/github.com/open-edge-platform/infra-core/inventory
3636

3737
RUN CGO_ENABLED=0 LABEL_REPO_URL=${REPO_URL} DLABEL_VERSION=${VERSION} LABEL_REVISION=${REVISION} LABEL_BUILD_DATE=${BUILD_DATE} make ${MAKE_TARGET}
3838

39-
# download atlas tool v0.30.0
39+
# download atlas tool
4040
RUN curl -Lo /tmp/atlas "https://release.ariga.io/atlas/atlas-community-linux-amd64-v$ATLAS_VERSION" \
4141
&& echo "$ATLAS_SHA /tmp/atlas" | sha256sum -c - \
4242
&& install -o root -g root -m 0755 /tmp/atlas /usr/local/bin/atlas

inventory/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.23.1-dev
1+
2.23.1

inventory/go.mod

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ require (
3535
github.com/mennanov/fmutils v0.3.0
3636
github.com/mitchellh/mapstructure v1.5.0
3737
github.com/olekukonko/tablewriter v0.0.5
38-
github.com/onosproject/onos-lib-go v0.10.28
3938
github.com/open-edge-platform/orch-library/go v0.5.29
4039
github.com/open-policy-agent/opa v1.3.0
4140
github.com/opencontainers/image-spec v1.1.1
@@ -65,23 +64,17 @@ require (
6564

6665
require (
6766
cel.dev/expr v0.22.0 // indirect
68-
github.com/Shopify/sarama v1.31.1 // indirect
6967
github.com/agext/levenshtein v1.2.3 // indirect
7068
github.com/agnivade/levenshtein v1.2.1 // indirect
7169
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
7270
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
73-
github.com/atomix/atomix/api v0.8.0 // indirect
7471
github.com/beorn7/perks v1.0.1 // indirect
7572
github.com/bmatcuk/doublestar v1.3.4 // indirect
7673
github.com/bufbuild/protocompile v0.14.1 // indirect
7774
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7875
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7976
github.com/chzyer/readline v1.5.1 // indirect
8077
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
81-
github.com/eapache/go-resiliency v1.2.0 // indirect
82-
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
83-
github.com/eapache/queue v1.1.0 // indirect
84-
github.com/fsnotify/fsnotify v1.8.0 // indirect
8578
github.com/go-ini/ini v1.67.0 // indirect
8679
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
8780
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
@@ -90,9 +83,7 @@ require (
9083
github.com/go-openapi/inflect v0.21.2 // indirect
9184
github.com/go-resty/resty/v2 v2.16.5 // indirect
9285
github.com/gobwas/glob v0.2.3 // indirect
93-
github.com/gogo/protobuf v1.3.2 // indirect
9486
github.com/golang/protobuf v1.5.4 // indirect
95-
github.com/golang/snappy v0.0.4 // indirect
9687
github.com/google/cel-go v0.24.1 // indirect
9788
github.com/gorilla/mux v1.8.1 // indirect
9889
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1 // indirect
@@ -105,22 +96,15 @@ require (
10596
github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0 // indirect
10697
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
10798
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
108-
github.com/hashicorp/go-uuid v1.0.2 // indirect
10999
github.com/hashicorp/hcl v1.0.0 // indirect
110100
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
111101
github.com/inconshreveable/mousetrap v1.1.0 // indirect
112102
github.com/jackc/pgpassfile v1.0.0 // indirect
113103
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
114104
github.com/jackc/puddle/v2 v2.2.2 // indirect
115-
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
116-
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
117-
github.com/jcmturner/gofork v1.0.0 // indirect
118-
github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
119-
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
120105
github.com/jhump/protoreflect v1.17.0 // indirect
121106
github.com/klauspost/compress v1.18.0 // indirect
122107
github.com/labstack/gommon v0.4.2 // indirect
123-
github.com/magiconair/properties v1.8.7 // indirect
124108
github.com/mattn/go-colorable v0.1.14 // indirect
125109
github.com/mattn/go-isatty v0.0.20 // indirect
126110
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -129,26 +113,17 @@ require (
129113
github.com/open-edge-platform/orch-library/go/dazl v0.5.2 // indirect
130114
github.com/opencontainers/go-digest v1.0.0 // indirect
131115
github.com/opentracing/opentracing-go v1.2.0 // indirect
132-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
133-
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
134116
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
135117
github.com/prometheus/client_model v0.6.1 // indirect
136118
github.com/prometheus/common v0.63.0 // indirect
137119
github.com/prometheus/procfs v0.16.0 // indirect
138120
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
139121
github.com/rivo/uniseg v0.2.0 // indirect
140122
github.com/ryanuber/go-glob v1.0.0 // indirect
141-
github.com/sagikazarmark/locafero v0.4.0 // indirect
142-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
143123
github.com/segmentio/ksuid v1.0.4 // indirect
144124
github.com/sirupsen/logrus v1.9.3 // indirect
145-
github.com/sourcegraph/conc v0.3.0 // indirect
146-
github.com/spf13/afero v1.11.0 // indirect
147-
github.com/spf13/cast v1.6.0 // indirect
148125
github.com/spf13/pflag v1.0.6 // indirect
149-
github.com/spf13/viper v1.19.0 // indirect
150126
github.com/stoewer/go-strcase v1.3.0 // indirect
151-
github.com/subosito/gotenv v1.6.0 // indirect
152127
github.com/tchap/go-patricia/v2 v2.3.2 // indirect
153128
github.com/valyala/bytebufferpool v1.0.0 // indirect
154129
github.com/valyala/fasttemplate v1.2.2 // indirect
@@ -163,7 +138,6 @@ require (
163138
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
164139
go.uber.org/mock v0.5.0 // indirect
165140
go.uber.org/multierr v1.11.0 // indirect
166-
go.uber.org/zap v1.27.0 // indirect
167141
golang.org/x/crypto v0.36.0 // indirect
168142
golang.org/x/mod v0.24.0 // indirect
169143
golang.org/x/net v0.37.0 // indirect
@@ -172,7 +146,6 @@ require (
172146
golang.org/x/text v0.23.0 // indirect
173147
golang.org/x/time v0.11.0 // indirect
174148
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
175-
gopkg.in/ini.v1 v1.67.0 // indirect
176149
gopkg.in/yaml.v3 v3.0.1 // indirect
177150
sigs.k8s.io/yaml v1.4.0 // indirect
178151
)

0 commit comments

Comments
 (0)