Merge pull request #2883 from ASFHyP3/develop

Release v10.11.3

Author: jtherrmann

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [10.11.3]
+
+### Added
+- Added `PUBLISH` step to `INSAR_ISCE` and `ARIA_RAIDER` job specs.
+
+### Changed
+- Updated `PUBLISH` step of `ARIA_S1_GUNW` job spec to run on the same compute environment as the preceding steps, allowing the container to run on an already-provisioned EC2 instance.
+- Adjust Batch job IAM permissions to allow HyP3 job steps to publish to any SNS topic. Allows jobs to publish to the [ingest-adapter](https://github.com/ASFHyP3/ingest-adapter)'s SNS topic across AWS accounts.
+
 ## [10.11.2]
 
 ### Changed

apps/compute-cf.yml.j2

@@ -179,7 +179,7 @@ Resources:
             Resource: !Sub "arn:aws:s3:::${ContentBucket}/*"
           - Effect: Allow
             Action: sns:Publish
-            Resource: !Sub "arn:aws:sns:${AWS::Region}:${AWS::AccountId}:*"
+            Resource: arn:aws:sns:*
 
   BatchServiceRole:
     Type: {{ 'Custom::JplRole' if security_environment in ('JPL', 'JPL-public') else 'AWS::IAM::Role' }}

job_spec/ARIA_RAIDER.yml

@@ -51,3 +51,14 @@ ARIA_RAIDER:
         - RAIDER_HRES_EMAIL
         - RAIDER_HRES_API_KEY
         - RAIDER_HRES_URL
+    - name: PUBLISH
+      image: ghcr.io/asfhyp3/ingest-adapter
+      command:
+        - Ref::job_id
+      timeout: 600
+      compute_environment: Default
+      vcpu: 1
+      memory: 512
+      secrets:
+        - TOPIC_ARN
+        - HYP3_URL

job_spec/ARIA_S1_GUNW.yml

@@ -80,7 +80,7 @@ ARIA_S1_GUNW:
       command:
         - Ref::job_id
       timeout: 600
-      compute_environment: Default
+      compute_environment: AriaS1Gunw
       vcpu: 1
       memory: 512
       secrets:

job_spec/INSAR_ISCE.yml

@@ -159,3 +159,14 @@ INSAR_ISCE:
         - RAIDER_HRES_EMAIL
         - RAIDER_HRES_API_KEY
         - RAIDER_HRES_URL
+    - name: PUBLISH
+      image: ghcr.io/asfhyp3/ingest-adapter
+      command:
+        - Ref::job_id
+      timeout: 600
+      compute_environment: InsarIsceAria
+      vcpu: 1
+      memory: 512
+      secrets:
+        - TOPIC_ARN
+        - HYP3_URL