From 631ff9386adcdeab9980d8a86a6f3c8aa02a313d Mon Sep 17 00:00:00 2001 From: Colin Goodheart-Smithe Date: Thu, 8 Dec 2016 09:34:05 +0000 Subject: [PATCH] Changes AWS property names to be in line with the Elastic standard names (elastic/elasticsearch#499) Properties are now `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` Original commit: elastic/x-pack-elasticsearch@5947dc5ff1cdc80e844f4643d4311da1ee447529 --- build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index bcd99293663..b51bafda11f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,18 +6,18 @@ import org.elasticsearch.gradle.precommit.LicenseHeadersTask import org.elasticsearch.gradle.VersionProperties import org.elastic.gradle.UploadS3Task -String envAwsAccessKey = System.env.AWS_ACCESS_KEY +String envAwsAccessKey = System.env.AWS_ACCESS_KEY_ID if (envAwsAccessKey != null) { project.ext.awsAccessKey = envAwsAccessKey -} else if (project.hasProperty("AWS_ACCESS_KEY")) { - project.ext.awsAccessKey = AWS_ACCESS_KEY +} else if (project.hasProperty("AWS_ACCESS_KEY_ID")) { + project.ext.awsAccessKey = AWS_ACCESS_KEY_ID } -String envAwsSecretKey = System.env.AWS_SECRET_KEY +String envAwsSecretKey = System.env.AWS_SECRET_ACCESS_KEY if (envAwsSecretKey != null) { project.ext.awsSecretKey = envAwsSecretKey -} else if (project.hasProperty("AWS_SECRET_KEY")) { - project.ext.awsSecretKey = AWS_SECRET_KEY +} else if (project.hasProperty("AWS_SECRET_ACCESS_KEY")) { + project.ext.awsSecretKey = AWS_SECRET_ACCESS_KEY } project.ext.isWindows = OperatingSystem.current().isWindows()