From 7444e1df3a69fc217fd500d1a957219643099e75 Mon Sep 17 00:00:00 2001 From: Henrique Santos Date: Mon, 19 Feb 2024 11:00:29 +0000 Subject: [PATCH 1/4] Re-add JWKSCustomUrl --- core/config/config.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/core/config/config.go b/core/config/config.go index 0bc18a910..9b96b703c 100644 --- a/core/config/config.go +++ b/core/config/config.go @@ -78,12 +78,14 @@ type Configuration struct { PrivateKeyPath string `json:"privateKeyPath,omitempty"` CredentialsFilePath string `json:"credentialsFilePath,omitempty"` TokenCustomUrl string `json:"tokenCustomUrl,omitempty"` - Region string `json:"region,omitempty"` - CustomAuth http.RoundTripper - Servers ServerConfigurations - OperationServers map[string]ServerConfigurations - HTTPClient *http.Client - RetryOptions *clients.RetryConfig + // Deprecated: validation using JWKS was removed, for being redundant with token validation done in the APIs. This option has no effect, and will be removed in a later update + JWKSCustomUrl string `json:"jwksCustomUrl,omitempty"` + Region string `json:"region,omitempty"` + CustomAuth http.RoundTripper + Servers ServerConfigurations + OperationServers map[string]ServerConfigurations + HTTPClient *http.Client + RetryOptions *clients.RetryConfig setCustomEndpoint bool } From 93b9bace2f104918189bbf256c98ea634f659234 Mon Sep 17 00:00:00 2001 From: Henrique Santos Date: Mon, 19 Feb 2024 11:07:20 +0000 Subject: [PATCH 2/4] Fix comment --- core/config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/config/config.go b/core/config/config.go index 9b96b703c..19b4e3442 100644 --- a/core/config/config.go +++ b/core/config/config.go @@ -78,7 +78,7 @@ type Configuration struct { PrivateKeyPath string `json:"privateKeyPath,omitempty"` CredentialsFilePath string `json:"credentialsFilePath,omitempty"` TokenCustomUrl string `json:"tokenCustomUrl,omitempty"` - // Deprecated: validation using JWKS was removed, for being redundant with token validation done in the APIs. This option has no effect, and will be removed in a later update + // Deprecated: validation using JWKS was removed, for being redundant with token validation done in the APIs. This field has no effect, and will be removed in a later update JWKSCustomUrl string `json:"jwksCustomUrl,omitempty"` Region string `json:"region,omitempty"` CustomAuth http.RoundTripper From efb09d464da2ff1459a913a4b49527ec86b3866b Mon Sep 17 00:00:00 2001 From: Henrique Santos Date: Mon, 19 Feb 2024 11:07:26 +0000 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 2 +- core/CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bd80c01e..04516c203 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - **Feature:** Add package `runtime`, which implements methods to be used when performing API requests. - **Feature:** Add method `WithCaptureHTTPResponse` to package `runtime`, which does the same as `config.WithCaptureHTTPResponse`. Method was moved to avoid confusion due to it not being a configuration option, and will be removed in a later release. - **Deprecation:** Mark method `config.WithCaptureHTTPResponse` as deprecated, to avoid confusion due to it not being a configuration option. Use `runtime.WithCaptureHTTPResponse` instead. -- **Deprecation:** Mark method `config.WithJWKSEndpoint` as deprecated. Validation using JWKS was removed, for being redundant with token validation done in the APIs. This option has no effect. +- **Deprecation:** Mark method `config.WithJWKSEndpoint` and field `config.Configuration.JWKSCustomUrl` as deprecated. Validation using JWKS was removed, for being redundant with token validation done in the APIs. These have no effect. - **Breaking Change:** Remove method `KeyFlow.Clone`, that was no longer being used. ## Release (2024-02-07) diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index 8990d64d7..6c3b7f8a8 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -1,7 +1,7 @@ ## v0.9.0 (YYYY-MM-DD) - **Deprecation:** Mark method `config.WithCaptureHTTPResponse` as deprecated, to avoid confusion due to it not being a configuration option. Use `runtime.WithCaptureHTTPResponse` instead. -- **Deprecation:** Mark method `config.WithJWKSEndpoint` as deprecated. Validation using JWKS was removed, for being redundant with token validation done in the APIs. This option has no effect. +- **Deprecation:** Mark method `config.WithJWKSEndpoint` and field `config.Configuration.JWKSCustomUrl` as deprecated. Validation using JWKS was removed, for being redundant with token validation done in the APIs. These have no effect. - **Breaking Change:** Remove method `KeyFlow.Clone`, that was no longer being used. ## v0.8.0 (2024-02-16) From e63dcd28dbb16a48149f5680406e53674927cfa9 Mon Sep 17 00:00:00 2001 From: Henrique Santos Date: Mon, 19 Feb 2024 11:16:52 +0000 Subject: [PATCH 4/4] Reorder fields --- core/config/config.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/core/config/config.go b/core/config/config.go index 19b4e3442..c490ddcae 100644 --- a/core/config/config.go +++ b/core/config/config.go @@ -78,14 +78,15 @@ type Configuration struct { PrivateKeyPath string `json:"privateKeyPath,omitempty"` CredentialsFilePath string `json:"credentialsFilePath,omitempty"` TokenCustomUrl string `json:"tokenCustomUrl,omitempty"` + Region string `json:"region,omitempty"` + CustomAuth http.RoundTripper + Servers ServerConfigurations + OperationServers map[string]ServerConfigurations + HTTPClient *http.Client + RetryOptions *clients.RetryConfig + // Deprecated: validation using JWKS was removed, for being redundant with token validation done in the APIs. This field has no effect, and will be removed in a later update - JWKSCustomUrl string `json:"jwksCustomUrl,omitempty"` - Region string `json:"region,omitempty"` - CustomAuth http.RoundTripper - Servers ServerConfigurations - OperationServers map[string]ServerConfigurations - HTTPClient *http.Client - RetryOptions *clients.RetryConfig + JWKSCustomUrl string `json:"jwksCustomUrl,omitempty"` setCustomEndpoint bool }