From c5f380f45dc4ddb789fb2b354a2f8c71b96cd754 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Fri, 13 Feb 2015 17:23:28 -0800
Subject: [PATCH] Move to mapbox bucket

---
 package.json                     |  2 +-
 travis/travis-resources.template | 78 ++++++++++++++++++++++++--------
 2 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index ff8b301d6..c60a03c38 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "aws-sdk": "^2.1.9",
-    "mapbox-gl-test-suite": "git://github.com/mapbox/mapbox-gl-test-suite",
+    "mapbox-gl-test-suite": "git://github.com/mapbox/mapbox-gl-test-suite#master",
     "mkdirp": "^0.5.0",
     "tap-spec": "^2.2.1",
     "tape": "^3.5.0"
diff --git a/travis/travis-resources.template b/travis/travis-resources.template
index 8f07f1cf2..ad62b03f8 100644
--- a/travis/travis-resources.template
+++ b/travis/travis-resources.template
@@ -28,7 +28,7 @@
                         }
                     },
                     {
-                        "PolicyName": "build-testing",
+                        "PolicyName": "build-testing-old",
                         "PolicyDocument": {
                             "Statement": [
                                 {
@@ -47,20 +47,38 @@
                             ]
                         }
                     },
-                    "PolicyName": "list",
-                    "PolicyDocument": {
-                        "Statement": [
-                            {
-                                "Action": [
-                                    "s3:ListBucket"
-                                ],
-                                "Resource": [
-                                    "arn:aws:s3:::mapbox-node-binary"
-                                ],
-                                "Effect": "Allow"
-                            }
-                        ]
-                    }
+                    {
+                        "PolicyName": "list",
+                        "PolicyDocument": {
+                            "Statement": [
+                                {
+                                    "Action": [
+                                        "s3:ListBucket"
+                                    ],
+                                    "Resource": [
+                                        "arn:aws:s3:::mapbox-node-binary"
+                                    ],
+                                    "Effect": "Allow"
+                                }
+                            ]
+                        }
+                    },
+                    {
+                        "PolicyName": "list-testing-old",
+                        "PolicyDocument": {
+                            "Statement": [
+                                {
+                                    "Action": [
+                                        "s3:ListBucket"
+                                    ],
+                                    "Effect": "Allow",
+                                    "Resource": [
+                                        "arn:aws:s3:::mapbox-gl-testing"
+                                    ]
+                                }
+                            ]
+                        }
+                    },
                     {
                         "PolicyName": "list-testing",
                         "PolicyDocument": {
@@ -71,7 +89,32 @@
                                     ],
                                     "Effect": "Allow",
                                     "Resource": [
-                                        "arn:aws:s3:::mapbox-gl-testing"
+                                        "arn:aws:s3:::mapbox"
+                                    ],
+                                    "Condition": {
+                                        "StringLike": {
+                                            "s3:prefix": "node-mapbox-gl-native/*"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    {
+                        "PolicyName": "build-testing",
+                        "PolicyDocument": {
+                            "Statement": [
+                                {
+                                    "Action": [
+                                        "s3:DeleteObject",
+                                        "s3:GetObject",
+                                        "s3:GetObjectAcl",
+                                        "s3:PutObject",
+                                        "s3:PutObjectAcl"
+                                    ],
+                                    "Effect": "Allow",
+                                    "Resource": [
+                                        "arn:aws:s3:::mapbox/node-mapbox-gl-native/*"
                                     ]
                                 }
                             ]
@@ -97,7 +140,7 @@
         },
         "SecretAccessKey": {
             "Value": {
-                "Fn::GetAtt": [ 
+                "Fn::GetAtt": [
                     "BuildUserKey",
                     "SecretAccessKey"
                 ]
@@ -105,4 +148,3 @@
         }
     }
 }
-