Cleanup on dev/prod environment

.github/workflows/cd-workflow.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches: 
     - "master"
+    - "submission"
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -33,10 +34,11 @@ jobs:
         DYNACONF_DB_API: ${{ secrets.db_api }}
         DYNACONF_DB_NAME: ${{ secrets.db_name }}
         DYNACONF_DB_CONN_NAME: ${{ secrets.db_conn_name }}
-        DYNACONF_GITHUB_CLIENT_SECRET: ${{ client_secret }}
-        DYNACONF_GITHUB_CLIENT_ID: ${{ client_id }
-        DYNACONF_GITHUB_URI_USER: "https://github.com/login/oauth/access_token"
-        DYNACONF_GITHUB_URI_OAUTH: "https://api.github.com/user"
+        DYNACONF_GITHUB_CLIENT_SECRET: ${{ secrets.client_secret }}
+        DYNACONF_GITHUB_CLIENT_ID: ${{ secrets.client_id }}
+        DYNACONF_GITHUB_URI_OAUTH: https://github.com/login/oauth/access_token
+        DYNACONF_GITHUB_URI_USER: https://api.github.com/user
+        DYNACONF_FLASK_SECRET: ${{ secrets.flask_secret }}
       run: env | grep DYNACONF_ > .env
     - name: Deploy to GCP AppEngine
       uses: actions/gcloud/cli@master

connectors/exercism/populate.py

@@ -16,8 +16,8 @@ def get_or_create_default_user(db_session):
                              name="exercism.io",
                              nickname="exercism",
                              is_teacher=True,
-                             github_token="",
-                             token="")
+                             github_token="sample-github-token",
+                             token="sample-github-token")
         db_session.add(exercism_user)
         db_session.flush()
         return exercism_user

db/helpers.py

@@ -3,36 +3,34 @@
 from models import Base
 
 
-def create_schema(api, username, password, name, conn_name=None, echo=False):
-    unix_socket = f'/cloudsql/{conn_name}'
-    engine = create_engine(
-        url.URL(
-            drivername=api,
-            username=username,
-            password=password,
-            database=name,
-            query={
-                'host': unix_socket
-            }),
-        client_encoding="utf8",
-        echo=echo)
+def create_db_uri(api, username, password, name, conn_name,
+                  production):
+    if production:
+        unix_socket = f'/cloudsql/{conn_name}'
+        db_uri = url.URL(drivername=api, username=username, password=password,
+                         database=name, query={'host': unix_socket})
 
+    else:
+        db_uri = url.URL(drivername=api, username=username, host="localhost",
+                         password=password, database=name)
+
+    return db_uri
+
+
+def create_schema(api, username, password, name,
+                  conn_name=None, echo=False, production=False):
+    db_uri = create_db_uri(api, username, password,
+                           name, conn_name, production)
+
+    engine = create_engine(db_uri, client_encoding="utf8", echo=echo)
     return Base.metadata.create_all(engine)
 
 
-def database_setup(api, username, password, name, conn_name=None, echo=False):
-    unix_socket = f'/cloudsql/{conn_name}'
-    engine = create_engine(
-        url.URL(
-            drivername=api,
-            username=username,
-            password=password,
-            database=name,
-            query={
-                'host': unix_socket
-            }),
-        client_encoding="utf8",
-        echo=echo)
+def database_setup(api, username, password, name, conn_name=None,
+                   echo=False, production=False):
 
+    db_uri = create_db_uri(api, username, password,
+                           name, conn_name, production)
+    engine = create_engine(db_uri, client_encoding="utf8", echo=echo)
     sess = orm.sessionmaker(bind=engine)
     return sess()