Merge pull request #37 from acm-uiuc/rename_yaml_keys

Ruby services cleanup

Author: sameetandpotatoes

docker-compose.yml

@@ -97,7 +97,7 @@ services:
   groot-recruiters-service:
     build: groot-recruiters-service
     ports:
-      - "3000:3000"
+      - "4567:4567"
     depends_on:
       - db
       - groot-api-gateway

scripts/database_setup.sql

@@ -1,11 +1,10 @@
-CREATE DATABASE IF NOT EXISTS groot_caffeine_service_dev;
 CREATE DATABASE IF NOT EXISTS groot_credits_service;
 CREATE DATABASE IF NOT EXISTS groot_gigs_service;
 CREATE DATABASE IF NOT EXISTS groot_meme_service;
-CREATE DATABASE IF NOT EXISTS groot_merch_service_dev;
-CREATE DATABASE IF NOT EXISTS groot_quote_service_dev;
-CREATE DATABASE IF NOT EXISTS groot_recruiter_service_dev;
-CREATE DATABASE IF NOT EXISTS groot_user_service_dev;
+CREATE DATABASE IF NOT EXISTS groot_merch_service;
+CREATE DATABASE IF NOT EXISTS groot_quote_service;
+CREATE DATABASE IF NOT EXISTS groot_recruiter_service;
+CREATE DATABASE IF NOT EXISTS groot_user_service;
 CREATE USER 'root'@'%' IDENTIFIED BY 'root';
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
 FLUSH PRIVILEGES;

scripts/docker_settings_init.sh

@@ -60,11 +60,11 @@ merch_pi:
     access_key: 'INSERT_TOKEN_HERE'
     ip_address: 'INSERT_IPADDRESS'
 
-development:  
+database:  
   user: root
   password: root
   hostname: db
-  name: groot_merch_service_dev"
+  name: groot_merch_service"
 echo "$merch_secrets" > groot-merch-service/config/secrets.yaml
 
 ##### SETUP QUOTES #####
@@ -73,11 +73,11 @@ quotes_secrets="groot:
   access_key: 'GROOT_ACCESS_KEY'
   host: 'http://groot-api-gateway:8000'
 
-development:  
+database:  
   user: root
   password: root
   hostname: db
-  name: groot_quote_service_dev"
+  name: groot_quote_service"
 
 echo "$quotes_secrets" > groot-quotes-service/config/secrets.yaml
 
@@ -88,17 +88,24 @@ recruiters_secrets="aws:
     secret_access_key: ''
 
 groot:
-    access_key: 'INSERT_TOKEN_HERE'
+    access_key: 'GROOT_ACCESS_KEY'
     host: 'http://groot-api-gateway:8000'
 
 jwt:
   secret: 'SECRET_JWT_TOKEN'
 
-development:  
+database:  
+  user: root
+  password: root
+  hostname: db
+  name: groot_recruiter_service
+
+test_database:  
   user: root
   password: root
   hostname: db
-  name: groot_recruiter_service_dev"
+  name: groot_recruiter_service_test"
+  
 echo "$recruiters_secrets" > groot-recruiters-service/config/secrets.yaml
 
 ##### SETUP USERS #####
@@ -107,11 +114,11 @@ users_secrets="groot:
   access_key: 'GROOT_ACCESS_KEY'
   host: 'http://groot-api-gateway:8000'
 
-development:  
+database:  
   user: root
   password: root
   hostname: db
-  name: groot_user_service_dev"
+  name: groot_user_service"
 echo "$users_secrets" > groot-users-service/config/secrets.yaml
 
 ##### SETUP DESKTOP #####
@@ -136,7 +143,6 @@ import (
     \"github.com/acm-uiuc/arbor/security\"
 )
 
-const RecruiterToken string = \"\"
 const AuthPrefix = \"Basic \"
 const AuthURL string = \"http://groot-auth-stub-service:8008\"
 const AuthToken string = \"\"