IGVF-1334-fix-conflicting-indexing-scalers

.pre-commit-config.yaml

@@ -10,6 +10,8 @@ repos:
       - id: double-quote-string-fixer
       - id: trailing-whitespace
       - id: end-of-file-fixer
+        exclude: ^(cdk)/tests/unit/snapshots
       - id: pretty-format-json
         args: ['--autofix', '--no-sort-keys', '--indent=4', '--no-ensure-ascii']
+        exclude: ^(cdk)/tests/unit/snapshots
       - id: check-yaml

cdk/infrastructure/constructs/indexer.py

@@ -125,9 +125,11 @@ def __init__(
         self._define_opensearch()
         self._define_docker_assets()
         self._define_invalidation_service()
+        self._remove_cpu_scaling_from_invalidation_service()
         self._allow_invalidation_service_to_write_to_invalidation_queue()
         self._define_portal_credentials()
         self._define_indexing_service()
+        self._remove_cpu_scaling_from_indexing_service()
         self._allow_invalidation_service_to_connect_to_opensearch()
         self._allow_indexing_service_to_connect_to_opensearch()
         self._add_alarms_to_invalidation_service()
@@ -177,6 +179,15 @@ def _define_invalidation_service(self) -> None:
             ),
         )
 
+    def _remove_cpu_scaling_from_invalidation_service(self) -> None:
+        self.invalidation_service.service.node.find_child(
+            'TaskCount'
+        ).node.find_child(
+            'Target'
+        ).node.try_remove_child(
+            'CpuScaling'
+        )
+
     def _allow_invalidation_service_to_write_to_invalidation_queue(self) -> None:
         self.props.invalidation_queue.queue.grant_send_messages(
             self.invalidation_service.task_definition.task_role
@@ -226,6 +237,15 @@ def _define_indexing_service(self) -> None:
             ),
         )
 
+    def _remove_cpu_scaling_from_indexing_service(self) -> None:
+        self.indexing_service.service.node.find_child(
+            'TaskCount'
+        ).node.find_child(
+            'Target'
+        ).node.try_remove_child(
+            'CpuScaling'
+        )
+
     def _allow_invalidation_service_to_connect_to_opensearch(self) -> None:
         self.invalidation_service.service.connections.allow_to(
             self.opensearch.domain,

cdk/requirements-dev.txt

@@ -3,3 +3,4 @@ pytest-instafail==0.4.2
 pytest-mock==2.0.0
 pytest-cov==2.8.1
 mypy==0.950
+pytest-snapshot==0.9.0