summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobby Sudekum <bobby@mapbox.com>2017-08-01 16:57:31 -0700
committerBobby Sudekum <bobby@mapbox.com>2017-08-01 17:33:16 -0700
commit0816aabb6d69cb79abbc5288aa2b8a5dff4c349e (patch)
tree25f34ca528c039b7a87eda8e18e2cc5546486224
parent565dfc91833fbac4d40ac13293225720919a0773 (diff)
downloadqtlocation-mapboxgl-upstream/single-token.tar.gz
Combine AWS keysupstream/single-token
-rw-r--r--cloudformation/travis.template34
1 files changed, 3 insertions, 31 deletions
diff --git a/cloudformation/travis.template b/cloudformation/travis.template
index 29f2402b20..db4e59eb7e 100644
--- a/cloudformation/travis.template
+++ b/cloudformation/travis.template
@@ -130,22 +130,7 @@
}
]
}
- }
- ]
- }
- },
- "BuildUserKey": {
- "Type": "AWS::IAM::AccessKey",
- "Properties": {
- "UserName": {
- "Ref": "BuildUser"
- }
- }
- },
- "BitriseUser": {
- "Type": "AWS::IAM::User",
- "Properties": {
- "Policies": [
+ },
{
"PolicyName": "get-signing-key",
"PolicyDocument": {
@@ -223,11 +208,11 @@
]
}
},
- "BitriseUserKey": {
+ "BuildUserKey": {
"Type": "AWS::IAM::AccessKey",
"Properties": {
"UserName": {
- "Ref": "BitriseUser"
+ "Ref": "BuildUser"
}
}
},
@@ -312,19 +297,6 @@
]
}
},
- "BitriseAccessKeyId": {
- "Value": {
- "Ref": "BitriseUserKey"
- }
- },
- "BitriseSecretAccessKey": {
- "Value": {
- "Fn::GetAtt": [
- "BitriseUserKey",
- "SecretAccessKey"
- ]
- }
- },
"AndroidInstanceProfile": {
"Value": {
"Fn::GetAtt": [