Merge pull request #55 from unity-sds/develop

FIX: update workflow script

Author: wphyojpl

.github/workflows/makefile.yml

@@ -52,7 +52,7 @@ jobs:
         prerelease: false
     - name: Create PreRelease
       id: create_prerelease
-      if: ${{ contains(github.ref, 'develop') }}
+      if: ${{ contains(github.ref, 'main') }}
       uses: actions/create-release@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
@@ -66,7 +66,7 @@ jobs:
         prerelease: true
     - name: Upload PreRelease Asset 1
       id: upload-prerelease-asset-1
-      if: ${{ contains(github.ref, 'develop') }}
+      if: ${{ contains(github.ref, 'main') }}
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -77,7 +77,7 @@ jobs:
         asset_content_type: application/zip
     - name: Upload PreRelease Asset 2
       id: upload-prerelease-asset-2
-      if: ${{ contains(github.ref, 'develop') }}
+      if: ${{ contains(github.ref, 'main') }}
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

cumulus_lambda_functions/cumulus_granules_dapa_ingest_cnm/cumulus_granules_dapa_ingest_cnm.py

@@ -33,6 +33,7 @@
     }
 }
 
+
 class CumulusGranulesDapaIngestCnm:
     def __init__(self, event):
         """
@@ -128,19 +129,43 @@ def start(self):
  "version": "1.6.0"
 }
 aws sns publish --topic-arn arn:aws:sns:us-west-2:884500545225:am-uds-dev-cumulus-cnm-submission-sns --message file:///tmp/SNDR.SNPP.ATMS.L1A.nominal2.01.json
+
+
+
+Test Input message
+{
+    "requestContext": {
+        "provider_id": "SNPP",
+        "features": [
+            {
+                "id": "SNDR.SNPP.ATMS.L1A.nominal2.01",
+                "collection": "SNDR_SNPP_ATMS_L1A___1",
+                "assets": {
+                    "data": {
+                        "href": "s3://am-uds-dev-cumulus-staging/SNDR_SNPP_ATMS_L1A/SNDR.SNPP.ATMS.L1A.nominal2.01.nc"
+                    },
+                    "metadata": {
+                        "href": "s3://am-uds-dev-cumulus-staging/SNDR_SNPP_ATMS_L1A/SNDR.SNPP.ATMS.L1A.nominal2.01.nc.cas"
+                    }
+                }
+            }
+        ]
+    }
+}
         :return:
         """
         self.__get_json_request_body()
         error_list = []
         for each_granule in self.__request_body['features']:
             LOGGER.debug(f'executing: {each_granule}')
             try:
+                collection_id_version = each_granule['collection'].split('___')
                 sns_msg = {
-                    'collection': each_granule['collection'],
+                    'collection': collection_id_version[0],
                     'identifier': each_granule['id'],
                     'submissionTime': TimeUtils.get_current_time(),
                     "provider": self.__request_body['provider_id'],
-                    "version": "1.6.0",  # TODO
+                    "version": '1.6.0',  # TODO
                     'product': {
                         'name': each_granule['id'],
                         'dataVersion': '1',  # TODO

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name="cumulus_lambda_functions",
-    version="1.5.12",
+    version="1.5.13",
     packages=find_packages(),
     install_requires=install_requires,
     tests_require=['mock', 'nose', 'sphinx', 'sphinx_rtd_theme', 'coverage'],