Changelog updates for release (#3803)

* Changelog updates for relelase

* Update with API version

* quick update

sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release History
 
-## 4.1.0-beta.1 (Unreleased)
+## 4.1.0-beta.1 (2022-07-07)
 
 ### Features Added
 
@@ -8,7 +8,7 @@
 
 ### Breaking Changes
 
-- Removed ServiceVersion type, replaced with Version field in the CertificateClientOptions type.
+- Removed ServiceVersion type, replaced with ApiVersion field in the CertificateClientOptions type.
 
 ## 4.0.0 (2022-06-07)
 

sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_options.hpp

@@ -28,13 +28,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Certificat
      * @brief Service Version used.
      *
      */
-    std::string Version;
+    const std::string ApiVersion{"7.3"};
-
-    /**
-     * @brief Construct a new Certificate Client Options object.
-     *
-     */
-    CertificateClientOptions() : Azure::Core::_internal::ClientOptions() { Version = "7.3"; }
   };
 
 }}}} // namespace Azure::Security::KeyVault::Certificates

sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client.cpp

@@ -66,9 +66,9 @@ CertificateClient::CertificateClient(
     std::string const& vaultUrl,
     std::shared_ptr<Core::Credentials::TokenCredential const> credential,
     CertificateClientOptions options)
-    : m_vaultUrl(vaultUrl), m_apiVersion(options.Version)
+    : m_vaultUrl(vaultUrl), m_apiVersion(options.ApiVersion)
 {
-  auto apiVersion = options.Version;
+  auto apiVersion = options.ApiVersion;
 
   std::vector<std::unique_ptr<HttpPolicy>> perRetrypolicies;
   {

sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp

@@ -893,17 +893,8 @@ TEST_F(KeyVaultCertificateClientTest, ServiceVersion)
 {
   auto credential
       = std::make_shared<Azure::Identity::ClientSecretCredential>("tenantID", "AppId", "SecretId");
-  {
+  // 7.3
-    // 7.3
+  EXPECT_NO_THROW(auto options = CertificateClientOptions(); CertificateClient certificateClient(
-    EXPECT_NO_THROW(auto options = CertificateClientOptions(); CertificateClient certificateClient(
+                      "http://account.vault.azure.net", credential, options);
-                        "http://account.vault.azure.net", credential, options);
+                  EXPECT_EQ(options.ApiVersion, "7.3"););
-                    EXPECT_EQ(options.Version, "7.3"););
-  }
-  {
-    // arbitrary version
-    EXPECT_NO_THROW(
-        auto options = CertificateClientOptions(); options.Version = "1.0";
-        CertificateClient certificateClient("http://account.vault.azure.net", credential, options);
-        EXPECT_EQ(options.Version, "1.0"););
-  }
 }

sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release History
 
-## 4.3.0-beta.1 (Unreleased)
+## 4.3.0-beta.1 (2022-07-07)
 
 ### Features Added
 
@@ -8,7 +8,7 @@
 
 ### Breaking Changes
 
-- Removed ServiceVersion type, replaced with Version field in the KeyClientOptions type.
+- Removed ServiceVersion type, replaced with ApiVersion field in the KeyClientOptions type.
 
 
 ## 4.2.0 (2021-10-05)

sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp

@@ -53,13 +53,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
      * @brief Service Version used.
      *
      */
-    std::string Version;
+    const std::string ApiVersion{"7.3"};
-
-    /**
-     * @brief Construct a new Key Client Options object.
-     *
-     */
-    KeyClientOptions() : Azure::Core::_internal::ClientOptions() { Version = "7.3"; }
   };
 
   /**

sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp

@@ -68,7 +68,7 @@ KeyClient::KeyClient(
     std::string const& vaultUrl,
     std::shared_ptr<Core::Credentials::TokenCredential const> credential,
     KeyClientOptions options)
-    : m_vaultUrl(vaultUrl), m_apiVersion(options.Version)
+    : m_vaultUrl(vaultUrl), m_apiVersion(options.ApiVersion)
 {
   std::vector<std::unique_ptr<HttpPolicy>> perRetrypolicies;
   {

sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp

@@ -32,18 +32,10 @@ TEST(KeyVaultKeyClientUnitTest, ServiceVersion)
 {
   auto credential
       = std::make_shared<Azure::Identity::ClientSecretCredential>("tenantID", "AppId", "SecretId");
-  {
+  // 7.3
-    // 7.3
+  EXPECT_NO_THROW(auto options = KeyClientOptions();
-    EXPECT_NO_THROW(auto options = KeyClientOptions();
+                  KeyClient keyClient("http://account.vault.azure.net", credential, options);
-                    KeyClient keyClient("http://account.vault.azure.net", credential, options);
+                  EXPECT_EQ(options.ApiVersion, "7.3"););
-                    EXPECT_EQ(options.Version, "7.3"););
-  }
-  {
-    // arbitrary version
-    EXPECT_NO_THROW(auto options = KeyClientOptions(); options.Version = "1.0";
-                    KeyClient keyClient("http://account.vault.azure.net", credential, options);
-                    EXPECT_EQ(options.Version, "1.0"););
-  }
 }
 
 TEST(KeyVaultKeyClientUnitTest, GetUrl)

sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release History
 
-## 4.1.0-beta.1 (Unreleased)
+## 4.1.0-beta.1 (2022-07-07)
 
 ### Features Added
 
@@ -8,7 +8,7 @@
 
 ### Breaking Changes
 
-- Removed ServiceVersion type, replaced with Version field in the SecretClientOptions type.
+- Removed ServiceVersion type, replaced with ApiVersion field in the SecretClientOptions type.
 
 ## 4.0.0 (2022-06-07)
 

sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_options.hpp

@@ -21,13 +21,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Secrets {
      * @brief Service Version used.
      *
      */
-    std::string Version;
+    const std::string ApiVersion{"7.3"};
-
-    /**
-     * @brief Construct a new Secret Client Options object.
-     *
-     */
-    SecretClientOptions() : Azure::Core::_internal::ClientOptions() { Version = "7.3"; }
   };
 
   /**

sdk/keyvault/azure-security-keyvault-secrets/src/secret_client.cpp

@@ -61,9 +61,9 @@ SecretClient::SecretClient(
     std::string const& vaultUrl,
     std::shared_ptr<Core::Credentials::TokenCredential const> credential,
     SecretClientOptions options)
-    : m_vaultUrl(vaultUrl), m_apiVersion(options.Version)
+    : m_vaultUrl(vaultUrl), m_apiVersion(options.ApiVersion)
 {
-  auto apiVersion = options.Version;
+  auto apiVersion = options.ApiVersion;
   Azure::Core::Url url(vaultUrl);
 
   std::vector<std::unique_ptr<HttpPolicy>> perRetrypolicies;

sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_test.cpp

@@ -28,19 +28,10 @@ TEST(SecretClient, ServiceVersion)
 {
   auto credential
       = std::make_shared<Azure::Identity::ClientSecretCredential>("tenantID", "AppId", "SecretId");
-  {
+  // 7.3
-    // 7.3
+  EXPECT_NO_THROW(auto options = SecretClientOptions();
-    EXPECT_NO_THROW(auto options = SecretClientOptions(); SecretClient SecretClient(
+                  SecretClient SecretClient("http://account.vault.azure.net", credential, options);
-                        "http://account.vault.azure.net", credential, options);
+                  EXPECT_EQ(options.ApiVersion, "7.3"););
-                    EXPECT_EQ(options.Version, "7.3"););
-  }
-  {
-    // arbitrary version
-    EXPECT_NO_THROW(
-        auto options = SecretClientOptions(); options.Version = "1.0";
-        SecretClient secretClient("http://account.vault.azure.net", credential, options);
-        EXPECT_EQ(options.Version, "1.0"););
-  }
 }
 
 TEST(SecretClient, GetUrl)