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

Simplify Cumulus folder structure #278

Merged
merged 12 commits into from
Mar 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
62 changes: 10 additions & 52 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,6 @@ jobs:
keys:
- cumulus-tasks-{{ checksum "global-hash" }}

- restore_cache:
keys:
- gitc-tasks-{{ checksum "global-hash" }}

- restore_cache:
keys:
- services-{{ checksum "global-hash" }}

- run:
name: Installing Dependencies
command: |
Expand Down Expand Up @@ -79,50 +71,16 @@ jobs:
- save_cache:
key: cumulus-tasks-{{ checksum "global-hash" }}
paths:
- ./cumulus/tasks/hello-world/node_modules
- ./cumulus/tasks/discover-granules/node_modules
- ./cumulus/tasks/discover-pdrs/node_modules
- ./cumulus/tasks/parse-pdr/node_modules
- ./cumulus/tasks/post-to-cmr/node_modules
- ./cumulus/tasks/pdr-status-check/node_modules
- ./cumulus/tasks/queue-granules/node_modules
- ./cumulus/tasks/queue-pdrs/node_modules
- ./cumulus/tasks/sync-granule/node_modules
- ./cumulus/tasks/discover-s3-granules/node_modules
- ./cumulus/tasks/sf-sns-report/node_modules

- save_cache:
key: gitc-tasks-{{ checksum "global-hash" }}
paths:
- ./cumulus/tasks/copy-idx-from-s3-to-efs/node_modules
- ./cumulus/tasks/delete-ingest-tracking-data/node_modules
- ./cumulus/tasks/delete-pdr-ftp/node_modules
- ./cumulus/tasks/delete-pdr-s3/node_modules
- ./cumulus/tasks/discover-cmr-granules/node_modules
- ./cumulus/tasks/discover-http-tiles/node_modules
- ./cumulus/tasks/dowload-activity-mock/node_modules
- ./cumulus/tasks/filter-payload/node_modules
- ./cumulus/tasks/generate-mrf/node_modules
- ./cumulus/tasks/generate-pan/node_modules
- ./cumulus/tasks/generate-pdrd/node_modules
- ./cumulus/tasks/run-gdal/node_modules
- ./cumulus/tasks/sync-http-urls/node_modules
- ./cumulus/tasks/sync-wms/node_modules
- ./cumulus/tasks/tee/node_modules
- ./cumulus/tasks/trigger-ingest/node_modules
- ./cumulus/tasks/trigger-mrf-gen/node_modules
- ./cumulus/tasks/trigger-process-pdrs/node_modules
- ./cumulus/tasks/validate-archives/node_modules
- ./cumulus/tasks/discover-pdr/node_modules
- ./cumulus/tasks/generate-pdr-file-list/node_modules
- ./cumulus/tasks/validate-pdr/node_modules

- save_cache:
key: services-{{ checksum "global-hash" }}
paths:
- ./cumulus/services/sfn-scheduler/node_modules
- ./cumulus/services/sfn-throttler/node_modules

- ./tasks/hello-world/node_modules
- ./tasks/discover-granules/node_modules
- ./tasks/discover-pdrs/node_modules
- ./tasks/parse-pdr/node_modules
- ./tasks/post-to-cmr/node_modules
- ./tasks/pdr-status-check/node_modules
- ./tasks/queue-granules/node_modules
- ./tasks/queue-pdrs/node_modules
- ./tasks/sync-granule/node_modules
- ./tasks/sf-sns-report/node_modules

- run:
name: Running Tests
Expand Down
2 changes: 1 addition & 1 deletion .eslint-ratchet-high-water-mark
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2051
1349
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Deprecated
- discover-s3-granules is deprecated. The functionality is provided by the discover-granules task
### Fixed
- **CUMULUS-331:** Fix aws.downloadS3File to handle non-existent key
- Using test ftp provider for discover-granules testing [CUMULUS-427]
- **CUMULUS-304: "Add AWS API throttling to pdr-status-check task"** Added concurrency limit on SFN API calls. The default concurrency is 10 and is configurable through Lambda environment variable CONCURRENCY.
- **CUMULUS-414: "Schema validation not being performed on many tasks"** revised npm build scripts of tasks that use cumulus-message-adapter to place schema directories into dist directories.
- **CUMULUS-271: "Empty response body from rules PUT endpoint"** Added the updated rule to response body.
- Increased memory allotment for `CustomBootstrap` lambda function. Resolves failed deployments where `CustomBootstrap` lambda function was failing with error `Process exited before completing request`. This was causing deployments to stall, fail to update and fail to rollback. This error is thrown when the lambda function tries to use more memory than it is allotted.
- Cumulus repository folders structure updated:
- removed the `cumulus` folder altogether
- moved `cumulus/tasks` to `tasks` folder at the root level
- moved the tasks that are not converted to use CMA to `tasks/.not_CMA_compliant`
- updated paths where necessary

## [v1.2.0] - 2018-03-20

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ If you prefer to run docker in detached mode (i.e. run containers in the backgro

Run the test commands next

$ export LOCALSTACK_HOST=localhost
$ yarn test

Run end to end tests by
Expand Down
85 changes: 0 additions & 85 deletions cumulus/lib/cf-template.js

This file was deleted.

15 changes: 0 additions & 15 deletions cumulus/lib/templates/defaults.yml

This file was deleted.

13 changes: 0 additions & 13 deletions cumulus/lib/templates/ecs-task-defaults.yml

This file was deleted.

35 changes: 0 additions & 35 deletions cumulus/lib/templates/service-defaults.yml

This file was deleted.

10 changes: 0 additions & 10 deletions cumulus/lib/templates/task-defaults.yml

This file was deleted.

15 changes: 0 additions & 15 deletions cumulus/services/provider-gateway/.gitignore

This file was deleted.

7 changes: 0 additions & 7 deletions cumulus/services/provider-gateway/Dockerfile

This file was deleted.

Loading