diff --git a/common/enrollment/enroll.go b/common/enrollment/enroll.go index 8010f9fb4..89a1a7def 100644 --- a/common/enrollment/enroll.go +++ b/common/enrollment/enroll.go @@ -19,6 +19,7 @@ package enrollment import ( "encoding/json" "fmt" + "github.com/openziti/sdk-golang/ziti" "github.com/openziti/ziti/ziti/cmd/common" "io/ioutil" "os" @@ -27,7 +28,6 @@ import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/foundation/v2/term" "github.com/openziti/identity/certtools" - "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/enroll" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -48,7 +48,7 @@ const outFlag = "out" type EnrollOptions struct { common.CommonOptions RemoveJwt bool - KeyAlg config.KeyAlgVar + KeyAlg ziti.KeyAlgVar JwtPath string OutputPath string KeyPath string diff --git a/go.mod b/go.mod index 075f63d77..29f087912 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/fatih/color v1.15.0 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa github.com/go-acme/lego/v4 v4.2.0 - github.com/go-openapi/runtime v0.25.0 + github.com/go-openapi/runtime v0.26.0 github.com/go-openapi/strfmt v0.21.7 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/protobuf v1.5.2 @@ -21,16 +21,16 @@ require ( github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.6.10 github.com/openziti/agent v1.0.10 - github.com/openziti/channel/v2 v2.0.58 - github.com/openziti/edge v0.24.239 - github.com/openziti/edge-api v0.25.11 - github.com/openziti/fabric v0.22.89 + github.com/openziti/channel/v2 v2.0.62 + github.com/openziti/edge v0.24.251 + github.com/openziti/edge-api v0.25.18 + github.com/openziti/fabric v0.23.1 github.com/openziti/foundation/v2 v2.0.21 - github.com/openziti/identity v1.0.45 + github.com/openziti/identity v1.0.47 github.com/openziti/runzmd v1.0.20 - github.com/openziti/sdk-golang v0.18.76 - github.com/openziti/storage v0.1.49 - github.com/openziti/transport/v2 v2.0.72 + github.com/openziti/sdk-golang v0.20.2 + github.com/openziti/storage v0.2.0 + github.com/openziti/transport/v2 v2.0.75 github.com/openziti/xweb/v2 v2.0.2 github.com/openziti/ziti-db-explorer v1.1.1 github.com/pkg/errors v0.9.1 @@ -66,7 +66,7 @@ require ( github.com/biogo/store v0.0.0-20200525035639-8c94ae1e7c9c // indirect github.com/boltdb/bolt v1.3.1 // indirect github.com/c-bata/go-prompt v0.2.6 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/coreos/go-iptables v0.6.0 // indirect github.com/creack/pty v1.1.11 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -90,7 +90,7 @@ require ( github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/loads v0.21.2 // indirect - github.com/go-openapi/spec v0.20.8 // indirect + github.com/go-openapi/spec v0.20.9 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/go-openapi/validate v0.22.1 // indirect github.com/go-resty/resty/v2 v2.7.0 // indirect @@ -106,7 +106,7 @@ require ( github.com/hashicorp/golang-lru v0.6.0 // indirect github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/hashicorp/raft v1.4.0 // indirect + github.com/hashicorp/raft v1.5.0 // indirect github.com/hashicorp/raft-boltdb v0.0.0-20220329195025-15018e9b97e0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jessevdk/go-flags v1.5.0 // indirect @@ -144,6 +144,7 @@ require ( github.com/openziti/dilithium v0.3.3 // indirect github.com/openziti/jwks v1.0.3 // indirect github.com/openziti/metrics v1.2.19 // indirect + github.com/openziti/secretstream v0.1.6 // indirect github.com/openziti/x509-claims v1.0.3 // indirect github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 // indirect @@ -175,7 +176,7 @@ require ( go.opentelemetry.io/otel v1.14.0 // indirect go.opentelemetry.io/otel/trace v1.14.0 // indirect golang.org/x/crypto v0.8.0 // indirect - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect + golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 // indirect golang.org/x/image v0.7.0 // indirect golang.org/x/mod v0.8.0 // indirect golang.org/x/sync v0.1.0 // indirect diff --git a/go.sum b/go.sum index f4ce2e662..a3ae71b27 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,8 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7 github.com/c-bata/go-prompt v0.2.6 h1:POP+nrHE+DfLYx370bedwNhsqmpCUynWPxuHi0C5vZI= github.com/c-bata/go-prompt v0.2.6/go.mod h1:/LMAke8wD2FsNu9EXNdHxNLbd9MedkPnCdfpU9wwHfY= github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= -github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4= -github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -282,12 +282,12 @@ github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= github.com/go-openapi/loads v0.21.2 h1:r2a/xFIYeZ4Qd2TnGpWDIQNcP80dIaZgf704za8enro= github.com/go-openapi/loads v0.21.2/go.mod h1:Jq58Os6SSGz0rzh62ptiu8Z31I+OTHqmULx5e/gJbNw= -github.com/go-openapi/runtime v0.25.0 h1:7yQTCdRbWhX8vnIjdzU8S00tBYf7Sg71EBeorlPHvhc= -github.com/go-openapi/runtime v0.25.0/go.mod h1:Ux6fikcHXyyob6LNWxtE96hWwjBPYF0DXgVFuMTneOs= +github.com/go-openapi/runtime v0.26.0 h1:HYOFtG00FM1UvqrcxbEJg/SwvDRvYLQKGhw2zaQjTcc= +github.com/go-openapi/runtime v0.26.0/go.mod h1:QgRGeZwrUcSHdeh4Ka9Glvo0ug1LC5WyE+EV88plZrQ= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= -github.com/go-openapi/spec v0.20.8 h1:ubHmXNY3FCIOinT8RNrrPfGc9t7I1qhPtdOGoG2AxRU= -github.com/go-openapi/spec v0.20.8/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= +github.com/go-openapi/spec v0.20.9 h1:xnlYNQAwKd2VQRRfwTEI0DcK+2cbuvI/0c7jx3gA8/8= +github.com/go-openapi/spec v0.20.9/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= @@ -480,8 +480,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/raft v1.1.0/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM= -github.com/hashicorp/raft v1.4.0 h1:tn28S/AWv0BtRQgwZv/1NELu8sCvI0FixqL8C8MYKeY= -github.com/hashicorp/raft v1.4.0/go.mod h1:nz64BIjXphDLATfKGG5RzHtNUPioLeKFsXEm88yTVew= +github.com/hashicorp/raft v1.5.0 h1:uNs9EfJ4FwiArZRxxfd/dQ5d33nV31/CdCHArH89hT8= +github.com/hashicorp/raft v1.5.0/go.mod h1:pKHB2mf/Y25u3AHNSXVRv+yT+WAnmeTX0BwVppVQV+M= github.com/hashicorp/raft-boltdb v0.0.0-20220329195025-15018e9b97e0 h1:CO8dBMLH6dvE1jTn/30ZZw3iuPsNfajshWoJTnVc5cc= github.com/hashicorp/raft-boltdb v0.0.0-20220329195025-15018e9b97e0/go.mod h1:nTakvJ4XYq45UXtn0DbwR4aU9ZdjlnIenpbs6Cd+FM0= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= @@ -699,32 +699,34 @@ github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTm github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openziti/agent v1.0.10 h1:9oTmNXghlggD+O7BJdBp3PkD5kAZ1ssSC6IHZkMakzQ= github.com/openziti/agent v1.0.10/go.mod h1:6APWgkPP6Uxf1/VyirdTVLAJxwam2vVyakrVw6yvs40= -github.com/openziti/channel/v2 v2.0.58 h1:j9baDM8nEAgHNhJ9n1h+WWbFSgCQCjvNB3KCr5x5q6c= -github.com/openziti/channel/v2 v2.0.58/go.mod h1:Wa3TS5o4pBFSGnDb9zRCGww29ZVXk0GnupwNpb/2DWE= +github.com/openziti/channel/v2 v2.0.62 h1:WmNYAugoyQ2HFu2VEhOH4WExzXsX6+dzSQDzNfHf5M8= +github.com/openziti/channel/v2 v2.0.62/go.mod h1:TS2FJs1GuCZXUfSFfptrNWKeTuQRO7YJ9K7C2jWMznA= github.com/openziti/dilithium v0.3.3 h1:PLgQ6PMNLSTzCFbX/h98cmudgz/cU6TmjdSv5NAPD8k= github.com/openziti/dilithium v0.3.3/go.mod h1:vsCjI2AU/hon9e+dLhUFbCNGesJDj2ASgkySOcpmvjo= -github.com/openziti/edge v0.24.239 h1:S7bAy/BfpGpKwXnfWuGgWpfjUEuJ5iwZojTxu9W8DO0= -github.com/openziti/edge v0.24.239/go.mod h1:G6PLbcyib36KH9hN6tMacr2UMin15EmZioSGPPptJ0U= -github.com/openziti/edge-api v0.25.11 h1:HHjDgoybPZGRZ+tM2udehI+U5Xv991iGED8E6CtDb9w= -github.com/openziti/edge-api v0.25.11/go.mod h1:PBFMYELgr7JUuaCqHobq1U+WESsutzgEDoELU/9qFOg= -github.com/openziti/fabric v0.22.89 h1:6s4zrvKfSqwsCF74KxV3LEh7/qKFPJEaYNcjLauXANo= -github.com/openziti/fabric v0.22.89/go.mod h1:LI8A9Sf012ICzFQERh9zHzvKMdjcMcW2sPFCzKTsW9E= +github.com/openziti/edge v0.24.251 h1:F7m8U3UQLEC53s3t/UXGsAKlSar8qY+BubD1Ek01OcA= +github.com/openziti/edge v0.24.251/go.mod h1:Qoj6QDOxOtBZf36CHDu8FLDwpiTY6Ra7xcFmVsRFVM0= +github.com/openziti/edge-api v0.25.18 h1:LEiDz7MF4R9ZQNHwG34oTy4XCUlX4+kXRzvNYhp6e08= +github.com/openziti/edge-api v0.25.18/go.mod h1:m4fMjlxnU1Yq9rsBYNKMs1B3BxLZlpo/V3iy42H/Bkg= +github.com/openziti/fabric v0.23.1 h1:9RFRmApJ9EGUNNwIP4OSZcgFmiBdVLTvLfYsYRID8ws= +github.com/openziti/fabric v0.23.1/go.mod h1:p5EI0s0LvNi6HipLR+PWDon89C3dhfyX/jac/3cwmpA= github.com/openziti/foundation/v2 v2.0.21 h1:3EDDmSunsbd2DlULuY/vqj12LHRZOknH/m3lf6Ws5Nw= github.com/openziti/foundation/v2 v2.0.21/go.mod h1:02GW3jFSSlfLwYwuTIldP/S4w7eCKqlzL6ajFSGHNPA= -github.com/openziti/identity v1.0.45 h1:e2kXoMCPcaUXy+k6GwasuKeGSJwavFEr+eOvUA228UY= -github.com/openziti/identity v1.0.45/go.mod h1:fQ5bjNu4L1Yqk011xNB1QXvsmBRHnm5d498fi1bhl24= +github.com/openziti/identity v1.0.47 h1:Zc1wL4yMq6hcmbgNR6d3gSkGCiK3IJYd9i4obBNBMPw= +github.com/openziti/identity v1.0.47/go.mod h1:fQ5bjNu4L1Yqk011xNB1QXvsmBRHnm5d498fi1bhl24= 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.19 h1:gQO3e2lUotRHBdGUXYBPWMIErIyyF5hw0EakwQbJzuM= github.com/openziti/metrics v1.2.19/go.mod h1:ovvxTpDBxGLcVLHgPTFFvwT4ur8p4Z76BPUhIE5iwqc= github.com/openziti/runzmd v1.0.20 h1:LzRPZRVO9AepAFzGTEsRGp2LRVtJp5vr+QOBl8KbN4w= github.com/openziti/runzmd v1.0.20/go.mod h1:IXTk5dHAZxtqjg9WVHOiyXHqEHZdwaH5Wg80h5Ux3bQ= -github.com/openziti/sdk-golang v0.18.76 h1:D+UW1lpGHBBgfVrObpauq9RvJV/TFPdEEshfuPkiMcI= -github.com/openziti/sdk-golang v0.18.76/go.mod h1:kw/5rWDLwx52iwW/4a0VRQMUi7GPSI3aETx+G5TvdFQ= -github.com/openziti/storage v0.1.49 h1:luRsssYlGhpiJxjgc+FWF/yd2JLs9IKfeKID/5Hknrg= -github.com/openziti/storage v0.1.49/go.mod h1:Le2VFNL67YewLtaCnGNXPLH18Yrh/EMxeJ/eXxTOwak= -github.com/openziti/transport/v2 v2.0.72 h1:yjJtxy3Ckx5I4pDicmxILTdqQB6D18LSg2Zvsde0T00= -github.com/openziti/transport/v2 v2.0.72/go.mod h1:YuDvm+syZc9nfdhbdPZdtuL1Dfw+bELWhWVYAg73ups= +github.com/openziti/sdk-golang v0.20.2 h1:HTwWN7RmWrIop+AspcR2gVr13KYm4s3KS2RvgPhmVWs= +github.com/openziti/sdk-golang v0.20.2/go.mod h1:QE22lxF7REJXuggFCPPiKrlttgwrqSPEvUb0ka+jtjk= +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.0 h1:uwSoZQEZCzxp4+KZEi7fOWezbm0knmcCbRhni/DGHSo= +github.com/openziti/storage v0.2.0/go.mod h1:rJjLObUtJBNcm7MvnTr4DHCXZ+ppg0OMeoJ5tfi1aJI= +github.com/openziti/transport/v2 v2.0.75 h1:KZmnyRH1SOXSI6DXqDRsbRxRJE2cWv5EDCiQqC+R+hQ= +github.com/openziti/transport/v2 v2.0.75/go.mod h1:xMoDhxk9FFQoVyh4YL2h1hOshE5Aqlabd4mctmK1TWU= github.com/openziti/x509-claims v1.0.3 h1:HNdQ8Nf1agB3lBs1gahcO6zfkeS4S5xoQ2/PkY4HRX0= github.com/openziti/x509-claims v1.0.3/go.mod h1:Z0WIpBm6c4ecrpRKrou6Gk2wrLWxJO/+tuUwKh8VewE= github.com/openziti/xweb/v2 v2.0.2 h1:XYlVFriTq/U1wcUrc+XPnWJGhXh9NJPhtQ7+r3aC0cU= @@ -981,7 +983,7 @@ 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/sdk v1.11.1 h1:F7KmQgoHljhUuJyA+9BiU+EkJfyX5nVVF4wyzWZpKxs= +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/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= @@ -1034,8 +1036,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 h1:5llv2sWeaMSnA3w2kS57ouQQ4pudlXrR0dCgw51QK9o= +golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= diff --git a/quickstart/test/quickstart_test.go b/quickstart/test/quickstart_test.go index f0e2a8883..12379cb2f 100644 --- a/quickstart/test/quickstart_test.go +++ b/quickstart/test/quickstart_test.go @@ -24,7 +24,6 @@ import ( "github.com/openziti/edge-api/rest_model" "github.com/openziti/edge-api/rest_util" "github.com/openziti/sdk-golang/ziti" - sdk_config "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/enroll" "github.com/pkg/errors" log "github.com/sirupsen/logrus" @@ -407,7 +406,7 @@ func TestSimpleWebService(t *testing.T) { assert.Equal(t, 200, resp.StatusCode, fmt.Sprintf("Expected successful HTTP status code 200, received %d instead", resp.StatusCode)) } -func enrollIdentity(client *rest_management_api_client.ZitiEdgeManagement, identityID string) *sdk_config.Config { +func enrollIdentity(client *rest_management_api_client.ZitiEdgeManagement, identityID string) *ziti.Config { // Get the identity object params := &identity.DetailIdentityParams{ Context: context.Background(), @@ -447,11 +446,14 @@ func Dial(_ context.Context, _ string, addr string) (net.Conn, error) { } func createZitifiedHttpClient(idFile string) http.Client { - cfg, err := sdk_config.NewFromFile(idFile) + cfg, err := ziti.NewConfigFromFile(idFile) + if err != nil { + panic(err) + } + zitiContext, err = ziti.NewContext(cfg) if err != nil { panic(err) } - zitiContext = ziti.NewContextWithConfig(cfg) zitiTransport := http.DefaultTransport.(*http.Transport).Clone() // copy default transport zitiTransport.DialContext = Dial //zitiDialContext.Dial return http.Client{Transport: zitiTransport} diff --git a/ziti-fabric-test/subcmd/loop2/dialer.go b/ziti-fabric-test/subcmd/loop2/dialer.go index 0603f719c..19cea5dba 100644 --- a/ziti-fabric-test/subcmd/loop2/dialer.go +++ b/ziti-fabric-test/subcmd/loop2/dialer.go @@ -20,10 +20,9 @@ import ( "fmt" "github.com/michaelquigley/pfxlog" "github.com/openziti/fabric/router/xgress_transport" - "github.com/openziti/identity/dotziti" "github.com/openziti/identity" + "github.com/openziti/identity/dotziti" "github.com/openziti/sdk-golang/ziti" - "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/transport/v2" "github.com/openziti/ziti/ziti-fabric-test/subcmd/loop2/pb" "github.com/spf13/cobra" @@ -162,13 +161,17 @@ func (cmd *dialerCmd) connect() net.Conn { var context ziti.Context if cmd.edgeConfigFile != "" { - zitiCfg, err := config.NewFromFile(cmd.edgeConfigFile) + zitiCfg, err := ziti.NewConfigFromFile(cmd.edgeConfigFile) if err != nil { log.Fatalf("failed to load ziti configuration from %s: %v", cmd.edgeConfigFile, err) } - context = ziti.NewContextWithConfig(zitiCfg) + + context, err = ziti.NewContext(zitiCfg) + if err != nil { + log.Fatalf("failed to load ziti context fromt configuration: %v", err) + } } else { - context = ziti.NewContext() + log.Fatal("no configuration file provided") } service := strings.TrimPrefix(cmd.endpoint, "edge:") diff --git a/ziti-fabric-test/subcmd/loop2/listener.go b/ziti-fabric-test/subcmd/loop2/listener.go index 84e0daa95..f4487617e 100644 --- a/ziti-fabric-test/subcmd/loop2/listener.go +++ b/ziti-fabric-test/subcmd/loop2/listener.go @@ -18,10 +18,9 @@ package loop2 import ( "github.com/michaelquigley/pfxlog" - "github.com/openziti/identity/dotziti" "github.com/openziti/identity" + "github.com/openziti/identity/dotziti" "github.com/openziti/sdk-golang/ziti" - "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/transport/v2" "github.com/openziti/ziti/ziti-fabric-test/subcmd/loop2/pb" "github.com/spf13/cobra" @@ -85,13 +84,17 @@ func (cmd *listenerCmd) listenEdge() { var context ziti.Context if cmd.edgeConfigFile != "" { - zitiCfg, err := config.NewFromFile(cmd.edgeConfigFile) + zitiCfg, err := ziti.NewConfigFromFile(cmd.edgeConfigFile) if err != nil { log.Fatalf("failed to load ziti configuration from %s: %v", cmd.edgeConfigFile, err) } - context = ziti.NewContextWithConfig(zitiCfg) + + context, err = ziti.NewContext(zitiCfg) + if err != nil { + log.Fatalf("failed to load ziti context from cofnig: %v", err) + } } else { - context = ziti.NewContext() + log.Fatal("no configuration file provided") } service := strings.TrimPrefix(cmd.bindAddress, "edge:") diff --git a/ziti-fabric-test/subcmd/loop3/dialer.go b/ziti-fabric-test/subcmd/loop3/dialer.go index 0a1160ee9..ef47515c9 100644 --- a/ziti-fabric-test/subcmd/loop3/dialer.go +++ b/ziti-fabric-test/subcmd/loop3/dialer.go @@ -19,12 +19,11 @@ package loop3 import ( "fmt" "github.com/michaelquigley/pfxlog" - "github.com/openziti/fabric/router/xgress_transport" "github.com/openziti/agent" - "github.com/openziti/identity/dotziti" + "github.com/openziti/fabric/router/xgress_transport" "github.com/openziti/identity" + "github.com/openziti/identity/dotziti" "github.com/openziti/sdk-golang/ziti" - "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/transport/v2" "github.com/spf13/cobra" "net" @@ -158,13 +157,17 @@ func (cmd *dialerCmd) connect() net.Conn { if strings.HasPrefix(cmd.endpoint, "edge:") { var context ziti.Context if cmd.edgeConfigFile != "" { - zitiCfg, err := config.NewFromFile(cmd.edgeConfigFile) + zitiCfg, err := ziti.NewConfigFromFile(cmd.edgeConfigFile) if err != nil { log.Fatalf("failed to load ziti configuration from %s: %v", cmd.edgeConfigFile, err) } - context = ziti.NewContextWithConfig(zitiCfg) + context, err = ziti.NewContext(zitiCfg) + + if err != nil { + log.Fatalf("failed to load ziti context from config: %v", err) + } } else { - context = ziti.NewContext() + log.Fatal("no configuration provided") } service := strings.TrimPrefix(cmd.endpoint, "edge:") diff --git a/ziti-fabric-test/subcmd/loop3/listener.go b/ziti-fabric-test/subcmd/loop3/listener.go index e000fb09b..37cde75a9 100644 --- a/ziti-fabric-test/subcmd/loop3/listener.go +++ b/ziti-fabric-test/subcmd/loop3/listener.go @@ -20,10 +20,9 @@ import ( "errors" "github.com/michaelquigley/pfxlog" "github.com/openziti/agent" - "github.com/openziti/identity/dotziti" "github.com/openziti/identity" + "github.com/openziti/identity/dotziti" "github.com/openziti/sdk-golang/ziti" - "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/transport/v2" loop3_pb "github.com/openziti/ziti/ziti-fabric-test/subcmd/loop3/pb" "github.com/sirupsen/logrus" @@ -138,13 +137,17 @@ func (cmd *listenerCmd) listenEdge() { var context ziti.Context if cmd.edgeConfigFile != "" { - zitiCfg, err := config.NewFromFile(cmd.edgeConfigFile) + zitiCfg, err := ziti.NewConfigFromFile(cmd.edgeConfigFile) if err != nil { log.Fatalf("failed to load ziti configuration from %s: %v", cmd.edgeConfigFile, err) } - context = ziti.NewContextWithConfig(zitiCfg) + context, err = ziti.NewContext(zitiCfg) + + if err != nil { + log.Fatalf("failed to load ziti context from config: %v", err) + } } else { - context = ziti.NewContext() + log.Fatal("no configuration provided") } service := strings.TrimPrefix(cmd.bindAddress, "edge:") diff --git a/ziti-fabric-test/subcmd/loop3/metrics.go b/ziti-fabric-test/subcmd/loop3/metrics.go index b748746d3..b538fb48d 100644 --- a/ziti-fabric-test/subcmd/loop3/metrics.go +++ b/ziti-fabric-test/subcmd/loop3/metrics.go @@ -5,7 +5,6 @@ import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/fabric/pb/mgmt_pb" "github.com/openziti/sdk-golang/ziti" - "github.com/openziti/sdk-golang/ziti/config" "github.com/pkg/errors" "github.com/rcrowley/go-metrics" "google.golang.org/protobuf/proto" @@ -69,13 +68,17 @@ func (r *zitiMetricsReporter) run(reportInterval time.Duration) { var client ziti.Context if r.configFile != "" { - sdkConfig, err := config.NewFromFile(r.configFile) + sdkConfig, err := ziti.NewConfigFromFile(r.configFile) + if err != nil { + panic(err) + } + client, err = ziti.NewContext(sdkConfig) + if err != nil { panic(err) } - client = ziti.NewContextWithConfig(sdkConfig) } else { - client = ziti.NewContext() + panic("no configuration file provided") } conn, err := client.Dial(r.service) diff --git a/ziti/cmd/demo/echo_server.go b/ziti/cmd/demo/echo_server.go index bfc304060..768b05606 100644 --- a/ziti/cmd/demo/echo_server.go +++ b/ziti/cmd/demo/echo_server.go @@ -24,7 +24,6 @@ import ( "github.com/openziti/channel/v2" "github.com/openziti/identity" "github.com/openziti/sdk-golang/ziti" - "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/edge" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -131,7 +130,7 @@ func (self *echoServer) run(*cobra.Command, []string) { } if self.configFile != "" { - zitiConfig, err := config.NewFromFile(self.configFile) + zitiConfig, err := ziti.NewConfigFromFile(self.configFile) if err != nil { log.WithError(err).Fatalf("ziti: unable to load ziti identity from [%v]", self.configFile) } @@ -140,7 +139,11 @@ func (self *echoServer) run(*cobra.Command, []string) { log.WithError(err).Fatalf("ziti: unable to create ziti identity from [%v]", self.configFile) } - zitiContext := ziti.NewContextWithConfig(zitiConfig) + zitiContext, err := ziti.NewContext(zitiConfig) + + if err != nil { + log.WithError(err).Fatal("unable to get create ziti context from config") + } zitiIdentity, err := zitiContext.GetCurrentIdentity() if err != nil { @@ -149,20 +152,20 @@ func (self *echoServer) run(*cobra.Command, []string) { listenOptions := ziti.DefaultListenOptions() listenOptions.BindUsingEdgeIdentity = self.bindWithIdentity - listenOptions.Cost = zitiIdentity.DefaultHostingCost - listenOptions.Precedence = ziti.GetPrecedenceForLabel(zitiIdentity.DefaultHostingPrecedence) + listenOptions.Cost = uint16(*zitiIdentity.DefaultHostingCost) + listenOptions.Precedence = ziti.GetPrecedenceForLabel(string(zitiIdentity.DefaultHostingPrecedence)) svc, found := zitiContext.GetService(self.service) if !found { log.WithError(err).Fatalf("ziti: unable to lookup service [%v]", self.service) } - if cost, found := zitiIdentity.ServiceHostingCosts[svc.Id]; found { - listenOptions.Cost = uint16(cost.(float64)) + if cost, found := zitiIdentity.ServiceHostingCosts[*svc.ID]; found { + listenOptions.Cost = uint16(*cost) } - if precedence, found := zitiIdentity.ServiceHostingPrecedences[svc.Id]; found { - listenOptions.Precedence = ziti.GetPrecedenceForLabel(precedence.(string)) + if precedence, found := zitiIdentity.ServiceHostingPrecedences[*svc.ID]; found { + listenOptions.Precedence = ziti.GetPrecedenceForLabel(string(precedence)) } log.Infof("ziti: hosting %v with addressable=%v, cost=%v, precedence=%v", diff --git a/ziti/cmd/demo/zcat.go b/ziti/cmd/demo/zcat.go index fda7d7ff9..2711a14a5 100644 --- a/ziti/cmd/demo/zcat.go +++ b/ziti/cmd/demo/zcat.go @@ -20,7 +20,6 @@ import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/foundation/v2/info" "github.com/openziti/sdk-golang/ziti" - "github.com/openziti/sdk-golang/ziti/config" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "io" @@ -97,7 +96,7 @@ func (self *zcatAction) run(_ *cobra.Command, args []string) { if network == "tcp" || network == "udp" { conn, err = net.Dial(network, addr) } else if network == "ziti" { - zitiConfig, cfgErr := config.NewFromFile(self.configFile) + zitiConfig, cfgErr := ziti.NewConfigFromFile(self.configFile) if cfgErr != nil { log.WithError(cfgErr).Fatalf("unable to load ziti identity from [%v]", self.configFile) } @@ -108,7 +107,12 @@ func (self *zcatAction) run(_ *cobra.Command, args []string) { addr = addr[atIdx+1:] } - zitiContext := ziti.NewContextWithConfig(zitiConfig) + zitiContext, err := ziti.NewContext(zitiConfig) + + if err != nil { + pfxlog.Logger().WithError(err).Fatal("could not create sdk context from config") + } + dialOptions := &ziti.DialOptions{ ConnectTimeout: 5 * time.Second, Identity: dialIdentifier, diff --git a/ziti/cmd/edge/traceroute.go b/ziti/cmd/edge/traceroute.go index 25fe33c5b..3ca982079 100644 --- a/ziti/cmd/edge/traceroute.go +++ b/ziti/cmd/edge/traceroute.go @@ -3,10 +3,10 @@ package edge import ( "fmt" "github.com/openziti/sdk-golang/ziti" - "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/ziti/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/helpers" + "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "io" @@ -60,13 +60,16 @@ func newTraceRouteCmd(out io.Writer, errOut io.Writer) *cobra.Command { func (o *traceRouteOptions) Run() error { var ctx ziti.Context if o.configFile != "" { - cfg, err := config.NewFromFile(o.configFile) + cfg, err := ziti.NewConfigFromFile(o.configFile) + if err != nil { + return err + } + ctx, err = ziti.NewContext(cfg) if err != nil { return err } - ctx = ziti.NewContextWithConfig(cfg) } else { - ctx = ziti.NewContext() + return errors.New("invalid configuration file") } conn, err := ctx.Dial(o.Args[0]) diff --git a/ziti/cmd/tutorial/ziti_echo_client.go b/ziti/cmd/tutorial/ziti_echo_client.go index dca6c0fca..df698d7e1 100644 --- a/ziti/cmd/tutorial/ziti_echo_client.go +++ b/ziti/cmd/tutorial/ziti_echo_client.go @@ -21,7 +21,6 @@ import ( "fmt" "github.com/fatih/color" "github.com/openziti/sdk-golang/ziti" - "github.com/openziti/sdk-golang/ziti/config" "io" "net" "net/http" @@ -31,12 +30,16 @@ import ( ) func NewZitiEchoClient(identityJson string) (*zitiEchoClient, error) { - config, err := config.NewFromFile(identityJson) + config, err := ziti.NewConfigFromFile(identityJson) if err != nil { return nil, err } - zitiContext := ziti.NewContextWithConfig(config) + zitiContext, err := ziti.NewContext(config) + + if err != nil { + return nil, err + } dial := func(_ context.Context, _ string, addr string) (net.Conn, error) { service := strings.Split(addr, ":")[0] // assume host is service diff --git a/ziti/cmd/tutorial/ziti_echo_server.go b/ziti/cmd/tutorial/ziti_echo_server.go index a5d451e10..aa786d048 100644 --- a/ziti/cmd/tutorial/ziti_echo_server.go +++ b/ziti/cmd/tutorial/ziti_echo_server.go @@ -23,7 +23,6 @@ import ( "github.com/fatih/color" "github.com/openziti/sdk-golang/ziti" - "github.com/openziti/sdk-golang/ziti/config" ) type zitiEchoServer struct { @@ -43,12 +42,17 @@ func (s *zitiEchoServer) ServeHTTP(rw http.ResponseWriter, r *http.Request) { } func (s *zitiEchoServer) run() (err error) { - config, err := config.NewFromFile(s.identityJson) + config, err := ziti.NewConfigFromFile(s.identityJson) if err != nil { return err } - zitiContext := ziti.NewContextWithConfig(config) + zitiContext, err := ziti.NewContext(config) + + if err != nil { + panic(err) + } + if s.listener, err = zitiContext.Listen("echo"); err != nil { return err } diff --git a/ziti/controller/delete_sessions.go b/ziti/controller/delete_sessions.go index 6524f99c9..880eab39e 100644 --- a/ziti/controller/delete_sessions.go +++ b/ziti/controller/delete_sessions.go @@ -181,9 +181,9 @@ func deleteSessions(db boltz.Db) { pfxlog.Logger().Errorf("could not read databse stats: %v", err) } - err = db.Update(func(tx *bbolt.Tx) error { + err = db.Update(nil, func(ctx boltz.MutateContext) error { - root := tx.Bucket([]byte("ziti")) + root := ctx.Tx().Bucket([]byte("ziti")) if root == nil { return errors.New("root 'ziti' bucket not found") diff --git a/ziti/router/enrollgw.go b/ziti/router/enrollgw.go index 58b39b062..fd0175ff4 100644 --- a/ziti/router/enrollgw.go +++ b/ziti/router/enrollgw.go @@ -20,14 +20,14 @@ import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/edge/router/enroll" "github.com/openziti/fabric/router" - "github.com/openziti/sdk-golang/ziti/config" + "github.com/openziti/sdk-golang/ziti" "github.com/spf13/cobra" "io/ioutil" ) var jwtPath *string var engine *string -var keyAlg config.KeyAlgVar +var keyAlg ziti.KeyAlgVar func NewEnrollGwCmd() *cobra.Command { var enrollEdgeRouterCmd = &cobra.Command{ diff --git a/ziti/tunnel/root.go b/ziti/tunnel/root.go index 5b0291f96..9716915d5 100644 --- a/ziti/tunnel/root.go +++ b/ziti/tunnel/root.go @@ -17,6 +17,7 @@ package tunnel import ( + "github.com/openziti/sdk-golang/ziti/sdkinfo" "github.com/openziti/ziti/ziti/cmd/common" "github.com/openziti/ziti/ziti/constants" "github.com/openziti/ziti/ziti/util" @@ -31,7 +32,6 @@ import ( "github.com/openziti/edge/tunnel/entities" "github.com/openziti/edge/tunnel/intercept" "github.com/openziti/sdk-golang/ziti" - "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/ziti/common/enrollment" "github.com/openziti/ziti/common/version" "github.com/sirupsen/logrus" @@ -124,7 +124,7 @@ func rootPostRun(cmd *cobra.Command, _ []string) { } } - ziti.SetApplication("ziti-tunnel", version.GetVersion()) + sdkinfo.SetApplication("ziti-tunnel", version.GetVersion()) resolverConfig := cmd.Flag(resolverCfgFlag).Value.String() resolver := dns.NewResolver(resolverConfig) @@ -167,7 +167,7 @@ func startIdentity(cmd *cobra.Command, serviceListenerGroup *intercept.ServiceLi log := pfxlog.Logger() log.Infof("loading identity: %v", identityJson) - zitiCfg, err := config.NewFromFile(identityJson) + zitiCfg, err := ziti.NewConfigFromFile(identityJson) if err != nil { log.Fatalf("failed to load ziti configuration from %s: %v", identityJson, err) } @@ -190,7 +190,11 @@ func startIdentity(cmd *cobra.Command, serviceListenerGroup *intercept.ServiceLi OnServiceUpdate: serviceListener.HandleServicesChange, } - rootPrivateContext := ziti.NewContextWithOpts(zitiCfg, options) + rootPrivateContext, err := ziti.NewContextWithOpts(zitiCfg, options) + + if err != nil { + pfxlog.Logger().WithError(err).Fatal("could not create ziti sdk context") + } for { if err = rootPrivateContext.Authenticate(); err != nil { diff --git a/ziti/util/identities.go b/ziti/util/identities.go index 56d0ea940..22d233359 100644 --- a/ziti/util/identities.go +++ b/ziti/util/identities.go @@ -7,9 +7,9 @@ import ( "fmt" httptransport "github.com/go-openapi/runtime/client" "github.com/openziti/edge-api/rest_management_api_client" + "github.com/openziti/edge/controller/env" fabric_rest_client "github.com/openziti/fabric/rest_client" "github.com/openziti/identity" - "github.com/openziti/sdk-golang/ziti/constants" "github.com/openziti/ziti/ziti/cmd/common" "github.com/pkg/errors" "gopkg.in/resty.v1" @@ -113,7 +113,7 @@ func (self *RestClientEdgeIdentity) NewClient(timeout time.Duration, verbose boo func (self *RestClientEdgeIdentity) NewRequest(client *resty.Client) *resty.Request { r := client.R() - r.SetHeader(constants.ZitiSession, self.Token) + r.SetHeader(env.ZitiSession, self.Token) return r } @@ -173,7 +173,7 @@ func (self *RestClientEdgeIdentity) NewFabricManagementClient(clientOpts ClientO func (self *RestClientEdgeIdentity) NewWsHeader() http.Header { result := http.Header{} - result.Set(constants.ZitiSession, self.Token) + result.Set(env.ZitiSession, self.Token) return result }