Update all-inclusive headers, and CMakeFiles for including all headers (

Azure#3640)
LarryOsterman · May 23, 2022 · 23e48e9 · 23e48e9
1 parent 614ad22
commit 23e48e9
Show file tree

Hide file tree

Showing 60 changed files with 174 additions and 105 deletions.
diff --git a/samples/integration/vcpkg-all-smoke/src/main.cpp b/samples/integration/vcpkg-all-smoke/src/main.cpp
@@ -10,9 +10,9 @@
 #include <azure/attestation.hpp>
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_certificates.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
-#include <azure/keyvault/keyvault_secrets.hpp>
+#include <azure/keyvault/certificates.hpp>
+#include <azure/keyvault/keys.hpp>
+#include <azure/keyvault/secrets.hpp>
 #include <azure/storage/blobs.hpp>
 #include <azure/storage/files/datalake.hpp>
 #include <azure/storage/files/shares.hpp>
@@ -67,10 +67,11 @@ int main()
     ShareLeaseClient shareLeaseClient(shareFileClient, leaseID);
     ShareServiceClient shareServiceClient(smokeUrl);
 
-    //Attestation 
+    // Attestation
     std::cout << "Creating Attestation Clients" << std::endl;
     AttestationClient attestationClient(AttestationClient::Create(smokeUrl));
-    AttestationAdministrationClient attestationAdminClient(AttestationAdministrationClient::Create(smokeUrl, credential));
+    AttestationAdministrationClient attestationAdminClient(
+        AttestationAdministrationClient::Create(smokeUrl, credential));
 
     std::cout << "Successfully Created the Clients" << std::endl;
   }

diff --git a/samples/integration/vcpkg-keyvault/src/main.cpp b/samples/integration/vcpkg-keyvault/src/main.cpp
@@ -17,7 +17,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/keyvault/keys.hpp>
 
 #include <chrono>
 #include <iostream>

diff --git a/sdk/attestation/azure-security-attestation/CMakeLists.txt b/sdk/attestation/azure-security-attestation/CMakeLists.txt
@@ -31,38 +31,38 @@ find_package(OpenSSL REQUIRED)
 
 set(
   AZURE_ATTESTATION_HEADER
-    inc/azure/attestation/dll_import_export.hpp
-    inc/azure/attestation/attestation_client.hpp
     inc/azure/attestation/attestation_administration_client.hpp
-    inc/azure/attestation.hpp
+    inc/azure/attestation/attestation_client.hpp
     inc/azure/attestation/attestation_client_models.hpp
     inc/azure/attestation/attestation_client_options.hpp
-
-    src/private/package_version.hpp
-    src/private/attestation_common_request.hpp
-    src/private/attestation_deserializers_private.hpp
-
-    src/private/attestation_client_models_private.hpp
-    src/private/crypto/inc/crypto.hpp
-
-    src/private/attestation_client_private.hpp)
+    inc/azure/attestation/dll_import_export.hpp
+    inc/azure/attestation/rtti.hpp
+    inc/azure/attestation.hpp
+)
 
 set(
   AZURE_ATTESTATION_SOURCE
-    src/attestation_client.cpp
-    src/attestation_administration_client.cpp
-    src/attestation_client_options.cpp
+    src/private/crypto/inc/crypto.hpp
+    src/private/crypto/openssl/openssl_helpers.hpp
+    src/private/crypto/openssl/opensslcert.cpp
+    src/private/crypto/openssl/opensslcert.hpp
+    src/private/crypto/openssl/opensslcrypto.cpp
+    src/private/crypto/openssl/opensslkeys.cpp
+    src/private/crypto/openssl/opensslkeys.hpp
+    src/private/attestation_client_models_private.hpp
+    src/private/attestation_client_private.cpp
+    src/private/attestation_client_private.hpp
     src/private/attestation_common_request.cpp
+    src/private/attestation_common_request.hpp
     src/private/attestation_deserializers_private.cpp
+    src/private/attestation_deserializers_private.hpp
     src/private/jsonhelpers.cpp
-    src/private/attestation_client_private.cpp)
-
-set(
-    AZURE_ATTESTATION_SOURCE
-    ${AZURE_ATTESTATION_SOURCE}
-    src/private/crypto/openssl/opensslcrypto.cpp
-    src/private/crypto/openssl/opensslkeys.cpp
-    src/private/crypto/openssl/opensslcert.cpp)
+    src/private/jsonhelpers_private.hpp
+    src/private/package_version.hpp
+    src/attestation_administration_client.cpp
+    src/attestation_client.cpp
+    src/attestation_client_options.cpp
+)
 
 add_library(azure-security-attestation ${AZURE_ATTESTATION_HEADER} ${AZURE_ATTESTATION_SOURCE})
 

diff --git a/sdk/attestation/azure-security-attestation/inc/azure/attestation.hpp b/sdk/attestation/azure-security-attestation/inc/azure/attestation.hpp
@@ -10,4 +10,7 @@
 
 #include "attestation/attestation_administration_client.hpp"
 #include "attestation/attestation_client.hpp"
+#include "attestation/attestation_client_models.hpp"
+#include "attestation/attestation_client_options.hpp"
 #include "attestation/dll_import_export.hpp"
+#include "attestation/rtti.hpp"
diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt
@@ -60,25 +60,25 @@ set(
     inc/azure/core/credentials/token_credential_options.hpp
     inc/azure/core/cryptography/hash.hpp
     inc/azure/core/diagnostics/logger.hpp
-    inc/azure/core/http/http_status_code.hpp
+    inc/azure/core/http/policies/policy.hpp
     inc/azure/core/http/http.hpp
+    inc/azure/core/http/http_status_code.hpp
     inc/azure/core/http/raw_response.hpp
-    inc/azure/core/http/policies/policy.hpp
     inc/azure/core/http/transport.hpp
-    inc/azure/core/internal/client_options.hpp
-    inc/azure/core/internal/contract.hpp
     inc/azure/core/internal/cryptography/sha_hash.hpp
     inc/azure/core/internal/diagnostics/log.hpp
-    inc/azure/core/internal/environment.hpp
-    inc/azure/core/internal/extendable_enumeration.hpp
     inc/azure/core/internal/http/pipeline.hpp
     inc/azure/core/internal/io/null_body_stream.hpp
-    inc/azure/core/internal/json/json_serializable.hpp
     inc/azure/core/internal/json/json.hpp
+    inc/azure/core/internal/json/json_optional.hpp
+    inc/azure/core/internal/json/json_serializable.hpp
+    inc/azure/core/internal/client_options.hpp
+    inc/azure/core/internal/contract.hpp
+    inc/azure/core/internal/environment.hpp
+    inc/azure/core/internal/extendable_enumeration.hpp
     inc/azure/core/internal/strings.hpp
     inc/azure/core/io/body_stream.hpp
     inc/azure/core/azure_assert.hpp
-    inc/azure/core/rtti.hpp
     inc/azure/core/base64.hpp
     inc/azure/core/case_insensitive_containers.hpp
     inc/azure/core/context.hpp
@@ -90,10 +90,11 @@ set(
     inc/azure/core/modified_conditions.hpp
     inc/azure/core/nullable.hpp
     inc/azure/core/operation.hpp
-    inc/azure/core/paged_response.hpp
     inc/azure/core/operation_status.hpp
+    inc/azure/core/paged_response.hpp
     inc/azure/core/platform.hpp
     inc/azure/core/response.hpp
+    inc/azure/core/rtti.hpp
     inc/azure/core/url.hpp
     inc/azure/core/uuid.hpp
     inc/azure/core.hpp
@@ -103,7 +104,6 @@ set(
   AZURE_CORE_SOURCE
     ${CURL_TRANSPORT_ADAPTER_SRC}
     ${WIN_TRANSPORT_ADAPTER_SRC}
-    src/azure_assert.cpp
     src/cryptography/md5.cpp
     src/cryptography/sha_hash.cpp
     src/http/bearer_token_authentication_policy.cpp
@@ -120,6 +120,7 @@ set(
     src/io/random_access_file_body_stream.cpp
     src/private/environment_log_level_listener.hpp
     src/private/package_version.hpp
+    src/azure_assert.cpp
     src/base64.cpp
     src/context.cpp
     src/datetime.cpp

diff --git a/sdk/core/azure-core/inc/azure/core.hpp b/sdk/core/azure-core/inc/azure/core.hpp
@@ -25,6 +25,7 @@
 #include "azure/core/paged_response.hpp"
 #include "azure/core/platform.hpp"
 #include "azure/core/response.hpp"
+#include "azure/core/rtti.hpp"
 #include "azure/core/url.hpp"
 #include "azure/core/uuid.hpp"
 

diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt
@@ -52,6 +52,7 @@ set(
     inc/azure/identity/dll_import_export.hpp
     inc/azure/identity/environment_credential.hpp
     inc/azure/identity/managed_identity_credential.hpp
+    inc/azure/identity/rtti.hpp
     inc/azure/identity.hpp
 )
 

diff --git a/sdk/identity/azure-identity/inc/azure/identity.hpp b/sdk/identity/azure-identity/inc/azure/identity.hpp
@@ -14,3 +14,4 @@
 #include "azure/identity/dll_import_export.hpp"
 #include "azure/identity/environment_credential.hpp"
 #include "azure/identity/managed_identity_credential.hpp"
+#include "azure/identity/rtti.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Breaking Changes
 
+- Renamed `keyvault_certificates.hpp` to `certificates.hpp`.
+
 ### Bugs Fixed
 
 ### Other Changes

diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
@@ -52,15 +52,22 @@ set(
     inc/azure/keyvault/certificates/certificate_client_models.hpp
     inc/azure/keyvault/certificates/certificate_client_options.hpp
     inc/azure/keyvault/certificates/certificate_client_operations.hpp
+    inc/azure/keyvault/certificates/dll_import_export.hpp
+    inc/azure/keyvault/certificates/rtti.hpp
 )
 
 set(
   AZURE_KEYVAULT_CERTIFICATES_SOURCE
+    src/private/certificate_constants.hpp
+    src/private/certificate_key_usage.hpp
+    src/private/certificate_serializers.hpp
+    src/private/keyvault_certificates_common_request.hpp
+    src/private/package_version.hpp
     src/certificate_client.cpp
-    src/certificate_serializers.cpp
-    src/keyvault_certificates_common_request.cpp
     src/certificate_client_operations.cpp
     src/certificate_client_paged_response.cpp
+    src/certificate_serializers.cpp
+    src/keyvault_certificates_common_request.cpp
 )
 
 add_library(azure-security-keyvault-certificates

diff --git a/.../azure/keyvault/keyvault_certificates.hpp → ...cates/inc/azure/keyvault/certificates.hpp b/.../azure/keyvault/keyvault_certificates.hpp → ...cates/inc/azure/keyvault/certificates.hpp
@@ -14,3 +14,5 @@
 #include "azure/keyvault/certificates/certificate_client_models.hpp"
 #include "azure/keyvault/certificates/certificate_client_operations.hpp"
 #include "azure/keyvault/certificates/certificate_client_options.hpp"
+
+#include "azure/keyvault/certificates/rtti.hpp"
diff --git a/...t-certificates/test/samples/certificate-basic-operations/certificate_basic_operations.cpp b/...t-certificates/test/samples/certificate-basic-operations/certificate_basic_operations.cpp
@@ -16,7 +16,7 @@
 #include "get_env.hpp"
 
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_certificates.hpp>
+#include <azure/keyvault/certificates.hpp>
 
 #include <chrono>
 #include <iostream>

diff --git a/...t-certificates/test/samples/certificate-get-certificates/certificate_get_certificates.cpp b/...t-certificates/test/samples/certificate-get-certificates/certificate_get_certificates.cpp
@@ -19,7 +19,7 @@
 #include "get_env.hpp"
 
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_certificates.hpp>
+#include <azure/keyvault/certificates.hpp>
 
 #include <chrono>
 #include <iostream>

diff --git a/...rtificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp b/...rtificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp
@@ -17,7 +17,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_certificates.hpp>
+#include <azure/keyvault/certificates.hpp>
 #include <chrono>
 #include <iostream>
 

diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp
@@ -12,7 +12,7 @@
 #include "../src/private/certificate_serializers.hpp"
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
-#include <azure/keyvault/keyvault_certificates.hpp>
+#include <azure/keyvault/certificates.hpp>
 #include <chrono>
 #include <thread>
 

diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/macro_guard.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/macro_guard.cpp
@@ -12,4 +12,4 @@
 #define max(x, y) small
 #define min(x, y) small
 
-#include "azure/keyvault/keyvault_certificates.hpp"
+#include "azure/keyvault/certificates.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
@@ -47,18 +47,22 @@ endif()
 
 set(
   AZURE_KEYVAULT_KEYS_HEADER
+    inc/azure/keyvault/keys/cryptography/cryptography_client.hpp
     inc/azure/keyvault/keys/cryptography/cryptography_client_models.hpp
     inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp
-    inc/azure/keyvault/keys/cryptography/cryptography_client.hpp
+    inc/azure/keyvault/keys/dll_import_export.hpp
     inc/azure/keyvault/keys/key_client.hpp
     inc/azure/keyvault/keys/key_client_models.hpp
     inc/azure/keyvault/keys/key_client_options.hpp
+    inc/azure/keyvault/keys/rtti.hpp
+    inc/azure/keyvault/keys.hpp
+    inc/azure/keyvault/keyvault_keys.hpp
 )
 
 set(
   AZURE_KEYVAULT_KEYS_SOURCE
-    src/cryptography/cryptography_client_options.cpp
     src/cryptography/cryptography_client.cpp
+    src/cryptography/cryptography_client_options.cpp
     src/cryptography/decrypt_parameters.cpp
     src/cryptography/decrypt_result.cpp
     src/cryptography/encrypt_parameters.cpp
@@ -70,9 +74,9 @@ set(
     src/cryptography/key_wrap_parameters.cpp
     src/cryptography/sign_result.cpp
     src/cryptography/signature_algorithm.cpp
-    src/cryptography/wrap_result.cpp
     src/cryptography/unwrap_result.cpp
     src/cryptography/verify_result.cpp
+    src/cryptography/wrap_result.cpp
     src/private/cryptography_internal_access.hpp
     src/private/cryptography_serializers.hpp
     src/private/key_backup.hpp
@@ -90,8 +94,8 @@ set(
     src/import_key_options.cpp
     src/json_web_key.cpp
     src/key_backup.cpp
-    src/key_client_options.cpp
     src/key_client.cpp
+    src/key_client_options.cpp
     src/key_client_paged_responses.cpp
     src/key_curve_name.cpp
     src/key_operation.cpp

diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys.hpp
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+/**
+ * @brief Includes all public headers from Azure Key Vault Keys SDK library.
+ *
+ */
+
+#pragma once
+
+#include "azure/keyvault/keys/cryptography/cryptography_client.hpp"
+#include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
+#include "azure/keyvault/keys/cryptography/cryptography_client_options.hpp"
+#include "azure/keyvault/keys/dll_import_export.hpp"
+#include "azure/keyvault/keys/key_client.hpp"
+#include "azure/keyvault/keys/key_client_models.hpp"
+#include "azure/keyvault/keys/key_client_options.hpp"
+#include "azure/keyvault/keys/rtti.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keyvault_keys.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keyvault_keys.hpp
@@ -4,14 +4,11 @@
 /**
  * @brief Includes all public headers from Azure Key Vault Keys SDK library.
  *
+ * @remark This header file does exist for compatibility with prior stable releases.
+ * It is recommended to use `keys.hpp` instead.
+ *
  */
 
 #pragma once
 
-#include "azure/keyvault/keys/cryptography/cryptography_client.hpp"
-#include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
-#include "azure/keyvault/keys/cryptography/cryptography_client_options.hpp"
-#include "azure/keyvault/keys/dll_import_export.hpp"
-#include "azure/keyvault/keys/key_client.hpp"
-#include "azure/keyvault/keys/key_client_models.hpp"
-#include "azure/keyvault/keys/key_client_options.hpp"
+#include "azure/keyvault/keys.hpp"
diff --git a/...ault/azure-security-keyvault-keys/test/perf/inc/azure/keyvault/keys/test/get_key_test.hpp b/...ault/azure-security-keyvault-keys/test/perf/inc/azure/keyvault/keys/test/get_key_test.hpp
@@ -12,7 +12,7 @@
 #include <azure/perf.hpp>
 
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/keyvault/keys.hpp>
 
 #include <memory>
 #include <string>

diff --git a/...ult/azure-security-keyvault-keys/test/samples/sample1-hello-world/sample1_hello_world.cpp b/...ult/azure-security-keyvault-keys/test/samples/sample1-hello-world/sample1_hello_world.cpp
@@ -17,7 +17,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/keyvault/keys.hpp>
 
 #include <chrono>
 #include <iostream>

diff --git a/...rity-keyvault-keys/test/samples/sample2-backup-and-restore/sample2_backup_and_restore.cpp b/...rity-keyvault-keys/test/samples/sample2-backup-and-restore/sample2_backup_and_restore.cpp
@@ -17,7 +17,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/keyvault/keys.hpp>
 
 #include <assert.h>
 #include <chrono>

diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample3-get-keys/sample3_get_keys.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample3-get-keys/sample3_get_keys.cpp
@@ -18,7 +18,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/keyvault/keys.hpp>
 
 #include <chrono>
 #include <fstream>