bugfixes, doc

lifemapper · Oct 3, 2024 · acbe263 · acbe263
1 parent 8b558ed
commit acbe263
Show file tree

Hide file tree

Showing 16 changed files with 423 additions and 724 deletions.
diff --git a/_sphinx_config/pages/aws/roles.rst b/_sphinx_config/pages/aws/roles.rst
@@ -29,19 +29,19 @@ Attach to BISON namespace (Redshift)
   * TODO: change to Redshift - Scheduler when automated
 
 {
-	"Version": "2012-10-17",
-	"Statement": [
-		{
-			"Effect": "Allow",
-			"Action": [
-				"lambda:InvokeFunction"
-			],
-			"Resource": [
-				"arn:aws:lambda:us-east-1:321942852011:function:bison_s0_test_schedule:*",
-				"arn:aws:lambda:us-east-1:321942852011:function:bison_s0_test_schedule"
-			]
-		}
-	]
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": [
+                "lambda:InvokeFunction"
+            ],
+            "Resource": [
+                "arn:aws:lambda:us-east-1:321942852011:function:bison_s0_test_schedule:*",
+                "arn:aws:lambda:us-east-1:321942852011:function:bison_s0_test_schedule"
+            ]
+        }
+    ]
 }
 
 bison_redshift_lambda_role

diff --git a/aws/events/bison_s0_resolve_riis_lambda.py b/aws/events/bison_s0_resolve_riis_lambda.py
@@ -27,7 +27,6 @@
 # Initialize Redshift client
 config = Config(connect_timeout=timeout, read_timeout=timeout)
 client_ec2 = session.client("ec2", config=config)
-# ec2 = boto3.client('ec2', region_name=region)
 
 
 # --------------------------------------------------------------------------------------
@@ -40,9 +39,6 @@ def lambda_handler(event, context):
 
     Returns:
         instance_id (number): ID of the EC2 instance started.
-
-    Raises:
-        Exception: on failure to start the EC2 instance
     """
     instance = client_ec2.run_instances(
         # ImageId=AMI,

diff --git a/aws/events/bison_s5_aggregate_region_lambda.py b/aws/events/bison_s5_aggregate_region_lambda.py
@@ -113,26 +113,24 @@
 state_aggregate_stmt = f"""
     CREATE TABLE {pub_schema}.{state_aggregate_tbl} AS
         SELECT DISTINCT {b_st_fld}, {b_ass_fld},
-            COUNT(*) AS {out_occcount_fld}, 
+            COUNT(*) AS {out_occcount_fld},
             COUNT(DISTINCT {gbif_tx_fld}) AS {out_spcount_fld}
         FROM  {bison_tbl} WHERE {b_st_fld} IS NOT NULL
         GROUP BY {b_st_fld}, {b_ass_fld};
 """
-state_agg_export_stmt = f"""
-"""
 # Note: in county agggregate, include states bc county names are not unique
 county_aggregate_stmt = f"""
     CREATE TABLE public.{county_aggregate_tbl} AS
         SELECT DISTINCT {b_stcty_fld}, {b_cty_fld}, {b_st_fld}, {b_ass_fld},
-            COUNT(*) AS {out_occcount_fld}, 
+            COUNT(*) AS {out_occcount_fld},
             COUNT(DISTINCT {gbif_tx_fld}) AS {out_spcount_fld}
         FROM  {bison_tbl} WHERE {b_st_fld} IS NOT NULL
         GROUP BY {b_stcty_fld}, {b_cty_fld}, {b_st_fld}, {b_ass_fld};
 """
 aiannh_aggregate_stmt = f"""
     CREATE TABLE {pub_schema}.{aiannh_aggregate_tbl} AS
         SELECT DISTINCT {b_nm_fld}, {b_ass_fld},
-            COUNT(*) AS {out_occcount_fld}, 
+            COUNT(*) AS {out_occcount_fld},
             COUNT(DISTINCT {gbif_tx_fld}) AS {out_spcount_fld}
         FROM  {bison_tbl} WHERE {b_nm_fld} IS NOT NULL
         GROUP BY {b_nm_fld}, {b_ass_fld};