Re-enable running previously disabled samples using AzureCliCredential. (#5818)
* Re-enable running KeyVault samples on Ubuntu using AzureCliCredential. * Re-enable running Attestation samples using AzureCliCredential. * Re-enable running EventHubs samples using AzureCliCredential. * Re-enable running Identity samples. * Disable client_secret_credential_sample since it depends on env vars that don't exist.
This commit is contained in:
Ahson Khan
GitHub
parent
e67bcaa558
commit
9b9f76a737
@ -244,18 +244,14 @@ jobs:
|
||||
# Will run samples described on a file name [service]-samples.txt within the build directory.
|
||||
# For example keyvault-samples.txt.
|
||||
# The file is written by CMake during configuration when building samples.
|
||||
- task: AzurePowerShell@5
|
||||
displayName: "Run Samples for : ${{ parameters.ServiceDirectory }}"
|
||||
- task: AzureCLI@2
|
||||
displayName: "Run Samples with AzureCli for : ${{ parameters.ServiceDirectory }}"
|
||||
condition: and(succeeded(), eq(variables['RunSamples'], '1'))
|
||||
inputs:
|
||||
azureSubscription: ${{ parameters.CloudConfig.ServiceConnection }}
|
||||
azurePowerShellVersion: LatestVersion
|
||||
ScriptType: InlineScript
|
||||
Inline: |
|
||||
$account = (Get-AzContext).Account
|
||||
$env:AZURESUBSCRIPTION_CLIENT_ID = $account.Id
|
||||
$env:AZURESUBSCRIPTION_TENANT_ID = $account.Tenants
|
||||
|
||||
scriptType: 'pscore'
|
||||
scriptLocation: 'inlineScript'
|
||||
inlineScript: |
|
||||
if (Test-Path -Path "${{ parameters.ServiceDirectory }}-samples.txt") {
|
||||
$samples = Get-Content "${{ parameters.ServiceDirectory }}-samples.txt"
|
||||
foreach ($sample in $samples) {
|
||||
@ -269,8 +265,8 @@ jobs:
|
||||
}
|
||||
}
|
||||
workingDirectory: build
|
||||
useGlobalConfig: true
|
||||
env:
|
||||
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
|
||||
${{ insert }}: ${{ parameters.EnvVars }}
|
||||
|
||||
- ${{ else }}:
|
||||
|
||||
@ -105,7 +105,6 @@
|
||||
"CMAKE_GENERATOR_PLATFORM": "x64",
|
||||
"CmakeArgs": " -DBUILD_TRANSPORT_CURL=ON -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DBUILD_SAMPLES=ON -DMSVC_USE_STATIC_CRT=ON -DDISABLE_PROXY_TESTS=ON ",
|
||||
"BuildArgs": "-v --parallel 8 --config Release",
|
||||
"RunSamples": 1,
|
||||
"WindowsCtestConfig": "-C Release"
|
||||
}
|
||||
}
|
||||
@ -142,7 +141,6 @@
|
||||
"CmakeArgs": " -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DBUILD_SAMPLES=ON -DDISABLE_AZURE_CORE_OPENTELEMETRY=ON ",
|
||||
"BuildArgs": "-v --parallel 8 --config Release",
|
||||
"AZURE_CORE_ENABLE_JSON_TESTS": 1,
|
||||
"RunSamples": 1,
|
||||
"WindowsCtestConfig": "-C Release"
|
||||
},
|
||||
"x64_with_unit_test_winHttp": {
|
||||
@ -159,7 +157,6 @@
|
||||
"CMAKE_GENERATOR_PLATFORM": "x64",
|
||||
"CmakeArgs": " -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DBUILD_SAMPLES=ON -DMSVC_USE_STATIC_CRT=ON ",
|
||||
"BuildArgs": "-v --parallel 8 --config Release",
|
||||
"RunSamples": 1,
|
||||
"WindowsCtestConfig": "-C Release"
|
||||
},
|
||||
"x64_with_unit_samples_libcurl": {
|
||||
@ -168,7 +165,6 @@
|
||||
"CMAKE_GENERATOR_PLATFORM": "x64",
|
||||
"CmakeArgs": " -DBUILD_TRANSPORT_CURL=ON -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DBUILD_SAMPLES=ON -DMSVC_USE_STATIC_CRT=ON ",
|
||||
"BuildArgs": "-v --parallel 8 --config Release",
|
||||
"RunSamples": 1,
|
||||
"WindowsCtestConfig": "-C Release"
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@ add_executable (
|
||||
attestation_collateral.cpp
|
||||
attestation_collateral.hpp)
|
||||
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(attestation attestation-${samplename} DISABLE_RUN)
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(attestation attestation-${samplename})
|
||||
|
||||
target_link_libraries(attestation-${samplename} PRIVATE azure-security-attestation get-env-helper)
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ add_executable (
|
||||
attestation-${samplename}
|
||||
${samplename}.cpp)
|
||||
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(attestation attestation-${samplename} DISABLE_RUN)
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(attestation attestation-${samplename})
|
||||
|
||||
target_link_libraries(attestation-${samplename} PRIVATE azure-security-attestation azure-identity get-env-helper)
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ add_executable (
|
||||
cryptohelpers.hpp
|
||||
)
|
||||
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(attestation-${samplename} attestation DISABLE_RUN)
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(attestation-${samplename} attestation)
|
||||
|
||||
target_link_libraries(attestation-${samplename} PRIVATE azure-security-attestation azure-identity OpenSSL::Crypto get-env-helper)
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ add_executable (
|
||||
cryptohelpers.hpp
|
||||
)
|
||||
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(attestation attestation-${samplename} DISABLE_RUN)
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(attestation attestation-${samplename})
|
||||
|
||||
target_link_libraries(attestation-${samplename} PRIVATE azure-security-attestation azure-identity get-env-helper)
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ add_executable (
|
||||
eventhubs-${samplename}
|
||||
${samplename}.cpp)
|
||||
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(eventhubs eventhubs-${samplename} DISABLE_RUN)
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(eventhubs eventhubs-${samplename})
|
||||
|
||||
target_link_libraries(eventhubs-${samplename} PRIVATE azure-messaging-eventhubs azure-identity)
|
||||
endmacro()
|
||||
|
||||
@ -12,7 +12,7 @@ add_executable (
|
||||
eventhubs-${samplename}
|
||||
${samplename}.cpp)
|
||||
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(eventhubs eventhubs-${samplename} DISABLE_RUN)
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(eventhubs eventhubs-${samplename})
|
||||
|
||||
target_link_libraries(eventhubs-${samplename} PRIVATE azure-messaging-eventhubs azure-identity)
|
||||
endmacro()
|
||||
|
||||
@ -12,7 +12,7 @@ add_executable (
|
||||
eventhubs-${samplename}
|
||||
${samplename}.cpp)
|
||||
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(eventhubs eventhubs-${samplename} DISABLE_RUN)
|
||||
CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(eventhubs eventhubs-${samplename})
|
||||
|
||||
target_link_libraries(eventhubs-${samplename} PRIVATE azure-messaging-eventhubs azure-identity)
|
||||
endmacro()
|
||||
|
||||
@ -39,14 +39,14 @@ create_per_service_target_build_for_sample(identity client_secret_credential_sam
|
||||
add_executable(default_azure_credential_sample default_azure_credential.cpp)
|
||||
target_link_libraries(default_azure_credential_sample PRIVATE azure-identity service)
|
||||
target_include_directories(default_azure_credential_sample PRIVATE .)
|
||||
create_per_service_target_build_for_sample(identity default_azure_credential_sample DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(identity default_azure_credential_sample)
|
||||
|
||||
add_executable(environment_credential_sample environment_credential.cpp)
|
||||
target_link_libraries(environment_credential_sample PRIVATE azure-identity service)
|
||||
target_include_directories(environment_credential_sample PRIVATE .)
|
||||
create_per_service_target_build_for_sample(identity environment_credential_sample DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(identity environment_credential_sample)
|
||||
|
||||
add_executable(managed_identity_credential_sample managed_identity_credential.cpp)
|
||||
target_link_libraries(managed_identity_credential_sample PRIVATE azure-identity service)
|
||||
target_include_directories(managed_identity_credential_sample PRIVATE .)
|
||||
create_per_service_target_build_for_sample(identity managed_identity_credential_sample DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(identity managed_identity_credential_sample)
|
||||
|
||||
@ -12,6 +12,6 @@ add_executable (
|
||||
certificate_basic_operations.cpp
|
||||
)
|
||||
|
||||
create_per_service_target_build_for_sample(keyvault certificate-basic-operations DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault certificate-basic-operations)
|
||||
|
||||
target_link_libraries(certificate-basic-operations PRIVATE azure-security-keyvault-certificates azure-identity get-env-helper)
|
||||
|
||||
@ -11,6 +11,6 @@ add_executable (
|
||||
certificate-get-certificates
|
||||
certificate_get_certificates.cpp
|
||||
)
|
||||
create_per_service_target_build_for_sample(keyvault certificate-get-certificates DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault certificate-get-certificates)
|
||||
|
||||
target_link_libraries(certificate-get-certificates PRIVATE azure-security-keyvault-certificates azure-identity get-env-helper)
|
||||
|
||||
@ -11,6 +11,6 @@ add_executable (
|
||||
certificate-import-certificate
|
||||
certificate_import_certificate.cpp
|
||||
)
|
||||
create_per_service_target_build_for_sample(keyvault certificate-import-certificate DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault certificate-import-certificate)
|
||||
|
||||
target_link_libraries(certificate-import-certificate PRIVATE azure-security-keyvault-certificates azure-identity get-env-helper)
|
||||
|
||||
@ -12,6 +12,6 @@ add_executable (
|
||||
sample1_hello_world.cpp
|
||||
)
|
||||
|
||||
create_per_service_target_build_for_sample(keyvault sample1-hello-world DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault sample1-hello-world)
|
||||
|
||||
target_link_libraries(sample1-hello-world PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
|
||||
|
||||
@ -11,6 +11,6 @@ add_executable (
|
||||
sample2-backup-and-restore
|
||||
sample2_backup_and_restore.cpp
|
||||
)
|
||||
create_per_service_target_build_for_sample(keyvault sample2-backup-and-restore DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault sample2-backup-and-restore)
|
||||
|
||||
target_link_libraries(sample2-backup-and-restore PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
|
||||
|
||||
@ -11,6 +11,6 @@ add_executable (
|
||||
sample3-get-keys
|
||||
sample3_get_keys.cpp
|
||||
)
|
||||
create_per_service_target_build_for_sample(keyvault sample3-get-keys DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault sample3-get-keys)
|
||||
|
||||
target_link_libraries(sample3-get-keys PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
|
||||
|
||||
@ -11,6 +11,6 @@ add_executable (
|
||||
sample4-encrypt-decrypt
|
||||
sample4_encrypt_decrypt.cpp
|
||||
)
|
||||
create_per_service_target_build_for_sample(keyvault sample4-encrypt-decrypt DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault sample4-encrypt-decrypt)
|
||||
|
||||
target_link_libraries(sample4-encrypt-decrypt PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
|
||||
|
||||
@ -11,6 +11,6 @@ add_executable (
|
||||
sample5-sign-verify
|
||||
sample5_sign_verify.cpp
|
||||
)
|
||||
create_per_service_target_build_for_sample(keyvault sample5-sign-verify DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault sample5-sign-verify)
|
||||
|
||||
target_link_libraries(sample5-sign-verify PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
|
||||
|
||||
@ -11,6 +11,6 @@ add_executable (
|
||||
sample6-wrap-unwrap
|
||||
sample6_wrap_unwrap.cpp
|
||||
)
|
||||
create_per_service_target_build_for_sample(keyvault sample6-wrap-unwrap DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault sample6-wrap-unwrap)
|
||||
|
||||
target_link_libraries(sample6-wrap-unwrap PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
|
||||
|
||||
@ -11,6 +11,6 @@ add_executable (
|
||||
sample7-key-rotation
|
||||
sample7_key_rotation.cpp
|
||||
)
|
||||
create_per_service_target_build_for_sample(keyvault sample7-key-rotation DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault sample7-key-rotation)
|
||||
|
||||
target_link_libraries(sample7-key-rotation PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
|
||||
|
||||
@ -11,6 +11,6 @@ add_executable (
|
||||
sample1-basic-operations
|
||||
sample1_basic_operations.cpp
|
||||
)
|
||||
create_per_service_target_build_for_sample(keyvault sample1-basic-operations DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault sample1-basic-operations)
|
||||
|
||||
target_link_libraries(sample1-basic-operations PRIVATE azure-security-keyvault-secrets azure-identity get-env-helper)
|
||||
|
||||
@ -12,6 +12,6 @@ add_executable (
|
||||
sample2_backup_restore.cpp
|
||||
)
|
||||
|
||||
create_per_service_target_build_for_sample(keyvault sample2-backup-restore DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault sample2-backup-restore)
|
||||
|
||||
target_link_libraries(sample2-backup-restore PRIVATE azure-security-keyvault-secrets azure-identity get-env-helper)
|
||||
|
||||
@ -12,6 +12,6 @@ add_executable (
|
||||
sample3_delete_recover.cpp
|
||||
)
|
||||
|
||||
create_per_service_target_build_for_sample(keyvault sample3-delete-recover DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault sample3-delete-recover)
|
||||
|
||||
target_link_libraries(sample3-delete-recover PRIVATE azure-security-keyvault-secrets azure-identity get-env-helper)
|
||||
|
||||
@ -12,6 +12,6 @@ add_executable (
|
||||
sample4_get_secrets_deleted.cpp
|
||||
)
|
||||
|
||||
create_per_service_target_build_for_sample(keyvault sample4-get-secrets-deleted DISABLE_RUN)
|
||||
create_per_service_target_build_for_sample(keyvault sample4-get-secrets-deleted)
|
||||
|
||||
target_link_libraries(sample4-get-secrets-deleted PRIVATE azure-security-keyvault-secrets azure-identity get-env-helper)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user