From 67d47fc932cb8f5a0c336dc773e0ebfa9ef9c46e Mon Sep 17 00:00:00 2001 From: Justin Hynes Date: Wed, 4 Sep 2024 19:01:41 +0000 Subject: [PATCH] feat!: remove demographics Snowflake cleanup job This job is no longer required as the Demographics IDA has been decommissioned. --- .../SnowflakeDemographicsCleanup.groovy | 53 ------------------- dataeng/jobs/createJobs.groovy | 3 -- .../snowflake-demographics-cleanup.sh | 28 ---------- 3 files changed, 84 deletions(-) delete mode 100644 dataeng/jobs/analytics/SnowflakeDemographicsCleanup.groovy delete mode 100644 dataeng/resources/snowflake-demographics-cleanup.sh diff --git a/dataeng/jobs/analytics/SnowflakeDemographicsCleanup.groovy b/dataeng/jobs/analytics/SnowflakeDemographicsCleanup.groovy deleted file mode 100644 index 5267473f4..000000000 --- a/dataeng/jobs/analytics/SnowflakeDemographicsCleanup.groovy +++ /dev/null @@ -1,53 +0,0 @@ -package analytics - -import static org.edx.jenkins.dsl.AnalyticsConstants.common_authorization -import static org.edx.jenkins.dsl.AnalyticsConstants.common_log_rotator -import static org.edx.jenkins.dsl.AnalyticsConstants.common_publishers -import static org.edx.jenkins.dsl.AnalyticsConstants.secure_scm_parameters -import static org.edx.jenkins.dsl.AnalyticsConstants.secure_scm - - -class SnowflakeDemographicsCleanup { - public static def job = { dslFactory, allVars -> - dslFactory.job("snowflake-demographics-cleanup") { - logRotator common_log_rotator(allVars) - authorization common_authorization(allVars) - parameters secure_scm_parameters(allVars) - parameters { - stringParam('ANALYTICS_TOOLS_URL', allVars.get('ANALYTICS_TOOLS_URL'), 'URL for the analytics tools repo.') - stringParam('ANALYTICS_TOOLS_BRANCH', allVars.get('ANALYTICS_TOOLS_BRANCH'), 'Branch of analytics tools repo to use.') - stringParam('NOTIFY', allVars.get('NOTIFY','$PAGER_NOTIFY'), 'Space separated list of emails to send notifications to.') - stringParam('PYTHON_VENV_VERSION', 'python3.7', 'Python virtual environment version to used.') - } - environmentVariables { - env('USER', allVars.get('USER')) - env('ACCOUNT', allVars.get('ACCOUNT')) - } - multiscm secure_scm(allVars) << { - git { - remote { - url('$ANALYTICS_TOOLS_URL') - branch('$ANALYTICS_TOOLS_BRANCH') - credentials('1') - } - extensions { - relativeTargetDirectory('analytics-tools') - pruneBranches() - cleanAfterCheckout() - } - } - } - triggers { - // Daily between 06:00 - 07:00 - cron('H 6 * * *') - } - wrappers { - timestamps() - } - publishers common_publishers(allVars) - steps { - shell(dslFactory.readFileFromWorkspace('dataeng/resources/snowflake-demographics-cleanup.sh')) - } - } - } -} diff --git a/dataeng/jobs/createJobs.groovy b/dataeng/jobs/createJobs.groovy index 11e01007a..bbb8801a9 100644 --- a/dataeng/jobs/createJobs.groovy +++ b/dataeng/jobs/createJobs.groovy @@ -9,7 +9,6 @@ import static analytics.JenkinsBackup.job as JenkinsBackupJob import static analytics.PipelineAcceptanceTestManual.job as PipelineAcceptanceTestManualJob import static analytics.PipelineAcceptanceTestMaster.job as PipelineAcceptanceTestMasterJob import static analytics.ReadReplicaExportToS3.job as ReadReplicaExportToS3Job -import static analytics.SnowflakeDemographicsCleanup.job as SnowflakeDemographicsCleanupJob import static analytics.SnowflakePublicGrantsCleaner.job as SnowflakePublicGrantsCleanerJob import static analytics.SnowflakeRefreshSnowpipe.job as SnowflakeRefreshSnowpipeJob import static analytics.SnowflakeReplicaImportFromS3.job as SnowflakeReplicaImportFromS3Job @@ -49,7 +48,6 @@ def taskMap = [ PIPELINE_ACCEPTANCE_TEST_MANUAL_JOB: PipelineAcceptanceTestManualJob, PIPELINE_ACCEPTANCE_TEST_MASTER_JOB: PipelineAcceptanceTestMasterJob, READ_REPLICA_EXPORT_TO_S3_JOB: ReadReplicaExportToS3Job, - SNOWFLAKE_DEMOGRAPHICS_CLEANUP_JOB: SnowflakeDemographicsCleanupJob, SNOWFLAKE_PUBLIC_GRANTS_CLEANER_JOB: SnowflakePublicGrantsCleanerJob, SNOWFLAKE_REFRESH_SNOWPIPE_JOB: SnowflakeRefreshSnowpipeJob, SNOWFLAKE_REPLICA_IMPORT_FROM_S3_JOB: SnowflakeReplicaImportFromS3Job, @@ -121,7 +119,6 @@ listView('Tools') { name('data_engineering_seed_job') name('stitch-snowflake-lag-monitor') name('snowflake-public-grants-cleaner') - name('snowflake-demographics-cleanup') } columns DEFAULT_VIEW.call() } diff --git a/dataeng/resources/snowflake-demographics-cleanup.sh b/dataeng/resources/snowflake-demographics-cleanup.sh deleted file mode 100644 index a1ff1046c..000000000 --- a/dataeng/resources/snowflake-demographics-cleanup.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -set -ex - -# Creating Python virtual env -PYTHON_VENV="python_venv" -virtualenv --python=$PYTHON_VENV_VERSION --clear "${PYTHON_VENV}" -source "${PYTHON_VENV}/bin/activate" - -# Setup -cd $WORKSPACE/analytics-tools/snowflake -make requirements - - -python3 secrets-manager.py -w -n analytics-secure/snowflake/rsa_key_stitch_loader.p8 -v rsa_key_stitch_loader -python3 secrets-manager.py -w -n analytics-secure/snowflake/rsa_key_passphrase_stitch_loader -v rsa_key_passphrase_stitch_loader - -unset KEY_PATH -unset PASSPHRASE_PATH - -python demographics_cleanup.py \ - --user "STITCH_LOADER" \ - --account "edx.us-east-1" \ - --key_file rsa_key_stitch_loader \ - --passphrase_file rsa_key_passphrase_stitch_loader - - -rm rsa_key_stitch_loader -rm rsa_key_passphrase_stitch_loader