Skip to content

FIX: update workflow script #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 11, 2022
Merged

FIX: update workflow script #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaa1b75
fix: get collection id only. not versin + add sample test input json
wphyojpl Jul 8, 2022
48dd97c
fix: github workflow needs to run only on main branch
wphyojpl Jul 11, 2022
69af729
Merge branch 'develop' of github.com:unity-sds/unity-data-services in…
wphyojpl Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/makefile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
29 changes: 27 additions & 2 deletions ...lus_lambda_functions/cumulus_granules_dapa_ingest_cnm/cumulus_granules_dapa_ingest_cnm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
}
}


class CumulusGranulesDapaIngestCnm:
def __init__(self, event):
"""
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down