Refactor stacks related to input SNS

In preparation for dispatch related stacks
Sage-Bionetworks · May 10, 2024 · 028b74f · 028b74f
1 parent 5216f97
commit 028b74f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/config/develop/namespaced/lambda-s3-event-config.yaml b/config/develop/namespaced/lambda-s3-event-config.yaml
@@ -6,12 +6,12 @@ template:
 dependencies:
   - develop/namespaced/lambda-s3-event-config-role.yaml
   - develop/s3-cloudformation-bucket.yaml
-  - develop/namespaced/sns-topic.yaml
+  - develop/namespaced/sns-input.yaml
 stack_name: '{{ stack_group_config.namespace }}-lambda-S3EventConfig'
 stack_tags: {{ stack_group_config.default_stack_tags }}
 parameters:
   Namespace: {{ stack_group_config.namespace }}
-  S3ToGlueDestinationArn: !stack_output_external "{{ stack_group_config.namespace }}-sns-input-to-sqs::SnsTopicArn"
+  S3ToGlueDestinationArn: !stack_output_external "{{ stack_group_config.namespace }}-sns-input::SnsTopicArn"
   S3ToGlueDestinationType: "Topic"
   S3EventConfigRoleArn: !stack_output_external "{{ stack_group_config.namespace }}-lambda-s3-event-config-role::RoleArn"
   S3SourceBucketName: {{ stack_group_config.input_bucket_name }}
diff --git a/config/develop/namespaced/sns-topic.yaml → config/develop/namespaced/sns-input.yaml b/config/develop/namespaced/sns-topic.yaml → config/develop/namespaced/sns-input.yaml
@@ -4,6 +4,6 @@ parameters:
   S3SourceBucketArn: !stack_output_external recover-dev-input-bucket::BucketArn
 dependencies:
   - develop/s3-input-bucket.yaml
-stack_name: "{{ stack_group_config.namespace }}-sns-input-to-sqs"
+stack_name: "{{ stack_group_config.namespace }}-sns-input"
 stack_tags:
   {{ stack_group_config.default_stack_tags }}
diff --git a/.../develop/namespaced/sqs-input-to-raw.yaml → ...lop/namespaced/sqs-input-to-dispatch.yaml b/.../develop/namespaced/sqs-input-to-raw.yaml → ...lop/namespaced/sqs-input-to-dispatch.yaml
@@ -4,9 +4,9 @@ parameters:
   MessageRetentionPeriod: "1209600"
   ReceiveMessageWaitTimeSeconds: "20"
   VisibilityTimeout: "120"
-  SNSTopicSubscription: !stack_output_external "{{ stack_group_config.namespace }}-sns-input-to-sqs::SnsTopicArn"
+  SNSTopicSubscription: !stack_output_external "{{ stack_group_config.namespace }}-sns-input::SnsTopicArn"
 dependencies:
-  - develop/namespaced/sns-topic.yaml
-stack_name: '{{ stack_group_config.namespace }}-sqs-input-to-raw'
+  - develop/namespaced/sns-input.yaml
+stack_name: '{{ stack_group_config.namespace }}-sqs-input-to-dispatch'
 stack_tags:
   {{ stack_group_config.default_stack_tags }}
diff --git a/config/develop/namespaced/sqs-input-to-intermediate.yaml b/config/develop/namespaced/sqs-input-to-intermediate.yaml
@@ -4,9 +4,9 @@ parameters:
   MessageRetentionPeriod: "1209600"
   ReceiveMessageWaitTimeSeconds: "20"
   VisibilityTimeout: "120"
-  SNSTopicSubscription: !stack_output_external "{{ stack_group_config.namespace }}-sns-input-to-sqs::SnsTopicArn"
+  SNSTopicSubscription: !stack_output_external "{{ stack_group_config.namespace }}-sns-input::SnsTopicArn"
 dependencies:
-  - develop/namespaced/sns-topic.yaml
+  - develop/namespaced/sns-input.yaml
 stack_name: "{{ stack_group_config.namespace }}-sqs-input-to-intermediate"
 stack_tags:
   {{ stack_group_config.default_stack_tags }}
diff --git a/config/prod/namespaced/lambda-s3-event-config.yaml b/config/prod/namespaced/lambda-s3-event-config.yaml
@@ -6,12 +6,12 @@ template:
 dependencies:
   - prod/namespaced/lambda-s3-event-config-role.yaml
   - prod/s3-cloudformation-bucket.yaml
-  - prod/namespaced/sns-topic.yaml
+  - prod/namespaced/sns-input.yaml
 stack_name: '{{ stack_group_config.namespace }}-lambda-S3EventConfig'
 stack_tags: {{ stack_group_config.default_stack_tags }}
 parameters:
   Namespace: {{ stack_group_config.namespace }}
-  S3ToGlueDestinationArn: !stack_output_external "{{ stack_group_config.namespace }}-sns-input-to-sqs::SnsTopicArn"
+  S3ToGlueDestinationArn: !stack_output_external "{{ stack_group_config.namespace }}-sns-input::SnsTopicArn"
   S3ToGlueDestinationType: "Topic"
   S3EventConfigRoleArn: !stack_output_external "{{ stack_group_config.namespace }}-lambda-s3-event-config-role::RoleArn"
   S3SourceBucketName: {{ stack_group_config.input_bucket_name }}
diff --git a/config/prod/namespaced/sns-topic.yaml → config/prod/namespaced/sns-input.yaml b/config/prod/namespaced/sns-topic.yaml → config/prod/namespaced/sns-input.yaml
@@ -4,6 +4,6 @@ parameters:
   S3SourceBucketArn: !stack_output_external recover-input-bucket::BucketArn
 dependencies:
   - prod/s3-input-bucket.yaml
-stack_name: "{{ stack_group_config.namespace }}-sns-input-to-sqs"
+stack_name: "{{ stack_group_config.namespace }}-sns-input"
 stack_tags:
   {{ stack_group_config.default_stack_tags }}
diff --git a/config/prod/namespaced/sqs-input-to-raw.yaml → ...rod/namespaced/sqs-input-to-dispatch.yaml b/config/prod/namespaced/sqs-input-to-raw.yaml → ...rod/namespaced/sqs-input-to-dispatch.yaml
@@ -4,9 +4,9 @@ parameters:
   MessageRetentionPeriod: "1209600"
   ReceiveMessageWaitTimeSeconds: "20"
   VisibilityTimeout: "120"
-  SNSTopicSubscription: !stack_output_external "{{ stack_group_config.namespace }}-sns-input-to-sqs::SnsTopicArn"
+  SNSTopicSubscription: !stack_output_external "{{ stack_group_config.namespace }}-sns-input::SnsTopicArn"
 dependencies:
-  - prod/namespaced/sns-topic.yaml
-stack_name: '{{ stack_group_config.namespace }}-sqs-input-to-raw'
+  - prod/namespaced/sns-input.yaml
+stack_name: '{{ stack_group_config.namespace }}-sqs-input-to-dispatch'
 stack_tags:
   {{ stack_group_config.default_stack_tags }}
diff --git a/config/prod/namespaced/sqs-input-to-intermediate.yaml b/config/prod/namespaced/sqs-input-to-intermediate.yaml
@@ -4,9 +4,9 @@ parameters:
   MessageRetentionPeriod: "1209600"
   ReceiveMessageWaitTimeSeconds: "20"
   VisibilityTimeout: "120"
-  SNSTopicSubscription: !stack_output_external "{{ stack_group_config.namespace }}-sns-input-to-sqs::SnsTopicArn"
+  SNSTopicSubscription: !stack_output_external "{{ stack_group_config.namespace }}-sns-input::SnsTopicArn"
 dependencies:
-  - prod/namespaced/sns-topic.yaml
+  - prod/namespaced/sns-input.yaml
 stack_name: "{{ stack_group_config.namespace }}-sqs-input-to-intermediate"
 stack_tags:
   {{ stack_group_config.default_stack_tags }}