Commit 1acf2dbb by Ashley Penney

Use a dictionary for all the pearson stuff to keep the auth/env stuff

clean.
parent 1d13b1a9
...@@ -5,6 +5,7 @@ from django.core.management.base import BaseCommand, CommandError ...@@ -5,6 +5,7 @@ from django.core.management.base import BaseCommand, CommandError
import re import re
from dogapi import dog_http_api, dog_stats_api from dogapi import dog_http_api, dog_stats_api
import paramiko import paramiko
import boto
dog_http_api.api_key = settings.DATADOG_API dog_http_api.api_key = settings.DATADOG_API
...@@ -24,11 +25,11 @@ class Command(BaseCommand): ...@@ -24,11 +25,11 @@ class Command(BaseCommand):
for mode in args: for mode in args:
if mode == 'export': if mode == 'export':
sftp(settings.PEARSON_LOCAL_IMPORT, settings.PEARSON_SFTP_IMPORT) sftp(settings.PEARSON[LOCAL_IMPORT], settings.PEARSON[SFTP_IMPORT])
s3(settings.PEARSON_LOCAL, settings.PEARSON_BUCKET) s3(settings.PEARSON_LOCAL, settings.PEARSON[BUCKET])
elif mode == 'import': elif mode == 'import':
sftp(settings.PEARSON_SFTP_EXPORT, settings.PEARSON_LOCAL_EXPORT) sftp(settings.PEARSON[SFTP_EXPORT], settings.PEARSON[LOCAL_EXPORT])
s3(settings.PEARSON_LOCAL_EXPORT, settings.PEARSON_BUCKET) s3(settings.PEARSON[LOCAL_EXPORT], settings.PEARSON[BUCKET])
else: else:
print("ERROR: Mode must be export or import.") print("ERROR: Mode must be export or import.")
...@@ -66,7 +67,8 @@ class Command(BaseCommand): ...@@ -66,7 +67,8 @@ class Command(BaseCommand):
""" """
Upload file to S3 Upload file to S3
""" """
s3 = boto.connect_s3() s3 = boto.connect_s3(settings.AWS_ACCESS_KEY_ID,
settings.AWS_SECRET_ACCESS_KEY)
from boto.s3.key import Key from boto.s3.key import Key
b = s3.get_bucket(bucket) b = s3.get_bucket(bucket)
k = Key(b) k = Key(b)
......
...@@ -48,12 +48,12 @@ class Command(BaseCommand): ...@@ -48,12 +48,12 @@ class Command(BaseCommand):
# Name will use timestamp -- this is UTC, so it will look funny, # Name will use timestamp -- this is UTC, so it will look funny,
# but it should at least be consistent with the other timestamps # but it should at least be consistent with the other timestamps
# used in the system. # used in the system.
if not os.path.isdir(settings.PEARSON_LOCAL_EXPORT): if not os.path.isdir(settings.PEARSON[LOCAL_EXPORT]):
os.makedirs(settings.PEARSON_LOCAL_EXPORT) os.makedirs(settings.PEARSON[LOCAL_EXPORT])
destfile = os.path.join(settings.PEARSON_LOCAL_EXPORT, destfile = os.path.join(settings.PEARSON[LOCAL_EXPORT],
uploaded_at.strftime("cdd-%Y%m%d-%H%M%S.dat")) uploaded_at.strftime("cdd-%Y%m%d-%H%M%S.dat"))
else: else:
destfile = os.path.join(settings.PEARSON_LOCAL_EXPORT, destfile = os.path.join(settings.PEARSON[LOCAL_EXPORT],
uploaded_at.strftime("cdd-%Y%m%d-%H%M%S.dat")) uploaded_at.strftime("cdd-%Y%m%d-%H%M%S.dat"))
......
...@@ -50,12 +50,12 @@ class Command(BaseCommand): ...@@ -50,12 +50,12 @@ class Command(BaseCommand):
# Name will use timestamp -- this is UTC, so it will look funny, # Name will use timestamp -- this is UTC, so it will look funny,
# but it should at least be consistent with the other timestamps # but it should at least be consistent with the other timestamps
# used in the system. # used in the system.
if not os.path.isdir(settings.PEARSON_LOCAL_EXPORT): if not os.path.isdir(settings.PEARSON[LOCAL_EXPORT]):
os.makedirs(settings.PEARSON_LOCAL_EXPORT) os.makedirs(settings.PEARSON[LOCAL_EXPORT])
destfile = os.path.join(settings.PEARSON_LOCAL_EXPORT, destfile = os.path.join(settings.PEARSON[LOCAL_EXPORT],
uploaded_at.strftime("ead-%Y%m%d-%H%M%S.dat")) uploaded_at.strftime("ead-%Y%m%d-%H%M%S.dat"))
else: else:
destfile = os.path.join(settings.PEARSON_LOCAL_EXPORT, destfile = os.path.join(settings.PEARSON[LOCAL_EXPORT],
uploaded_at.strftime("ead-%Y%m%d-%H%M%S.dat")) uploaded_at.strftime("ead-%Y%m%d-%H%M%S.dat"))
dump_all = kwargs['dump_all'] dump_all = kwargs['dump_all']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment