Feature/issue 161 - Remove obscure_data option from load data lambdas…

… before OPS loading (#166) * Move obscure_data option to environment variable for load granule operations * Add to issue to changelog * Fix granule_handler lambda definition
podaac · Apr 18, 2024 · 431aed7 · 431aed7
1 parent faffb33
commit 431aed7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Issue 21 - Create tutorial documentation
  - Issue 142 - Add fields to support OPS monitoring and set up indexes to query on them
 ### Changed
+ - Issue 161 - Remove obscure_data option from load data lambdas before OPS loading, add environment variable.
 ### Deprecated 
 ### Removed
 ### Fixed

diff --git a/hydrocron/db/load_data.py b/hydrocron/db/load_data.py
@@ -40,7 +40,6 @@ def lambda_handler(event, _): # noqa: E501 # pylint: disable=W0613
  table_name = event['body']['table_name']
  start_date = event['body']['start_date']
  end_date = event['body']['end_date']
- obscure_data = event['body']['obscure_data']
  load_benchmarking_data = event['body']['load_benchmarking_data']
 
  match table_name:
@@ -70,7 +69,6 @@ def lambda_handler(event, _): # noqa: E501 # pylint: disable=W0613
 
  if feature_type in granule_path:
  event2 = ('{"body": {"granule_path": "' + granule_path
- + '","obscure_data": "' + obscure_data
  + '","table_name": "' + table_name
  + '","load_benchmarking_data": "' + load_benchmarking_data + '"}}')
 
@@ -87,8 +85,8 @@ def granule_handler(event, _):
  Second Lambda entrypoint for loading individual granules
  """
  granule_path = event['body']['granule_path']
- obscure_data = event['body']['obscure_data']
  table_name = event['body']['table_name']
+
  load_benchmarking_data = event['body']['load_benchmarking_data']
 
  if ("Reach" in granule_path) & (table_name != constants.SWOT_REACH_TABLE_NAME):
@@ -99,6 +97,9 @@ def granule_handler(event, _):
 
  logging.info("Value of load_benchmarking_data is: %s", load_benchmarking_data)
 
+ obscure_data = "true" in os.getenv("OBSCURE_DATA").lower()
+ logging.info("Value of obscure_data is: %s", obscure_data)
+
  if load_benchmarking_data == "True":
  logging.info("Loading benchmarking data")
  items = swot_reach_node_shp.load_benchmarking_data()
@@ -119,7 +120,6 @@ def cnm_handler(event, _):
  """
  Unpacks CNM-R message and invokes granule_load lambda
  """
- obscure_data = "False"
  load_benchmarking_data = "False"
 
  lambda_client = boto3.client('lambda')
@@ -136,7 +136,6 @@ def cnm_handler(event, _):
 
  if 'Reach' in granule_uri:
  event2 = ('{"body": {"granule_path": "' + granule_uri
- + '","obscure_data": "' + obscure_data
  + '","table_name": "' + constants.SWOT_REACH_TABLE_NAME
  + '","load_benchmarking_data": "' + load_benchmarking_data + '"}}')
 
@@ -149,7 +148,6 @@ def cnm_handler(event, _):
 
  if 'Node' in granule_uri:
  event2 = ('{"body": {"granule_path": "' + granule_uri
- + '","obscure_data": "' + obscure_data
  + '","table_name": "' + constants.SWOT_NODE_TABLE_NAME
  + '","load_benchmarking_data": "' + load_benchmarking_data + '"}}')
 

diff --git a/terraform/hydrocron-lambda.tf b/terraform/hydrocron-lambda.tf
@@ -120,6 +120,11 @@ resource "aws_lambda_function" "hydrocron_lambda_load_granule" {
  security_group_ids = data.aws_security_groups.vpc_default_sg.ids
  }
  tags = var.default_tags
+ environment {
+ variables = {
+ OBSCURE_DATA = "false"
+ }
+ }
 }
 
 resource "aws_lambda_function" "hydrocron_lambda_cnm" {