Backport of Remove warning for consul 1.17 deprecation into release/1…

….15.x (#19903) backport of commit 8d43647 Co-authored-by: Ronald Ekambi <ronekambi@gmail.com>
hashicorp · Dec 12, 2023 · 2c6d620 · 2c6d620
1 parent ff25f83
commit 2c6d620
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/agent/http.go b/agent/http.go
@@ -374,7 +374,7 @@ func (s *HTTPHandlers) wrap(handler endpoint, methods []string) http.HandlerFunc
 				logURL = strings.Replace(logURL, token, "<hidden>", -1)
 			}
 			httpLogger.Warn("This request used the token query parameter "+
-				"which is deprecated and will be removed in Consul 1.17",
+				"which is deprecated and will be removed in a future Consul version",
 				"logUrl", logURL)
 		}
 		logURL = aclEndpointRE.ReplaceAllString(logURL, "$1<hidden>$4")

diff --git a/website/content/api-docs/api-structure.mdx b/website/content/api-docs/api-structure.mdx
@@ -42,7 +42,7 @@ $ curl \
 
 **Security Note:** Though you could pass the token through the `?token=` query parameter,
 this method is highly discouraged because the token can show up in access logs as part of the URL. 
-The `?token=` query parameter is deprecated and will be removed in Consul 1.17.
+The `?token=` query parameter is deprecated and will be removed in a future Consul version.
 
 To learn more about the ACL system read the [documentation](/consul/docs/security/acl).
 

diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx
@@ -43,13 +43,13 @@ The `connect.enable_serverless_plugin` configuration option was removed. Lambda
 
 #### Deprecating authentication via token query parameter
 
-Providing a Consul ACL token in API requests using the `token` query parameter is deprecated and will be removed in Consul 1.17.
+Providing a Consul ACL token in API requests using the `token` query parameter is deprecated and will be removed in a future Consul version.
 Instead, you should provide the token through the `X-Consul-Token` header or with the Bearer scheme in the authorization header as described in the [API authentication documentation](/consul/api-docs/api-structure#authentication).
 
 Check whether you are using a `token` query parameter by searching your Consul agent logs for the message:
 
 ```shell-session hideClipboard
-$ This request used the token query parameter which is deprecated and will be removed in Consul 1.17
+$ This request used the token query parameter which is deprecated and will be removed in a future Consul version
 ```
 
 Deprecated authentication using the `token` query parameter: