From 491ee9bf6563651673324c60a86d66fca7c65eb6 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Fri, 5 May 2023 16:10:14 -0400 Subject: [PATCH] Update tests for sdk changes --- go.mod | 12 ++++----- go.sum | 27 +++++++++++---------- tests/identity_api_session_activity_test.go | 2 +- tests/sdk_auth_test.go | 22 ++++++++--------- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index fe685eb1c..89dfb6f20 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/openziti/identity v1.0.48 github.com/openziti/jwks v1.0.3 github.com/openziti/metrics v1.2.20 - github.com/openziti/sdk-golang v0.20.5 + github.com/openziti/sdk-golang v0.20.14 github.com/openziti/secretstream v0.1.6 github.com/openziti/storage v0.2.2 github.com/openziti/transport/v2 v2.0.77 @@ -112,18 +112,18 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect github.com/rabbitmq/amqp091-go v1.8.1 // indirect - github.com/shirou/gopsutil/v3 v3.23.3 // indirect - github.com/shoenig/go-m1cpu v0.1.5 // indirect + github.com/shirou/gopsutil/v3 v3.23.4 // indirect + github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/speps/go-hashids v2.0.0+incompatible // indirect github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.mongodb.org/mongo-driver v1.11.4 // indirect + go.mongodb.org/mongo-driver v1.11.6 // indirect go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect - go.opentelemetry.io/otel v1.14.0 // indirect - go.opentelemetry.io/otel/trace v1.14.0 // indirect + go.opentelemetry.io/otel v1.15.1 // indirect + go.opentelemetry.io/otel/trace v1.15.1 // indirect golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 // indirect golang.org/x/mod v0.7.0 // indirect golang.org/x/net v0.9.0 // indirect diff --git a/go.sum b/go.sum index e24843cb9..100d97292 100644 --- a/go.sum +++ b/go.sum @@ -465,8 +465,8 @@ github.com/openziti/jwks v1.0.3 h1:hf8wkb+Cg4nH/HM0KROFd7u+C3DkRVcFZJ7tDV+4icc= github.com/openziti/jwks v1.0.3/go.mod h1:t4xxq8vlXGsPn29kiQVnZBBDDnEoOFqtJoHibkJunQQ= github.com/openziti/metrics v1.2.20 h1:MS5NUhBXM9cEVfTqx1B06FkxkRiLAu/xBAzgUhQNMDU= github.com/openziti/metrics v1.2.20/go.mod h1:DJkQzrO8+CewGNoAJhuW1d+//dPjhIbOQO9AStFlKK4= -github.com/openziti/sdk-golang v0.20.5 h1:imf/LiGd9JPkggVKOD7ofA8ze3ctsaUzigm7z+Z+Oss= -github.com/openziti/sdk-golang v0.20.5/go.mod h1:5In/5E5xdTmiWyClrVAuEPbWNM5clUO1SevIqQDjHMc= +github.com/openziti/sdk-golang v0.20.14 h1:x2Zee4hlEVbyuozBoPqwsTSU7kPT7HaksI8udAJ/CAI= +github.com/openziti/sdk-golang v0.20.14/go.mod h1:CnyLo0hj47Gpx7aEZ9hhMiz6RsmcT4Z3Pd4+MF3mYgk= github.com/openziti/secretstream v0.1.6 h1:TbpTwW/lc/0kuvaoRNjpiyebxh2Hyx8XSTB269QtHN4= github.com/openziti/secretstream v0.1.6/go.mod h1:Gc6fhaDC46UUvwJD4ogbYji22YSdz3fe8bno+BFIpcE= github.com/openziti/storage v0.2.2 h1:LZMNUy235thFRk4oMgGv19PvyqSDwJDBzva7FbtrEuM= @@ -524,13 +524,13 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil/v3 v3.23.3 h1:Syt5vVZXUDXPEXpIBt5ziWsJ4LdSAAxF4l/xZeQgSEE= -github.com/shirou/gopsutil/v3 v3.23.3/go.mod h1:lSBNN6t3+D6W5e5nXTxc8KIMMVxAcS+6IJlffjRRlMU= -github.com/shoenig/go-m1cpu v0.1.4/go.mod h1:Wwvst4LR89UxjeFtLRMrpgRiyY4xPsejnVZym39dbAQ= -github.com/shoenig/go-m1cpu v0.1.5 h1:LF57Z/Fpb/WdGLjt2HZilNnmZOxg/q2bSKTQhgbrLrQ= +github.com/shirou/gopsutil/v3 v3.23.4 h1:hZwmDxZs7Ewt75DV81r4pFMqbq+di2cbt9FsQBqLD2o= +github.com/shirou/gopsutil/v3 v3.23.4/go.mod h1:ZcGxyfzAMRevhUR2+cfhXDH6gQdFYE/t8j1nsU4mPI8= github.com/shoenig/go-m1cpu v0.1.5/go.mod h1:Wwvst4LR89UxjeFtLRMrpgRiyY4xPsejnVZym39dbAQ= -github.com/shoenig/test v0.6.3 h1:GVXWJFk9PiOjN0KoJ7VrJGH6uLPnqxR7/fe3HUPfE0c= +github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= +github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.3/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= +github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -612,8 +612,8 @@ go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsX go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8= -go.mongodb.org/mongo-driver v1.11.4 h1:4ayjakA013OdpGyL2K3ZqylTac/rMjrJOMZ1EHizXas= -go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= +go.mongodb.org/mongo-driver v1.11.6 h1:XM7G6PjiGAO5betLF13BIa5TlLUUE3uJ/2Ox3Lz1K+o= +go.mongodb.org/mongo-driver v1.11.6/go.mod h1:G9TgswdsWjX4tmDA5zfs2+6AEPpYJwqblyjsfuh8oXY= go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 h1:CCriYyAfq1Br1aIYettdHZTy8mBTIPo7We18TuO/bak= go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -623,11 +623,11 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= -go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= +go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= +go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY= -go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M= -go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= +go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= +go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= @@ -834,6 +834,7 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/tests/identity_api_session_activity_test.go b/tests/identity_api_session_activity_test.go index 84c03687f..9e7891b6b 100644 --- a/tests/identity_api_session_activity_test.go +++ b/tests/identity_api_session_activity_test.go @@ -44,7 +44,7 @@ func Test_Identity_HasErConnection(t *testing.T) { managementClient := edge_apis.NewManagementApiClient(managementUrl, caPool) - curSession, err := managementClient.Authenticate(creds) + curSession, err := managementClient.Authenticate(creds, nil) ctx.Req.NoError(err) ctx.Req.NotNil(curSession) diff --git a/tests/sdk_auth_test.go b/tests/sdk_auth_test.go index 4abe1bbfa..3e55ee97b 100644 --- a/tests/sdk_auth_test.go +++ b/tests/sdk_auth_test.go @@ -32,7 +32,7 @@ func TestSdkAuth(t *testing.T) { adminCreds := edge_apis.NewUpdbCredentials(ctx.AdminAuthenticator.Username, ctx.AdminAuthenticator.Password) adminClient := edge_apis.NewManagementApiClient(managementApiUrl, ctx.ControllerConfig.Id.CA()) - apiSession, err := adminClient.Authenticate(adminCreds) + apiSession, err := adminClient.Authenticate(adminCreds, nil) t.Run("management updb", func(t *testing.T) { ctx.testContextChanged(t) @@ -48,7 +48,7 @@ func TestSdkAuth(t *testing.T) { creds := edge_apis.NewUpdbCredentials(ctx.AdminAuthenticator.Username, ctx.AdminAuthenticator.Password) client := edge_apis.NewClientApiClient(clientApiUrl, ctx.ControllerConfig.Id.CA()) - apiSession, err := client.Authenticate(creds) + apiSession, err := client.Authenticate(creds, nil) ctx.Req.NoError(err) ctx.Req.NotNil(client) @@ -63,7 +63,7 @@ func TestSdkAuth(t *testing.T) { creds.CaPool = ctx.ControllerConfig.Id.CA() client := edge_apis.NewClientApiClient(clientApiUrl, nil) - apiSession, err := client.Authenticate(creds) + apiSession, err := client.Authenticate(creds, nil) ctx.Req.NoError(err) ctx.Req.NotNil(client) @@ -76,7 +76,7 @@ func TestSdkAuth(t *testing.T) { creds := edge_apis.NewCertCredentials([]*x509.Certificate{testIdCerts.cert}, testIdCerts.key) client := edge_apis.NewManagementApiClient(managementApiUrl, ctx.ControllerConfig.Id.CA()) - apiSession, err := client.Authenticate(creds) + apiSession, err := client.Authenticate(creds, nil) ctx.Req.NoError(err) ctx.Req.NotNil(client) @@ -91,7 +91,7 @@ func TestSdkAuth(t *testing.T) { creds.CaPool = ctx.ControllerConfig.Id.CA() client := edge_apis.NewManagementApiClient(managementApiUrl, nil) - apiSession, err := client.Authenticate(creds) + apiSession, err := client.Authenticate(creds, nil) ctx.Req.NoError(err) ctx.Req.NotNil(client) @@ -105,7 +105,7 @@ func TestSdkAuth(t *testing.T) { creds := edge_apis.NewCertCredentials([]*x509.Certificate{testIdCerts.cert}, testIdCerts.key) client := edge_apis.NewClientApiClient(clientApiUrl, ctx.ControllerConfig.Id.CA()) - apiSession, err := client.Authenticate(creds) + apiSession, err := client.Authenticate(creds, nil) ctx.Req.NoError(err) ctx.Req.NotNil(client) @@ -120,7 +120,7 @@ func TestSdkAuth(t *testing.T) { creds.CaPool = ctx.ControllerConfig.Id.CA() client := edge_apis.NewClientApiClient(clientApiUrl, nil) - apiSession, err := client.Authenticate(creds) + apiSession, err := client.Authenticate(creds, nil) ctx.Req.NoError(err) ctx.Req.NotNil(client) @@ -226,7 +226,7 @@ func TestSdkAuth(t *testing.T) { ctx.testContextChanged(t) creds := edge_apis.NewJwtCredentials(jwtStrSigned) client := edge_apis.NewClientApiClient(clientApiUrl, ctx.ControllerConfig.Id.CA()) - apiSession, err := client.Authenticate(creds) + apiSession, err := client.Authenticate(creds, nil) ctx.Req.NoError(err) ctx.Req.NotNil(client) @@ -240,7 +240,7 @@ func TestSdkAuth(t *testing.T) { creds.CaPool = ctx.ControllerConfig.Id.CA() client := edge_apis.NewClientApiClient(clientApiUrl, nil) - apiSession, err := client.Authenticate(creds) + apiSession, err := client.Authenticate(creds, nil) ctx.Req.NoError(err) ctx.Req.NotNil(client) @@ -252,7 +252,7 @@ func TestSdkAuth(t *testing.T) { ctx.testContextChanged(t) creds := edge_apis.NewJwtCredentials(jwtStrSigned) client := edge_apis.NewManagementApiClient(managementApiUrl, ctx.ControllerConfig.Id.CA()) - apiSession, err := client.Authenticate(creds) + apiSession, err := client.Authenticate(creds, nil) ctx.Req.NoError(err) ctx.Req.NotNil(client) @@ -266,7 +266,7 @@ func TestSdkAuth(t *testing.T) { creds.CaPool = ctx.ControllerConfig.Id.CA() client := edge_apis.NewManagementApiClient(managementApiUrl, nil) - apiSession, err := client.Authenticate(creds) + apiSession, err := client.Authenticate(creds, nil) ctx.Req.NoError(err) ctx.Req.NotNil(client)