Skip to content

Commit

Permalink
Update to Ondatra v0.5.6 (openconfig#2874)
Browse files Browse the repository at this point in the history 
* Update to Ondatra v0.5.6

* Fix staticcheck errors on deprecated funcs.
  • Loading branch information
@bstoll
bstoll authored Apr 4, 2024
1 parent a5554ee commit b352e78
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 55 deletions.
9 changes: 4 additions & 5 deletions ...rity/aaa/kne_tests/tls_authentication_over_grpc_test/tls_authentication_over_grpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,16 @@ func keyboardInteraction(password string) ssh.KeyboardInteractiveChallenge {
}
}

func gnmiClient(ctx context.Context, dut *ondatra.DUTDevice, gnmiAddr string) (gpb.GNMIClient, error) {
conn, err := grpc.DialContext(
ctx,
func gnmiClient(dut *ondatra.DUTDevice, gnmiAddr string) (gpb.GNMIClient, error) {
conn, err := grpc.NewClient(
gnmiAddr,
grpc.WithTransportCredentials(
credentials.NewTLS(&tls.Config{
InsecureSkipVerify: true, // NOLINT
})),
)
if err != nil {
return nil, fmt.Errorf("grpc.DialContext => unexpected failure dialing GNMI (should not require auth): %w", err)
return nil, fmt.Errorf("grpc.NewClient => unexpected failure dialing GNMI (should not require auth): %w", err)
}
return gpb.NewGNMIClient(conn), nil
}
Expand Down Expand Up @@ -240,7 +239,7 @@ func TestAuthentication(t *testing.T) {
context.Background(),
"username", tc.user,
"password", tc.pass)
gnmi, err := gnmiClient(ctx, dut, gnmiAddr)
gnmi, err := gnmiClient(dut, gnmiAddr)
if err != nil {
t.Fatal(err)
}
Expand Down
35 changes: 17 additions & 18 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/openconfig/featureprofiles
go 1.21

require (
cloud.google.com/go/pubsub v1.34.0
cloud.google.com/go/pubsub v1.36.1
cloud.google.com/go/storage v1.36.0
github.com/cisco-open/go-p4 v0.1.2
github.com/go-git/go-billy/v5 v5.5.0
Expand All @@ -15,7 +15,7 @@ require (
github.com/google/uuid v1.6.0
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/kr/pretty v0.3.1
github.com/open-traffic-generator/snappi/gosnappi v1.2.0
github.com/open-traffic-generator/snappi/gosnappi v1.3.0
github.com/openconfig/entity-naming v0.0.0-20230912181021-7ac806551a31
github.com/openconfig/gnmi v0.11.0
github.com/openconfig/gnoi v0.4.0
Expand All @@ -27,7 +27,7 @@ require (
github.com/openconfig/gribigo v0.0.0-20231213034307-d0abeba7f432
github.com/openconfig/kne v0.1.17
github.com/openconfig/models-ci v1.0.2-0.20231113233730-f0986391428e
github.com/openconfig/ondatra v0.5.5
github.com/openconfig/ondatra v0.5.6
github.com/openconfig/replayer v0.0.0-20240110192655-4e9cf83d8d30
github.com/openconfig/testt v0.0.0-20220311054427-efbb1a32ec07
github.com/openconfig/ygnmi v0.11.1
Expand All @@ -39,8 +39,8 @@ require (
golang.org/x/crypto v0.21.0
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
golang.org/x/text v0.14.0
google.golang.org/api v0.155.0
google.golang.org/grpc v1.62.1
google.golang.org/api v0.162.0
google.golang.org/grpc v1.63.0
google.golang.org/protobuf v1.33.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/klog/v2 v2.100.1
Expand All @@ -49,15 +49,15 @@ require (
require (
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
golang.org/x/oauth2 v0.16.0
golang.org/x/oauth2 v0.17.0
)

require (
bitbucket.org/creachadair/stringset v0.0.14 // indirect
cloud.google.com/go v0.112.0 // indirect
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute v1.24.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.5 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
dario.cat/mergo v1.0.0 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/aristanetworks/arista-ceoslab-operator/v2 v2.0.2 // indirect
Expand All @@ -66,7 +66,6 @@ require (
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa // indirect
github.com/creack/pty v1.1.18 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
Expand All @@ -80,7 +79,7 @@ require (
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
Expand Down Expand Up @@ -139,23 +138,23 @@ require (
github.com/subosito/gotenv v1.6.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
go.opentelemetry.io/otel v1.22.0 // indirect
go.opentelemetry.io/otel/metric v1.22.0 // indirect
go.opentelemetry.io/otel/trace v1.22.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.19.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
Loading

0 comments on commit b352e78

Please sign in to comment.