Merge remote-tracking branch 'origin' into release/1.8.0

podaac · Mar 6, 2024 · cfc6791 · cfc6791
2 parents a242f62 + 57f6d59
commit cfc6791
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.8.0]
 ### Added
+- **User contribution**
+  - Add the "fileName" and "key" properties to the granuleFile object from buildS3GranuleFile function
 ### Changed
 - **PODAAC-5877**
   - Support java 11
@@ -15,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Fixed
 ### Security
+- Snyk: Upgrade com.amazonaws:aws-java-sdk-s3: 1.12.565 -> 1.12.661
 
 ## [v1.7.0] - 2022-12-12
 ### Added
@@ -168,4 +171,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-### Security
+### Security
diff --git a/pom.xml b/pom.xml
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.12.565</version>
+            <version>1.12.661</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/src/main/java/gov/nasa/cumulus/CnmToGranuleHandler.java b/src/main/java/gov/nasa/cumulus/CnmToGranuleHandler.java
@@ -208,6 +208,10 @@ public JsonObject buildS3GranuleFile(JsonObject cnmFile) {
             granuleFile.addProperty("checksum", cnmFile.get("checksum").getAsString());
         }
         granuleFile.addProperty("type", cnmFile.get("type").getAsString());
+
+        // Add the "fileName" and "key" properties as listed in the later version of the cumulus granule file schema
+        granuleFile.addProperty("fileName", cnmFile.get("name").getAsString());
+        granuleFile.addProperty("key", url_path + '/' + cnmFile.get("name").getAsString());
         return granuleFile;
     }