From 57a4f8de9a8357ecd4fd9c0de0f67bc7d01b2fcd Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahson_ahmedk@yahoo.com>
Date: Wed, 29 Mar 2023 17:36:44 -0700
Subject: [PATCH] Fixed the user-agent string sent to the service to include
 the "keys" suffix in the value, when using `CryptographyClient`. (#4467)

* Fixed the user-agent string sent to the service to include the "keys"
suffix in the value, when using `CryptographyClient`.

* Fix clang format.
---
 sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md          | 2 ++
 .../src/cryptography/cryptography_client.cpp                    | 2 +-
 sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp    | 1 -
 .../azure-security-keyvault-keys/src/private/key_constants.hpp  | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
index e5fb3a3b2..7c2be54c1 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
+++ b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+- [3366](https://github.com/Azure/azure-sdk-for-cpp/issues/4466) Fixed the user-agent string sent to the service to include the "keys" suffix in the value, when using `CryptographyClient`.
+
 ### Other Changes
 
 ## 4.3.0 (2022-10-11)
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/cryptography_client.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/cryptography_client.cpp
index 435d1ffc4..65cef9a6b 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/cryptography_client.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/cryptography_client.cpp
@@ -111,7 +111,7 @@ CryptographyClient::CryptographyClient(
 
   m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
       options,
-      "KeyVault",
+      KeyVaultServicePackageName,
       PackageVersion::ToString(),
       std::move(perRetrypolicies),
       std::move(perCallpolicies));
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
index fda932f13..f1af0dc03 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
@@ -29,7 +29,6 @@ using namespace Azure::Core::Http::Policies::_internal;
 using namespace Azure::Core::Http::_internal;
 
 namespace {
-constexpr static const char KeyVaultServicePackageName[] = "keyvault-keys";
 constexpr static const char CreateValue[] = "create";
 } // namespace
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_constants.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_constants.hpp
index a40ecce22..85a8dd3a1 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_constants.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_constants.hpp
@@ -10,6 +10,8 @@
 #pragma once
 
 namespace Azure { namespace Security { namespace KeyVault { namespace Keys { namespace _detail {
+  constexpr static const char KeyVaultServicePackageName[] = "keyvault-keys";
+
   /***************** KeyVault Key *****************/
   constexpr static const char KeyPropertyName[] = "key";