preferred approach - name AWS env in the format <service>_AWS_ACCESS_…

…KEY_ID <service>_AWS_SECRET_ACCESS_KEY
obi-a · Jan 27, 2018 · ce7482c · ce7482c
1 parent 404b531
commit ce7482c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/.env.examples b/.env.examples
@@ -28,7 +28,7 @@ RAGIOS_ENV=production
 # AWS SES credentials
 # https://docs.aws.amazon.com/ses/latest/DeveloperGuide/regions.html
 # use the API (HTTPS) endpoint
-AWS_SES_ACCESS_KEY_ID=
-AWS_SES_SECRET_ACCESS_KEY=
+SES_AWS_ACCESS_KEY_ID=
+SES_AWS_SECRET_ACCESS_KEY=
 AWS_SES_SEND_FROM=
 AWS_SES_ENDPOINT=
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -20,8 +20,8 @@ services:
       RAGIOS_WEB_SERVER_ENV: production
       RAGIOS_ENV: production
       RAGIOS_LOG_LEVEL: debug
-      AWS_SES_ACCESS_KEY_ID:
-      AWS_SES_SECRET_ACCESS_KEY:
+      SES_AWS_ACCESS_KEY_ID:
+      SES_AWS_SECRET_ACCESS_KEY:
       AWS_SES_SEND_FROM:
       AWS_SES_ENDPOINT:
       RAGIOS_ADMIN_USERNAME:
@@ -51,8 +51,8 @@ services:
       RAGIOS_WORKERS_PUSHER_ADDRESS: '0.0.0.0'
       RAGIOS_ENV: production
       RAGIOS_LOG_LEVEL: debug
-      AWS_SES_ACCESS_KEY_ID:
-      AWS_SES_SECRET_ACCESS_KEY:
+      SES_AWS_ACCESS_KEY_ID:
+      SES_AWS_SECRET_ACCESS_KEY:
       AWS_SES_SEND_FROM:
       AWS_SES_ENDPOINT:
       COUCHDB_ADMIN_USERNAME:
@@ -80,8 +80,8 @@ services:
       RAGIOS_NOTIFICATIONS_RECEIVER_ADDRESS: notifications
       RAGIOS_ENV: production
       RAGIOS_LOG_LEVEL: debug
-      AWS_SES_ACCESS_KEY_ID:
-      AWS_SES_SECRET_ACCESS_KEY:
+      SES_AWS_ACCESS_KEY_ID:
+      SES_AWS_SECRET_ACCESS_KEY:
       AWS_SES_SEND_FROM:
       AWS_SES_ENDPOINT:
       COUCHDB_ADMIN_USERNAME:
@@ -120,8 +120,8 @@ services:
       RAGIOS_EVENTS_RECEIVER_ADDRESS: events
       RAGIOS_ENV: production
       RAGIOS_LOG_LEVEL: debug
-      AWS_SES_ACCESS_KEY_ID:
-      AWS_SES_SECRET_ACCESS_KEY:
+      SES_AWS_ACCESS_KEY_ID:
+      SES_AWS_SECRET_ACCESS_KEY:
       AWS_SES_SEND_FROM:
       AWS_SES_ENDPOINT:
       COUCHDB_ADMIN_USERNAME:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,8 +20,8 @@ services:
       RAGIOS_WEB_SERVER_ENV: production
       RAGIOS_ENV: production
       RAGIOS_LOG_LEVEL: info
-      AWS_SES_ACCESS_KEY_ID:
-      AWS_SES_SECRET_ACCESS_KEY:
+      SES_AWS_ACCESS_KEY_ID:
+      SES_AWS_SECRET_ACCESS_KEY:
       AWS_SES_SEND_FROM:
       AWS_SES_ENDPOINT:
       RAGIOS_ADMIN_USERNAME:
@@ -49,8 +49,8 @@ services:
       RAGIOS_WORKERS_PUSHER_ADDRESS: '0.0.0.0'
       RAGIOS_ENV: production
       RAGIOS_LOG_LEVEL: info
-      AWS_SES_ACCESS_KEY_ID:
-      AWS_SES_SECRET_ACCESS_KEY:
+      SES_AWS_ACCESS_KEY_ID:
+      SES_AWS_SECRET_ACCESS_KEY:
       AWS_SES_SEND_FROM:
       AWS_SES_ENDPOINT:
       COUCHDB_ADMIN_USERNAME:
@@ -76,8 +76,8 @@ services:
       RAGIOS_NOTIFICATIONS_RECEIVER_ADDRESS: notifications
       RAGIOS_ENV: production
       RAGIOS_LOG_LEVEL: info
-      AWS_SES_ACCESS_KEY_ID:
-      AWS_SES_SECRET_ACCESS_KEY:
+      SES_AWS_ACCESS_KEY_ID:
+      SES_AWS_SECRET_ACCESS_KEY:
       AWS_SES_SEND_FROM:
       AWS_SES_ENDPOINT:
       COUCHDB_ADMIN_USERNAME:
@@ -112,8 +112,8 @@ services:
       RAGIOS_EVENTS_RECEIVER_ADDRESS: events
       RAGIOS_ENV: production
       RAGIOS_LOG_LEVEL: info
-      AWS_SES_ACCESS_KEY_ID:
-      AWS_SES_SECRET_ACCESS_KEY:
+      SES_AWS_ACCESS_KEY_ID:
+      SES_AWS_SECRET_ACCESS_KEY:
       AWS_SES_SEND_FROM:
       AWS_SES_ENDPOINT:
       COUCHDB_ADMIN_USERNAME:

diff --git a/lib/ragios/notifiers/ses.rb b/lib/ragios/notifiers/ses.rb
@@ -10,8 +10,8 @@ class Ses
 
       def initialize
         @aws_credentials = {
-          access_key: ENV['AWS_SES_ACCESS_KEY_ID'],
-          secret_key: ENV['AWS_SES_SECRET_ACCESS_KEY'],
+          access_key: ENV['SES_AWS_ACCESS_KEY_ID'],
+          secret_key: ENV['SES_AWS_SECRET_ACCESS_KEY'],
           endpoint: ENV['AWS_SES_ENDPOINT'],
           send_from: ENV['AWS_SES_SEND_FROM']
         }