Skip to content

Commit 4f6faa2

Browse files
committed
Refactor dag
- Separate gencon_index to it's own project - Replace literal paths and URL's to environment variables
1 parent 6ab4883 commit 4f6faa2

File tree

13 files changed

+36
-654
lines changed

13 files changed

+36
-654
lines changed

cob_datapipeline/gencon_ingest_dag.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525

2626
SCHEDULE_INTERVAL = Variable.get("GENCON_INDEX_SCHEDULE_INTERVAL")
2727

28+
GENCON_INDEX_VERSION = Variable.get("GENCON_INDEX_VERSION")
29+
GENCON_INDEX_PATH = Variable.get("GENCON_INDEX_PATH")
30+
GENCON_TEMP_PATH = Variable.get("GENCON_TEMP_PATH")
31+
GENCON_CSV_S3 = Variable.get("GENCON_CSV_S3")
32+
2833
# Get S3 data bucket variables
2934
AIRFLOW_S3 = BaseHook.get_connection("AIRFLOW_S3")
3035
AIRFLOW_DATA_BUCKET = Variable.get("AIRFLOW_DATA_BUCKET")
@@ -69,7 +74,11 @@
6974
"AWS_ACCESS_KEY_ID": AIRFLOW_S3.login,
7075
"AWS_SECRET_ACCESS_KEY": AIRFLOW_S3.password,
7176
"BUCKET": AIRFLOW_DATA_BUCKET,
77+
"GIT_BRANCH": GENCON_INDEX_VERSION,
7278
"HOME": AIRFLOW_USER_HOME,
79+
"GENCON_INDEX_PATH": GENCON_INDEX_PATH,
80+
"GENCON_TEMP_PATH": GENCON_TEMP_PATH,
81+
"GENCON_CSV_S3": GENCON_CSV_S3,
7382
"SOLR_AUTH_USER": SOLR_CONN.login if SOLR_CONN.login else "",
7483
"SOLR_AUTH_PASSWORD": SOLR_CONN.password if SOLR_CONN.password else "",
7584
"SOLR_WEB_URL": tasks.get_solr_url(SOLR_CONN, CONFIGSET),

cob_datapipeline/scripts/gencon_dags/.bundle/config

Lines changed: 0 additions & 3 deletions
This file was deleted.

cob_datapipeline/scripts/gencon_dags/.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

cob_datapipeline/scripts/gencon_dags/Gemfile

Lines changed: 0 additions & 26 deletions
This file was deleted.

cob_datapipeline/scripts/gencon_dags/Gemfile.lock

Lines changed: 0 additions & 127 deletions
This file was deleted.

cob_datapipeline/scripts/gencon_dags/README.md

Lines changed: 0 additions & 52 deletions
This file was deleted.

cob_datapipeline/scripts/gencon_dags/csv2solr

Lines changed: 0 additions & 161 deletions
This file was deleted.

0 commit comments

Comments
 (0)