Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update all-inclusive headers, and CMakeFiles for including all headers #3640

Merged
merged 6 commits into from
May 18, 2022
Merged

Update all-inclusive headers, and CMakeFiles for including all headers #3640

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
45357d6
Update all-inclusive headers, and CMakeFiles for including all headers
antkmsft May 11, 2022
5db8057
Clang-format
antkmsft May 11, 2022
7a84965
PR feedback
antkmsft May 17, 2022
e878944
Merge branch 'main' into all-inclusive
antkmsft May 17, 2022
a18e974
Update code coverage targets
antkmsft May 17, 2022
049858b
Merge branch 'all-inclusive' of https://github.com/antkmsft/azure-sdk…
antkmsft May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions samples/integration/vcpkg-all-smoke/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion samples/integration/vcpkg-keyvault/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
46 changes: 23 additions & 23 deletions sdk/attestation/azure-security-attestation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
3 changes: 3 additions & 0 deletions sdk/attestation/azure-security-attestation/inc/azure/attestation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
21 changes: 11 additions & 10 deletions sdk/core/azure-core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions sdk/core/azure-core/inc/azure/core.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 1 addition & 0 deletions sdk/identity/azure-identity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
1 change: 1 addition & 0 deletions sdk/identity/azure-identity/inc/azure/identity.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 2 additions & 0 deletions sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

### Breaking Changes

- Renamed `keyvault_certificates.hpp` to `certificates.hpp`.
antkmsft marked this conversation as resolved.
Show resolved Hide resolved

### Bugs Fixed

### Other Changes
Expand Down
11 changes: 9 additions & 2 deletions sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .../azure/keyvault/keyvault_certificates.hpp → ...cates/inc/azure/keyvault/certificates.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion ...t-certificates/test/samples/certificate-basic-operations/certificate_basic_operations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...t-certificates/test/samples/certificate-get-certificates/certificate_get_certificates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...rtificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-certificates/test/ut/macro_guard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
12 changes: 8 additions & 4 deletions sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
18 changes: 18 additions & 0 deletions sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
11 changes: 4 additions & 7 deletions sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keyvault_keys.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
antkmsft marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion ...ault/azure-security-keyvault-keys/test/perf/inc/azure/keyvault/keys/test/get_key_test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ult/azure-security-keyvault-keys/test/samples/sample1-hello-world/sample1_hello_world.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...rity-keyvault-keys/test/samples/sample2-backup-and-restore/sample2_backup_and_restore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-keys/test/samples/sample3-get-keys/sample3_get_keys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading