Skip to content

Commit c793321

Browse files
authored
deps: Remove onos-lib-go dependency and use orch-library instead (#12)
* deps: Remove onos-lib-go dependency and use orch-library instead * fix linter * Cleanup of golangci config
1 parent 055787a commit c793321

15 files changed

Lines changed: 11 additions & 43 deletions

File tree

networking/.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/open-edge-platform
155155
- github.com/google
156156
- github.com/stretchr/testify
157-
- github.com/onosproject
158157
- github.com/prometheus/client_golang/prometheus
159158
deny:
160159
Test:
@@ -164,7 +163,6 @@ linters-settings:
164163
- $gostd
165164
- github.com/open-edge-platform
166165
- github.com/stretchr/testify
167-
- github.com/onosproject
168166
deny:
169167

170168
issues:

networking/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.17.0
1+
1.17.1

networking/go.mod

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module github.com/open-edge-platform/infra-managers/networking
66
go 1.24.1
77

88
require (
9-
github.com/onosproject/onos-lib-go v0.10.28
109
github.com/open-edge-platform/infra-core/inventory/v2 v2.23.0
10+
github.com/open-edge-platform/orch-library/go v0.5.29
1111
github.com/prometheus/client_golang v1.21.1
1212
github.com/stretchr/testify v1.10.0
1313
google.golang.org/grpc v1.71.0
@@ -35,18 +35,14 @@ require (
3535
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3636
github.com/eapache/go-resiliency v1.7.0 // indirect
3737
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
38-
github.com/eapache/queue v1.1.0 // indirect
39-
github.com/fsnotify/fsnotify v1.8.0 // indirect
4038
github.com/go-ini/ini v1.67.0 // indirect
4139
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
4240
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
4341
github.com/go-logr/logr v1.4.2 // indirect
4442
github.com/go-logr/stdr v1.2.2 // indirect
4543
github.com/go-openapi/inflect v0.21.2 // indirect
46-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
4744
github.com/gobwas/glob v0.2.3 // indirect
4845
github.com/goccy/go-json v0.10.5 // indirect
49-
github.com/gogo/protobuf v1.3.2 // indirect
5046
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
5147
github.com/golang/snappy v1.0.0 // indirect
5248
github.com/google/cel-go v0.24.1 // indirect
@@ -65,7 +61,6 @@ require (
6561
github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0 // indirect
6662
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
6763
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
68-
github.com/hashicorp/go-uuid v1.0.3 // indirect
6964
github.com/hashicorp/hcl v1.0.0 // indirect
7065
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
7166
github.com/hashicorp/vault/api v1.16.0 // indirect
@@ -74,11 +69,7 @@ require (
7469
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
7570
github.com/jackc/pgx/v5 v5.7.4 // indirect
7671
github.com/jackc/puddle/v2 v2.2.2 // indirect
77-
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
78-
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
79-
github.com/jcmturner/gofork v1.7.6 // indirect
8072
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
81-
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
8273
github.com/klauspost/compress v1.18.0 // indirect
8374
github.com/labstack/echo-contrib v0.17.3 // indirect
8475
github.com/labstack/echo/v4 v4.13.3 // indirect
@@ -91,10 +82,8 @@ require (
9182
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
9283
github.com/mitchellh/mapstructure v1.5.0 // indirect
9384
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
94-
github.com/open-edge-platform/orch-library/go v0.5.29 // indirect
9585
github.com/open-edge-platform/orch-library/go/dazl v0.5.2 // indirect
9686
github.com/open-policy-agent/opa v1.3.0 // indirect
97-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
9887
github.com/pierrec/lz4/v4 v4.1.22 // indirect
9988
github.com/pkg/errors v0.9.1 // indirect
10089
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -106,13 +95,9 @@ require (
10695
github.com/ryanuber/go-glob v1.0.0 // indirect
10796
github.com/sagikazarmark/locafero v0.8.0 // indirect
10897
github.com/sirupsen/logrus v1.9.3 // indirect
109-
github.com/sourcegraph/conc v0.3.0 // indirect
11098
github.com/spf13/afero v1.14.0 // indirect
111-
github.com/spf13/cast v1.7.1 // indirect
112-
github.com/spf13/pflag v1.0.6 // indirect
11399
github.com/spf13/viper v1.20.0 // indirect
114100
github.com/stoewer/go-strcase v1.3.0 // indirect
115-
github.com/subosito/gotenv v1.6.0 // indirect
116101
github.com/tchap/go-patricia/v2 v2.3.2 // indirect
117102
github.com/valyala/bytebufferpool v1.0.0 // indirect
118103
github.com/valyala/fasttemplate v1.2.2 // indirect
@@ -133,8 +118,6 @@ require (
133118
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
134119
go.opentelemetry.io/otel/trace v1.35.0 // indirect
135120
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
136-
go.uber.org/multierr v1.11.0 // indirect
137-
go.uber.org/zap v1.27.0 // indirect
138121
golang.org/x/crypto v0.36.0 // indirect
139122
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
140123
golang.org/x/mod v0.24.0 // indirect

networking/go.sum

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,6 @@ github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q
400400
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
401401
github.com/Shopify/sarama v1.38.1 h1:lqqPUPQZ7zPqYlWpTh+LQ9bhYNu2xJL6k1SJN4WVe2A=
402402
github.com/Shopify/sarama v1.38.1/go.mod h1:iwv9a67Ha8VNa+TifujYoWGxWnu2kNVAQdSdZ4X2o5g=
403-
github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc=
404-
github.com/Shopify/toxiproxy/v2 v2.5.0/go.mod h1:yhM2epWtAmel9CB8r2+L+PCmhH6yH2pITaPAo7jxJl0=
405403
github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
406404
github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
407405
github.com/agnivade/levenshtein v1.2.1 h1:EHBY3UOn1gwdy/VbFwgo4cxecRznFk7fKWN1KOX7eoM=
@@ -486,8 +484,6 @@ github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8
486484
github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
487485
github.com/foxcpp/go-mockdns v1.1.0 h1:jI0rD8M0wuYAxL7r/ynTrCQQq0BVqfB99Vgk7DlmewI=
488486
github.com/foxcpp/go-mockdns v1.1.0/go.mod h1:IhLeSFGed3mJIAXPH2aiRQB+kqz7oqu8ld2qVbOu7Wk=
489-
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
490-
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
491487
github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
492488
github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
493489
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -680,7 +676,6 @@ github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8
680676
github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
681677
github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg=
682678
github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=
683-
github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=
684679
github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
685680
github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8=
686681
github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
@@ -1431,8 +1426,6 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
14311426
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
14321427
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
14331428
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
1434-
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
1435-
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
14361429
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
14371430
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
14381431
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

networking/internal/handlers/northbound.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ import (
88
"sync"
99
"time"
1010

11-
rec_v2 "github.com/onosproject/onos-lib-go/pkg/controller/v2"
12-
1311
inv_v1 "github.com/open-edge-platform/infra-core/inventory/v2/pkg/api/inventory/v1"
1412
"github.com/open-edge-platform/infra-core/inventory/v2/pkg/logging"
1513
"github.com/open-edge-platform/infra-core/inventory/v2/pkg/util"
1614
"github.com/open-edge-platform/infra-core/inventory/v2/pkg/validator"
1715
"github.com/open-edge-platform/infra-managers/networking/internal/clients"
1816
"github.com/open-edge-platform/infra-managers/networking/internal/reconcilers"
1917
"github.com/open-edge-platform/infra-managers/networking/internal/utils"
18+
rec_v2 "github.com/open-edge-platform/orch-library/go/pkg/controller/v2"
2019
)
2120

2221
// Misc variables.

networking/internal/handlers/northbound_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"testing"
1212
"time"
1313

14-
rec_v2 "github.com/onosproject/onos-lib-go/pkg/controller/v2"
1514
"github.com/stretchr/testify/assert"
1615
"github.com/stretchr/testify/require"
1716

@@ -20,6 +19,7 @@ import (
2019
"github.com/open-edge-platform/infra-managers/networking/internal/handlers"
2120
"github.com/open-edge-platform/infra-managers/networking/internal/reconcilers"
2221
net_testing "github.com/open-edge-platform/infra-managers/networking/internal/testing"
22+
rec_v2 "github.com/open-edge-platform/orch-library/go/pkg/controller/v2"
2323
)
2424

2525
func TestMain(m *testing.M) {

networking/internal/reconcilers/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"strings"
99
"time"
1010

11-
rec_v2 "github.com/onosproject/onos-lib-go/pkg/controller/v2"
1211
grpc_status "google.golang.org/grpc/status"
1312

1413
inv_errors "github.com/open-edge-platform/infra-core/inventory/v2/pkg/errors"
1514
"github.com/open-edge-platform/infra-managers/networking/internal/utils"
15+
rec_v2 "github.com/open-edge-platform/orch-library/go/pkg/controller/v2"
1616
)
1717

1818
// Constants used for the exp retries.

networking/internal/reconcilers/common_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import (
77
"errors"
88
"testing"
99

10-
"github.com/onosproject/onos-lib-go/pkg/controller/v2"
1110
"github.com/stretchr/testify/assert"
1211
"github.com/stretchr/testify/require"
1312
"google.golang.org/grpc/codes"
1413

1514
inv_errors "github.com/open-edge-platform/infra-core/inventory/v2/pkg/errors"
1615
"github.com/open-edge-platform/infra-managers/networking/internal/reconcilers"
1716
"github.com/open-edge-platform/infra-managers/networking/internal/utils"
17+
"github.com/open-edge-platform/orch-library/go/pkg/controller/v2"
1818
)
1919

2020
const (

networking/internal/reconcilers/ip_reconciler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ package reconcilers
66
import (
77
"context"
88

9-
rec_v2 "github.com/onosproject/onos-lib-go/pkg/controller/v2"
109
"google.golang.org/protobuf/proto"
1110

1211
network_v1 "github.com/open-edge-platform/infra-core/inventory/v2/pkg/api/network/v1"
1312
"github.com/open-edge-platform/infra-core/inventory/v2/pkg/logging"
1413
"github.com/open-edge-platform/infra-core/inventory/v2/pkg/tracing"
1514
"github.com/open-edge-platform/infra-managers/networking/internal/clients"
15+
rec_v2 "github.com/open-edge-platform/orch-library/go/pkg/controller/v2"
1616
)
1717

1818
// Misc variables.

networking/internal/testing/testing.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
package testing
55

66
import (
7-
rec_v2 "github.com/onosproject/onos-lib-go/pkg/controller/v2"
8-
97
"github.com/open-edge-platform/infra-core/inventory/v2/pkg/logging"
108
"github.com/open-edge-platform/infra-managers/networking/internal/clients"
119
"github.com/open-edge-platform/infra-managers/networking/internal/handlers"
1210
"github.com/open-edge-platform/infra-managers/networking/internal/reconcilers"
11+
rec_v2 "github.com/open-edge-platform/orch-library/go/pkg/controller/v2"
1312
)
1413

1514
const (

0 commit comments

Comments
 (0)