Skip to content
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.

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

CUMULUS-3756 #3790

Merged
Merged

Conversation

mikedorfman
Copy link
Contributor

@mikedorfman mikedorfman commented Aug 30, 2024

Summary:
merged to #3791 for further testing
Added excludeFileRegex configuration to update-granules-cmr-metadata-file-links and updated unit tests to exercise new file-exclusion feature.

Addresses CUMULUS-3756: Add the ability to exclude URLs matching a specific pattern in the CMR metadata

Changes

  • Updated the config schema for update-granules-cmr-metadata-file-links with excludeFileRegex
  • Updated tasks/update-granules-cmr-metadata-file-links/index.js to read the excludeFileRegex configuration and, if it's specified, filter the files passed to updateCMRMetadata.
  • Updated tasks/update-granules-cmr-metadata-file-links/tests/test-index.js to exercise both typical file exclusion functionality and exercise the case where the regex doesn't match any files in the files list.

PR Checklist

  • Update CHANGELOG
  • Unit tests
  • Ad-hoc testing - Deploy changes and test manually
  • Integration tests

…file-links

Updated tests to exercise new file-exclusion feature
@etcart etcart changed the base branch from master to ecarton/nsidc-NDCUM-1264-excludeFileRegex August 31, 2024 03:46
@etcart etcart deleted the branch nasa:ecarton/nsidc-NDCUM-1264-excludeFileRegex August 31, 2024 03:47
@etcart etcart closed this Aug 31, 2024
@etcart etcart reopened this Aug 31, 2024
@etcart etcart changed the base branch from ecarton/nsidc-NDCUM-1264-excludeFileRegex to master August 31, 2024 03:49
@etcart etcart changed the base branch from master to ecarton/nsidc-NDCUM-1264-excludeFileRegex August 31, 2024 03:49
@etcart etcart merged commit 03a54c0 into nasa:ecarton/nsidc-NDCUM-1264-excludeFileRegex Aug 31, 2024
2 checks passed
etcart added a commit that referenced this pull request Oct 11, 2024
…e-granules-cmr-metadata-… (#3791)

* Added excludeFileRegex configuration to update-granules-cmr-metadata-file-links (#3790)

Updated tests to exercise new file-exclusion feature

* linter fixes

* remove explicit null for un-found regexpattern

* switch to logging when no excludable files found

* changelog broken into multiple lines

* linter fixes in changelog

* name in changelog after lambda function name

* remove TODO. non-mocked is a truer representation of function

* small refactor

* typo in passthrough of fileregex

* nyc values with new tests

* version requirement update

* fixed merge weirdness

* fix jsonpath in the other places it's flagged

* remove unneeded explicit pin in aws-client

* check like instead of deepequal on credentials return

---------

Co-authored-by: Mike Dorfman <42116953+mikedorfman@users.noreply.github.com>
Jkovarik pushed a commit that referenced this pull request Oct 22, 2024
…e-granules-cmr-metadata-… (#3791)

* Added excludeFileRegex configuration to update-granules-cmr-metadata-file-links (#3790)

Updated tests to exercise new file-exclusion feature

* linter fixes

* remove explicit null for un-found regexpattern

* switch to logging when no excludable files found

* changelog broken into multiple lines

* linter fixes in changelog

* name in changelog after lambda function name

* remove TODO. non-mocked is a truer representation of function

* small refactor

* typo in passthrough of fileregex

* nyc values with new tests

* version requirement update

* fixed merge weirdness

* fix jsonpath in the other places it's flagged

* remove unneeded explicit pin in aws-client

* check like instead of deepequal on credentials return

---------

Co-authored-by: Mike Dorfman <42116953+mikedorfman@users.noreply.github.com>
Jkovarik added a commit that referenced this pull request Oct 24, 2024
* CUMULUS-3891/3773: Add sftpFastDownload config to SyncGranule (#3818)

* CUMULUS-3891: Add fastGet download option to sftp data file download

* add sftpFastDownload config

* fix fastDownload boolean vs string

* add unit tests

* fix aws-client services unit test

* test SFTP_DEBUG

* remove only

* add changelog entry

* remove unused code

* remove jsonpath from common

* update latest-version and add jsonpath-plus to audit-ci

* serial

* update readme remove serial

* add sftp test

* CUMULUS-3756 NDCUM-1264 Added excludeFileRegex configuration to update-granules-cmr-metadata-… (#3791)

* Added excludeFileRegex configuration to update-granules-cmr-metadata-file-links (#3790)

Updated tests to exercise new file-exclusion feature

* linter fixes

* remove explicit null for un-found regexpattern

* switch to logging when no excludable files found

* changelog broken into multiple lines

* linter fixes in changelog

* name in changelog after lambda function name

* remove TODO. non-mocked is a truer representation of function

* small refactor

* typo in passthrough of fileregex

* nyc values with new tests

* version requirement update

* fixed merge weirdness

* fix jsonpath in the other places it's flagged

* remove unneeded explicit pin in aws-client

* check like instead of deepequal on credentials return

---------

Co-authored-by: Mike Dorfman <42116953+mikedorfman@users.noreply.github.com>

* update dependencies to latest cma, cma-python, cumulus-process (#3810)

* update dependencies to latest cma, cma-python, cumulus-process

* changelog

* fixed shas in locks

* whitelist jsonpath for buiggy audit behavior

* remove incorrect changelog entry

---------

Co-authored-by: etcart <amberhosen@gmail.com>

* CUMULUS-3919:Added terraform variables disableSSL and rejectUnauthorized (#3832)

* CUMULUS-3919:Added terraform variables disableSsl and rejectUnauthorized

* disableSsl->disableSSL

* Fix bad merge

* Fix audit-ci

* Address bad merge on #3818

* Update audit-ci

* [CUMULUS-3902]: Update AWS-SDK errors to use the V3 error classes (#3807)

i* Update AWS errors to use the V3 error classes

* Fix lint

* Import aws sdk directly to avoid circular dep

* Update CL

* Remove module in favor of aws imports directly

* Revert change to ThrottlingException error type

* Add comments

* Fix lint

* Remove unnecessary dependency

* add debug logging for CI

* update type and debug comment

* temporarily revert to name checks

* Remove logging and type check on conditional exception.

Instance of does not work in this case. I believe we're calling the service "dynamodbDocClient" using the non-V3 syntax.

* Fix lint

* Update tests to throw correct aws-sdk error

* Update tests with new aws-sdk error types

* Import error type correctly

* Correctly import sfn error

* Instantiate errors like I know what I'm doing

* Basic syntax 🤦

* update tests

* Remove unnecessary comment

* fixup for clarity

* Update test for clarity

* Update test fixture and logging for consistency

* Address PR feedback/fix bad backport merge

* Correct aws-client dev dependency/version

---------

Co-authored-by: jennyhliu <34660846+jennyhliu@users.noreply.github.com>
Co-authored-by: etcart <37375117+etcart@users.noreply.github.com>
Co-authored-by: Mike Dorfman <42116953+mikedorfman@users.noreply.github.com>
Co-authored-by: cumulus-bot <141277837+cumulus-bot@users.noreply.github.com>
Co-authored-by: etcart <amberhosen@gmail.com>
Co-authored-by: Nate Pauzenga <npauzenga@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants