github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Version->ApiVersion (#3805)

Browse Source 
* Version->ApiVersion

* Don't remember credentials they're not needed
This commit is contained in:
Larry Osterman 2022-07-07 11:51:58 -07:00 committed by GitHub
parent b752357dc5
commit 9c144c7301
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_administration_client.hpp
View File

@ -253,7 +253,6 @@ namespace Azure { namespace Security { namespace Attestation {
private:
Azure::Core::Url m_endpoint;
std::string m_apiVersion;
std::shared_ptr<Azure::Core::Credentials::TokenCredential const> m_credentials;
std::shared_ptr<Azure::Core::Http::_internal::HttpPipeline> m_pipeline;
AttestationTokenValidationOptions m_tokenValidationOptions;
Azure::Core::Tracing::_internal::TracingContextFactory m_tracingFactory;

1
sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client.hpp
View File

@ -248,7 +248,6 @@ namespace Azure { namespace Security { namespace Attestation {
private:
Azure::Core::Url m_endpoint;
std::string m_apiVersion;
std::shared_ptr<Azure::Core::Credentials::TokenCredential const> m_credentials;
std::shared_ptr<Azure::Core::Http::_internal::HttpPipeline> m_pipeline;
AttestationTokenValidationOptions m_tokenValidationOptions;
std::vector<Models::AttestationSigner> m_attestationSigners;

17
sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_options.hpp
View File

@ -94,7 +94,7 @@ namespace Azure { namespace Security { namespace Attestation {
{
/** @brief Version to use when communicating with the attestation service.
*/
std::string Version;
std::string ApiVersion{"2020-10-01"};
/** @brief Options sent when validating tokens received by the attestation service.
*/
@ -103,15 +103,11 @@ namespace Azure { namespace Security { namespace Attestation {
/**
* @brief Construct a new Attestation Client Options object.
*
* @param version Optional version for the client.
* @param tokenValidationOptions Options applied when validating attestation tokens returned by
* the service.
*/
AttestationClientOptions(
std::string version = "2020-10-01",
AttestationTokenValidationOptions const& tokenValidationOptions = {})
: Azure::Core::_internal::ClientOptions(), Version(version),
TokenValidationOptions(tokenValidationOptions)
AttestationClientOptions(AttestationTokenValidationOptions const& tokenValidationOptions = {})
: Azure::Core::_internal::ClientOptions(), TokenValidationOptions(tokenValidationOptions)
{
}
};
@ -123,22 +119,19 @@ namespace Azure { namespace Security { namespace Attestation {
{
/** @brief Version to use when communicating with the attestation service.
*/
std::string Version;
std::string ApiVersion{"2020-10-01"};
/** @brief Options sent when validating tokens received by the attestation service.
*/
AttestationTokenValidationOptions TokenValidationOptions;
/**
* @brief Construct a new Attestation Client Options object.
*
* @param version Optional version for the client.
* @param tokenValidationOptions Options applied when validating attestation tokens returned by
* the service.
*/
AttestationAdministrationClientOptions(
std::string version = "2020-10-01",
AttestationTokenValidationOptions const& tokenValidationOptions = {})
: Azure::Core::_internal::ClientOptions(), Version(version),
TokenValidationOptions(tokenValidationOptions)
: Azure::Core::_internal::ClientOptions(), TokenValidationOptions(tokenValidationOptions)
{
}
};

3
sdk/attestation/azure-security-attestation/src/attestation_administration_client.cpp
View File

@ -42,14 +42,13 @@ AttestationAdministrationClient::AttestationAdministrationClient(
std::string const& endpoint,
std::shared_ptr<Core::Credentials::TokenCredential const> credential,
AttestationAdministrationClientOptions const& options)
: m_endpoint(endpoint), m_apiVersion(options.Version),
: m_endpoint(endpoint), m_apiVersion(options.ApiVersion),
m_tokenValidationOptions(options.TokenValidationOptions),
m_tracingFactory(options, "security.attestation", PackageVersion::ToString())
{
std::vector<std::unique_ptr<HttpPolicy>> perRetrypolicies;
if (credential)
{
m_credentials = credential;
Azure::Core::Credentials::TokenRequestContext const tokenContext
= {{"https://attest.azure.net/.default"}};

4
sdk/attestation/azure-security-attestation/src/attestation_client.cpp
View File

@ -31,21 +31,19 @@ AttestationClient::AttestationClient(
std::string const& endpoint,
std::shared_ptr<Core::Credentials::TokenCredential const> credential,
AttestationClientOptions options)
: m_endpoint(endpoint), m_credentials(credential),
: m_endpoint(endpoint), m_apiVersion(options.ApiVersion),
m_tokenValidationOptions(options.TokenValidationOptions),
m_tracingFactory(options, "security.attestation", PackageVersion::ToString())
{
std::vector<std::unique_ptr<HttpPolicy>> perRetrypolicies;
if (credential)
{
m_credentials = credential;
Azure::Core::Credentials::TokenRequestContext const tokenContext
= {{"https://attest.azure.net/.default"}};
perRetrypolicies.emplace_back(
std::make_unique<BearerTokenAuthenticationPolicy>(credential, tokenContext));
}
m_apiVersion = options.Version;
std::vector<std::unique_ptr<HttpPolicy>> perCallpolicies;
m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(