Skip to content

Commit f853cab

Browse files
authored
Merge pull request #603 from openziti/fix-config-types-on-svc-list
Only send config types on service list if controller version supports it. Fixes #601
2 parents fc6c107 + b9ad1eb commit f853cab

File tree

7 files changed

+241
-249
lines changed

7 files changed

+241
-249
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# Release notes 0.23.40
2+
3+
## Issues Fixed and Dependency Updates
4+
5+
* github.com/openziti/sdk-golang: [v0.23.39 -> v0.23.40](https://github.com/openziti/sdk-golang/compare/v0.23.39...v0.23.40)
6+
* [Issue #601](https://github.com/openziti/sdk-golang/issues/601) - Only send config types on service list if controller version supports it
7+
8+
* github.com/openziti/edge-api: [v0.26.21 -> v0.26.23](https://github.com/openziti/edge-api/compare/v0.26.21...v0.26.23)
9+
* [Issue #120](https://github.com/openziti/edge-api/issues/120) - Add API for retrieving services referencing a config
10+
* [Issue #121](https://github.com/openziti/edge-api/issues/121) - Add API for retrieving the set of attribute roles used by posture checks
11+
112
# Release notes 0.23.39
213

314
## Issues Fixed and Dependency Updates

RELEASING.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# How to release the OpenZiti SDK for Go
2+
3+
As part of your PR, do the following:
4+
5+
* Make sure the buildinfo is up to date using:
6+
* `ziti-ci update-sdk-build-info`
7+
* This will update the version number in the code
8+
* Make sure the release notes are up to date using:
9+
* `ziti-ci build-sdk-release-notes`
10+
* This will emit the standard release notes to stdout. The release notes can be copied into the CHANGELOG.md and edited as necessary
11+
12+
Once your PR is merged and you wish to do a release:
13+
14+
1. Make sure you're on main and have the latest code
15+
1. `git checkout main`
16+
1. `git pull`
17+
1. Tag the release
18+
1. `git tag -s <version number> -m "Release <version number>"`
19+
1. Push the tag: `git push origin <version number>`

example/go.mod

Lines changed: 48 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
module github.com/openziti/sdk-golang/example
22

3-
go 1.19
3+
go 1.21
4+
5+
toolchain go1.22.1
46

57
require (
68
github.com/Jeffail/gabs v1.4.0
7-
github.com/google/uuid v1.4.0
8-
github.com/gorilla/mux v1.8.0
9+
github.com/google/uuid v1.6.0
10+
github.com/gorilla/mux v1.8.1
911
github.com/michaelquigley/pfxlog v0.6.10
10-
github.com/openziti/foundation/v2 v2.0.33
12+
github.com/openziti/foundation/v2 v2.0.47
1113
github.com/openziti/runzmd v1.0.33
12-
github.com/openziti/sdk-golang v0.20.129
14+
github.com/openziti/sdk-golang v0.23.39
1315
github.com/pkg/errors v0.9.1
1416
github.com/sirupsen/logrus v1.9.3
1517
github.com/spf13/cobra v1.8.0
1618
github.com/spf13/viper v1.17.0
1719
github.com/zitadel/oidc v1.13.5
18-
golang.org/x/text v0.14.0
20+
golang.org/x/text v0.16.0
1921
google.golang.org/grpc v1.59.0
2022
google.golang.org/grpc/examples v0.0.0-20231107231549-482de2224942
2123
gopkg.in/resty.v1 v1.12.0
@@ -28,30 +30,31 @@ require (
2830
github.com/MichaelMure/go-term-text v0.3.1 // indirect
2931
github.com/alecthomas/chroma v0.10.0 // indirect
3032
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
31-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
33+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3234
github.com/disintegration/imaging v1.6.2 // indirect
3335
github.com/dlclark/regexp2 v1.10.0 // indirect
3436
github.com/eliukblau/pixterm/pkg/ansimage v0.0.0-20191210081756-9fb6cf8c2f75 // indirect
3537
github.com/fatih/color v1.16.0 // indirect
3638
github.com/fsnotify/fsnotify v1.7.0 // indirect
3739
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect
38-
github.com/go-logr/logr v1.3.0 // indirect
40+
github.com/go-logr/logr v1.4.2 // indirect
3941
github.com/go-logr/stdr v1.2.2 // indirect
4042
github.com/go-ole/go-ole v1.3.0 // indirect
41-
github.com/go-openapi/analysis v0.21.4 // indirect
42-
github.com/go-openapi/errors v0.20.4 // indirect
43-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
44-
github.com/go-openapi/jsonreference v0.20.2 // indirect
45-
github.com/go-openapi/loads v0.21.2 // indirect
46-
github.com/go-openapi/runtime v0.26.0 // indirect
47-
github.com/go-openapi/spec v0.20.9 // indirect
48-
github.com/go-openapi/strfmt v0.21.7 // indirect
49-
github.com/go-openapi/swag v0.22.4 // indirect
50-
github.com/go-openapi/validate v0.22.1 // indirect
51-
github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
52-
github.com/golang/protobuf v1.5.3 // indirect
43+
github.com/go-openapi/analysis v0.23.0 // indirect
44+
github.com/go-openapi/errors v0.22.0 // indirect
45+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
46+
github.com/go-openapi/jsonreference v0.21.0 // indirect
47+
github.com/go-openapi/loads v0.22.0 // indirect
48+
github.com/go-openapi/runtime v0.28.0 // indirect
49+
github.com/go-openapi/spec v0.21.0 // indirect
50+
github.com/go-openapi/strfmt v0.23.0 // indirect
51+
github.com/go-openapi/swag v0.23.0 // indirect
52+
github.com/go-openapi/validate v0.24.0 // indirect
53+
github.com/go-resty/resty/v2 v2.13.1 // indirect
54+
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
55+
github.com/golang/protobuf v1.5.4 // indirect
5356
github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386 // indirect
54-
github.com/gorilla/schema v1.2.0 // indirect
57+
github.com/gorilla/schema v1.4.1 // indirect
5558
github.com/gorilla/securecookie v1.1.1 // indirect
5659
github.com/gorilla/websocket v1.5.1 // indirect
5760
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -70,24 +73,25 @@ require (
7073
github.com/miekg/pkcs11 v1.1.1 // indirect
7174
github.com/mitchellh/go-ps v1.0.0 // indirect
7275
github.com/mitchellh/mapstructure v1.5.0 // indirect
76+
github.com/muhlemmer/gu v0.3.1 // indirect
7377
github.com/oklog/ulid v1.3.1 // indirect
7478
github.com/opentracing/opentracing-go v1.2.0 // indirect
75-
github.com/openziti/channel/v2 v2.0.105 // indirect
76-
github.com/openziti/edge-api v0.26.0 // indirect
77-
github.com/openziti/identity v1.0.66 // indirect
78-
github.com/openziti/metrics v1.2.37 // indirect
79-
github.com/openziti/secretstream v0.1.13 // indirect
80-
github.com/openziti/transport/v2 v2.0.113 // indirect
79+
github.com/openziti/channel/v2 v2.0.136 // indirect
80+
github.com/openziti/edge-api v0.26.21 // indirect
81+
github.com/openziti/identity v1.0.81 // indirect
82+
github.com/openziti/metrics v1.2.56 // indirect
83+
github.com/openziti/secretstream v0.1.21 // indirect
84+
github.com/openziti/transport/v2 v2.0.138 // indirect
8185
github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect
8286
github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 // indirect
8387
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
8488
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
8589
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
8690
github.com/rivo/uniseg v0.4.4 // indirect
87-
github.com/rs/cors v1.10.1 // indirect
91+
github.com/rs/cors v1.11.0 // indirect
8892
github.com/sagikazarmark/locafero v0.3.0 // indirect
8993
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
90-
github.com/shirou/gopsutil/v3 v3.23.10 // indirect
94+
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
9195
github.com/shoenig/go-m1cpu v0.1.6 // indirect
9296
github.com/sourcegraph/conc v0.3.0 // indirect
9397
github.com/speps/go-hashids v2.0.0+incompatible // indirect
@@ -99,26 +103,26 @@ require (
99103
github.com/tklauser/numcpus v0.6.1 // indirect
100104
github.com/valyala/bytebufferpool v1.0.0 // indirect
101105
github.com/valyala/fasttemplate v1.2.2 // indirect
102-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
106+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
103107
github.com/zitadel/logging v0.3.4 // indirect
104-
go.mongodb.org/mongo-driver v1.13.0 // indirect
108+
github.com/zitadel/oidc/v2 v2.12.0 // indirect
109+
go.mongodb.org/mongo-driver v1.16.0 // indirect
105110
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
106-
go.opentelemetry.io/otel v1.19.0 // indirect
107-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
108-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
111+
go.opentelemetry.io/otel v1.28.0 // indirect
112+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
113+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
109114
go.uber.org/multierr v1.11.0 // indirect
110-
golang.org/x/crypto v0.21.0 // indirect
115+
golang.org/x/crypto v0.25.0 // indirect
111116
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
112-
golang.org/x/image v0.14.0 // indirect
113-
golang.org/x/net v0.23.0 // indirect
114-
golang.org/x/oauth2 v0.13.0 // indirect
115-
golang.org/x/sys v0.18.0 // indirect
116-
golang.org/x/term v0.18.0 // indirect
117-
google.golang.org/appengine v1.6.8 // indirect
117+
golang.org/x/image v0.18.0 // indirect
118+
golang.org/x/net v0.27.0 // indirect
119+
golang.org/x/oauth2 v0.21.0 // indirect
120+
golang.org/x/sync v0.7.0 // indirect
121+
golang.org/x/sys v0.22.0 // indirect
122+
golang.org/x/term v0.22.0 // indirect
118123
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
119-
google.golang.org/protobuf v1.33.0 // indirect
124+
google.golang.org/protobuf v1.34.2 // indirect
120125
gopkg.in/ini.v1 v1.67.0 // indirect
121-
gopkg.in/yaml.v2 v2.4.0 // indirect
122126
gopkg.in/yaml.v3 v3.0.1 // indirect
123-
nhooyr.io/websocket v1.8.10 // indirect
127+
nhooyr.io/websocket v1.8.11 // indirect
124128
)

0 commit comments

Comments
 (0)