fix tests and precommit

Author: kflemin

appfleet-config/appfleet.yml

@@ -14,7 +14,7 @@ git_source:
   path: /main
 
 tags:
-  billingId: "240024"
+  billingId: '240024'
   org: seedcerl
   owner: nlong
 
@@ -25,12 +25,9 @@ releases:
 
 host_name:
   $release_name:
-    prod:
-      ${self.project_handle}-${self.app_name}-${release_name}.stratus.nrel.gov
-    stage:
-      ${self.project_handle}-${self.app_name}-${release_name}.stratus.nrel.gov
-    dev:
-      ${self.project_handle}-${self.app_name}-${release_name}.stratus.nrel.gov
+    prod: ${self.project_handle}-${self.app_name}-${release_name}.stratus.nrel.gov
+    stage: ${self.project_handle}-${self.app_name}-${release_name}.stratus.nrel.gov
+    dev: ${self.project_handle}-${self.app_name}-${release_name}.stratus.nrel.gov
 
 target_groups:
   - name: ${self.project_handle}-${self.app_name}-${release_name}
@@ -55,12 +52,11 @@ target_groups:
       timeout: 60
       threshold_healthy: 2
       threshold_unhealthy: 5
-      http_healthy_status: "200,301,302,400"
+      http_healthy_status: '200,301,302,400'
 
 ecs_service:
   name: ${self.project_handle}-${self.app_name}-${release_name}
-  task_role:
-    ${self.project_handle}-${self.app_name}-ecstask-iam-role
+  task_role: ${self.project_handle}-${self.app_name}-ecstask-iam-role
   task_memory: 2048
   grace_period: 300
   task_execution_role: nrel-ops-ecs-generic-task-execution-role
@@ -91,24 +87,20 @@ ecs_service:
         dev: 0
 
 volumes:
-  - name: &host-media
-      seed_media
+  - name: &host-media seed_media
     host_path: /${self.project_handle}-${self.app_name}-${release_name}
 
 containers:
   - name: main
     image:
       $release_name:
-        dev:
-          991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-${self.project_handle}-${self.app_name}
-        stage:
-          991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-${self.project_handle}-${self.app_name}
-        prod:
-          991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-${self.project_handle}-${self.app_name}
+        dev: 991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-${self.project_handle}-${self.app_name}
+        stage: 991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-${self.project_handle}-${self.app_name}
+        prod: 991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-${self.project_handle}-${self.app_name}
     healthcheck:
       command:
-        - "CMD-SHELL"
-        - "curl -f http://localhost/api/health_check/ || exit 1"
+        - 'CMD-SHELL'
+        - 'curl -f http://localhost/api/health_check/ || exit 1'
       interval: 120
       retries: 3
       timeout: 60
@@ -126,13 +118,12 @@ containers:
         stage: 512
         prod: 1024
     port_map:
-      - "80:80"
+      - '80:80'
     volume_mounts:
       - volume_name: *host-media
         container_path: /seed/media
     secrets:
-      - name:
-          /nrel/ec2/${self.project_handle}_${self.app_name}/postgres/${self.data_class}/${release_name}/${self.project_handle}_${self.app_name}
+      - name: /nrel/ec2/${self.project_handle}_${self.app_name}/postgres/${self.data_class}/${release_name}/${self.project_handle}_${self.app_name}
         map:
           POSTGRES_USER: username
           POSTGRES_PASSWORD: password
@@ -146,12 +137,9 @@ containers:
   - name: celery
     image:
       $release_name:
-        dev:
-          991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-${self.project_handle}-${self.app_name}
-        stage:
-          991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-${self.project_handle}-${self.app_name}
-        prod:
-          991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-${self.project_handle}-${self.app_name}
+        dev: 991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-${self.project_handle}-${self.app_name}
+        stage: 991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-${self.project_handle}-${self.app_name}
+        prod: 991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-${self.project_handle}-${self.app_name}
     ssm_parameters:
       - /nrel/${self.project_handle}-${self.app_name}/${release_name}/
     cpu:
@@ -169,8 +157,7 @@ containers:
       - volume_name: *host-media
         container_path: /seed/media
     secrets:
-      - name:
-          /nrel/ec2/${self.project_handle}_${self.app_name}/postgres/${self.data_class}/${release_name}/${self.project_handle}_${self.app_name}
+      - name: /nrel/ec2/${self.project_handle}_${self.app_name}/postgres/${self.data_class}/${release_name}/${self.project_handle}_${self.app_name}
         map:
           POSTGRES_USER: username
           POSTGRES_PASSWORD: password

appfleet-config/docker-compose.deploy.yaml

@@ -1,9 +1,7 @@
 ---
-
 services:
   appfleet-pipeline:
-    image:
-      991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-appfleet-pipeline:${APPFLEET_DEPLOY_VERSION:-2.2.0-alpine-e1f2893}
+    image: 991404956194.dkr.ecr.us-west-2.amazonaws.com/nrel-appfleet-pipeline:${APPFLEET_DEPLOY_VERSION:-2.2.0-alpine-e1f2893}
     environment:
       - APPFLEET_TAG_OVERRIDES=${APPFLEET_TAG_OVERRIDES}
       - APPFLEET_RELEASE_NAME=${APPFLEET_RELEASE_NAME:-dev}

seed/audit_template/audit_template.py

@@ -380,6 +380,7 @@ def update_export_results(self, view_id, results, status, **extra_fields):
         results[status]["count"] += 1
         results[status]["details"].append({"view_id": view_id, **extra_fields})
 
+
 def _build_address(em, state):
     if state.address_line_1 and state.city and state.state:
         the_xml = em.Address(

seed/tests/test_audit_template.py

@@ -175,7 +175,7 @@ def test_build_xml_from_property(self):
         # property missing required fields
         self.assertIsNone(response3[0])
         messages = response3[1]
-        exp_error = f"Validation Error. {self.state3.pm_property_id} must have address_line_1, property_name"
+        exp_error = f"Validation Error. {self.state3.pm_property_id} must have property_name"
         self.assertEqual("error", messages[0])
         self.assertEqual(exp_error, messages[1])
 
@@ -360,7 +360,7 @@ def test_export_to_audit_template(self, mock_request):
         # invalid property
         response, messages = at.export_to_audit_template(self.state3, token)
         self.assertIsNone(response)
-        exp = ["error", f"Validation Error. {self.state3.pm_property_id} must have address_line_1, property_name"]
+        exp = ["error", f"Validation Error. {self.state3.pm_property_id} must have property_name"]
         self.assertEqual(exp, messages)
 
         # valid property
@@ -428,7 +428,7 @@ def test_batch_export_to_audit_template(self, mock_request):
         self.assertEqual("2222", self.state2.audit_template_building_id)
 
         details = error["details"]
-        exp = f"Validation Error. {self.state3.pm_property_id} must have address_line_1, property_name"
+        exp = f"Validation Error. {self.state3.pm_property_id} must have property_name"
         self.assertEqual(self.view3.id, details[0]["view_id"])
         self.assertEqual(exp, details[0]["message"])
         self.assertIsNone(self.state3.audit_template_building_id)