Merge pull request #1214 from mozilla-services/feat/1201

feat: hardcode autopush_rs's AWS creds in local dynamodb mode

.travis.yml

@@ -28,8 +28,6 @@ install:
 - pip install tox ${CODECOV:+codecov}
 - if [ ${WITH_RUST:-true} != "false" ]; then curl https://sh.rustup.rs | sh -s -- -y || travis_terminate 1; fi
 - export PATH=$PATH:$HOME/.cargo/bin
-- export AWS_SHARED_CREDENTIALS_FILE=./automock/boto.cfg
-- export BOTO_CONFIG=./automock/boto.cfg
 script:
 - tox -- ${CODECOV:+--with-coverage --cover-xml --cover-package=autopush}
 after_success:

autopush_rs/Cargo.toml

@@ -28,6 +28,7 @@ openssl = "0.10.5"
 regex = "0.2"
 reqwest = { version = "0.8.5", features = ["unstable"] }
 rusoto_core = "0.32.0"
+rusoto_credential = "0.11.0"
 rusoto_dynamodb = "0.32.0"
 sentry = "0.2.0"
 serde = "1.0.45"

autopush_rs/src/lib.rs

@@ -78,6 +78,7 @@ extern crate openssl;
 extern crate regex;
 extern crate reqwest;
 extern crate rusoto_core;
+extern crate rusoto_credential;
 extern crate rusoto_dynamodb;
 extern crate sentry;
 extern crate serde;

autopush_rs/src/util/ddb_helpers.rs

@@ -9,6 +9,8 @@ use futures::future;
 use futures_backoff::retry_if;
 use regex::RegexSet;
 use rusoto_core::Region;
+use rusoto_core::reactor::RequestDispatcher;
+use rusoto_credential::StaticProvider;
 use rusoto_dynamodb::{AttributeValue, DynamoDb, DynamoDbClient, QueryError, QueryInput,
                       UpdateItemError, UpdateItemInput, UpdateItemOutput};
 use serde_dynamodb;
@@ -292,20 +294,24 @@ pub struct FetchMessageResponse {
 }
 
 pub struct DynamoStorage {
-    ddb: Rc<DynamoDbClient>,
+    ddb: Rc<Box<DynamoDb>>,
 }
 
 impl DynamoStorage {
     pub fn new() -> DynamoStorage {
-        let region = env::var("AWS_LOCAL_DYNAMODB")
-            .map(|endpoint| Region::Custom {
-                endpoint,
-                name: "env_var".to_string(),
-            })
-            .unwrap_or(Region::default());
-        DynamoStorage {
-            ddb: Rc::new(DynamoDbClient::simple(region)),
-        }
+        let ddb: Box<DynamoDb> = if let Ok(endpoint) = env::var("AWS_LOCAL_DYNAMODB") {
+            Box::new(DynamoDbClient::new(
+                RequestDispatcher::default(),
+                StaticProvider::new_minimal("BogusKey".to_string(), "BogusKey".to_string()),
+                Region::Custom {
+                    name: "us-east-1".to_string(),
+                    endpoint,
+                },
+            ))
+        } else {
+            Box::new(DynamoDbClient::simple(Region::default()))
+        };
+        DynamoStorage { ddb: Rc::new(ddb) }
     }
 
     pub fn increment_storage(
@@ -357,7 +363,7 @@ impl DynamoStorage {
     }
 
     pub fn fetch_messages(
-        ddb: Rc<DynamoDbClient>,
+        ddb: Rc<Box<DynamoDb>>,
         table_name: &str,
         uaid: &Uuid,
         limit: u32,
@@ -439,7 +445,7 @@ impl DynamoStorage {
     }
 
     pub fn fetch_timestamp_messages(
-        ddb: Rc<DynamoDbClient>,
+        ddb: Rc<Box<DynamoDb>>,
         table_name: &str,
         uaid: &Uuid,
         timestamp: Option<u64>,

docker-compose.yml

@@ -6,6 +6,7 @@ services:
     environment:
       - LOCAL_HOSTNAME=localhost
       - ROUTER_HOSTNAME=autopush
+      - AWS_LOCAL_DYNAMODB=http://dynamodb:8000
       - HUMAN_LOGS=true
       - CRYPTO_KEY=${CRYPTO_KEY}
     ports:
@@ -22,6 +23,7 @@ services:
     environment:
       - HUMAN_LOGS=true
       - CRYPTO_KEY=${CRYPTO_KEY}
+      - AWS_LOCAL_DYNAMODB=http://dynamodb:8000
     ports:
       - "8082:8082"
     links:
@@ -30,5 +32,6 @@ services:
       - ./boto-compose.cfg:/etc/boto.cfg:ro
   dynamodb:
     image: peopleperhour/dynamodb
+    hostname: dynamodb
     expose:
       - "8000"