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@5947dc5ff1
This commit is contained in:
Colin Goodheart-Smithe 2016-12-08 09:34:05 +00:00 committed by GitHub
parent 4990195c90
commit 631ff9386a
1 changed files with 6 additions and 6 deletions

View File

@ -6,18 +6,18 @@ import org.elasticsearch.gradle.precommit.LicenseHeadersTask
import org.elasticsearch.gradle.VersionProperties import org.elasticsearch.gradle.VersionProperties
import org.elastic.gradle.UploadS3Task import org.elastic.gradle.UploadS3Task
String envAwsAccessKey = System.env.AWS_ACCESS_KEY String envAwsAccessKey = System.env.AWS_ACCESS_KEY_ID
if (envAwsAccessKey != null) { if (envAwsAccessKey != null) {
project.ext.awsAccessKey = envAwsAccessKey project.ext.awsAccessKey = envAwsAccessKey
} else if (project.hasProperty("AWS_ACCESS_KEY")) { } else if (project.hasProperty("AWS_ACCESS_KEY_ID")) {
project.ext.awsAccessKey = AWS_ACCESS_KEY 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) { if (envAwsSecretKey != null) {
project.ext.awsSecretKey = envAwsSecretKey project.ext.awsSecretKey = envAwsSecretKey
} else if (project.hasProperty("AWS_SECRET_KEY")) { } else if (project.hasProperty("AWS_SECRET_ACCESS_KEY")) {
project.ext.awsSecretKey = AWS_SECRET_KEY project.ext.awsSecretKey = AWS_SECRET_ACCESS_KEY
} }
project.ext.isWindows = OperatingSystem.current().isWindows() project.ext.isWindows = OperatingSystem.current().isWindows()