Skip to content

Only one of azure key or token can be specified in 3rd party tests #54876

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

Merged
tlrx merged 3 commits into from
Apr 7, 2020
Merged

Only one of azure key or token can be specified in 3rd party tests #54876

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49dedbe
Only one of azure key or token can be specified in 3rd party tests
tlrx Apr 7, 2020
c9fc5e4
Merge branch 'master' into fix-azure-3rd-party-tests
elasticmachine Apr 7, 2020
4eed2f0
Merge branch 'master' into fix-azure-3rd-party-tests
elasticmachine Apr 7, 2020
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
10 changes: 6 additions & 4 deletions x-pack/plugin/searchable-snapshots/qa/azure/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ if (!azureAccount && !azureKey && !azureContainer && !azureBasePath && !azureSas
azureSasToken = ''
useFixture = true

} else if (!azureAccount || !azureKey || !azureContainer || !azureBasePath || !azureSasToken) {
throw new IllegalArgumentException("not all options specified to run against external Azure service are present")
}

if (useFixture) {
Expand All @@ -78,8 +76,12 @@ testClusters.integTest {
}

keystore 'azure.client.searchable_snapshots.account', azureAccount
keystore 'azure.client.searchable_snapshots.key', azureKey
keystore 'azure.client.searchable_snapshots.sas_token', azureSasToken
if (azureKey != null && azureKey.isEmpty() == false) {
keystore 'azure.client.searchable_snapshots.key', azureKey
}
if (azureSasToken != null && azureSasToken.isEmpty() == false) {
keystore 'azure.client.searchable_snapshots.sas_token', azureSasToken
}

setting 'xpack.license.self_generated.type', 'trial'

Expand Down