Merge c7c218d into 11c9ff3

chalicelib/check_setup.json

@@ -1610,6 +1610,19 @@
             }
         }
     },
+    "deploy_cgap_production": {
+        "title": "Deploy CGAP-portal master to the cgap production environment",
+        "group": "Deployment Checks",
+        "schedule": {
+            "deployment_checks": {
+                "data": {
+                    "kwargs": {
+                        "primary": true
+                    }
+                }
+            }
+        }
+    },
     "deploy_ff_staging": {
         "title": "Deploy Fourfront master to staging.4dnucleome.org",
         "group": "Deployment Checks",

chalicelib/checks/deployment_checks.py

@@ -13,7 +13,7 @@
     FF_ENV_INDEXER, CGAP_ENV_INDEXER, is_fourfront_env, is_cgap_env,
 
 )
-from dcicutils.beanstalk_utils import compute_ff_prd_env
+from dcicutils.beanstalk_utils import compute_cgap_prd_env, compute_ff_prd_env
 from dcicutils.beanstalk_utils import beanstalk_info, is_indexing_finished
 
 
@@ -216,21 +216,47 @@ def deploy_application_to_beanstalk(connection, **kwargs):
     return _deploy_application_to_beanstalk(connection, **kwargs)
 
 
-@check_function()
-def deploy_ff_staging(connection, **kwargs):
-    """ Deploys Fourfront master to whoever staging is.
-        Runs as part of the 'deployment_checks' schedule on data ONLY.
+def deploy_env(connection, env_to_deploy, application_name, check, **kwargs):
+    """ For a given beanstalk environment, with a configured check json and given application name,
+        deploys the environment, or returns an error.
     """
-    this_check = CheckResult(connection, 'deploy_ff_staging')
-    env_to_deploy = compute_ff_stg_env()
+    this_check = CheckResult(connection, check)
     helper_check = _deploy_application_to_beanstalk(connection,
                                                     env=env_to_deploy,
-                                                    branch='master')
+                                                    branch='master',
+                                                    **kwargs)
     if helper_check.status == 'PASS':
         this_check.status = 'PASS'
-        this_check.summary = 'Successfully deployed Fourfront master to %s' % env_to_deploy
+        this_check.summary = ('Successfully deployed {what} master to {where}'
+                              .format(what=application_name, where=env_to_deploy))
     else:
         this_check.status = 'ERROR'
         this_check.summary = 'Error occurred during deployment, see full_output'
         this_check.full_output = helper_check.summary  # should have error message
     return this_check
+
+
+@check_function()
+def deploy_ff_staging(connection, **kwargs):
+    """ Deploys Fourfront master to whoever staging is.
+        Runs as part of the 'deployment_checks' schedule on data ONLY.
+    """
+    return deploy_env(
+        connection,
+        env_to_deploy=compute_ff_stg_env(),
+        application_name="Fourfront",
+        check='deploy_ff_staging',
+        **kwargs)
+
+
+@check_function()
+def deploy_cgap_production(connection, **kwargs):
+    """ Deploys CGAP portal master to production environment.
+        Eventually, this ought to be deprecated in favor of a staging deploy.
+    """
+    return deploy_env(
+        connection,
+        env_to_deploy=compute_cgap_prd_env(),
+        application_name="CGAP Portal",
+        check='deploy_cgap_production',
+        **kwargs)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "foursight"
-version = "0.11.7"
+version = "0.11.8"
 description = "Serverless Chalice Application for Monitoring"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"