diff --git a/Makefile b/Makefile index 1068254..e894d9c 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,7 @@ fmt: docker init-%: docker $(TERRASPACE) init $* -install: docker zip_lambdas +install: docker $(DOCKER_RUN) $(IMAGE) -ic "YARN_SILENT=1 yarn install --ignore-optional && YARN_SILENT=1 yarn --cwd scripts install" ## logs: Shows last 10 lines of all Terraspace logs @@ -155,7 +155,7 @@ plan-%: install ## pre-deploy-setup: Setup resources prior to initial deployment (idempotent) pre-deploy-setup: all-init # Ensure buckets exist, grab the name of the "internal" bucket, and copy launchpad.pfx there. - $(DOCKER_RUN) --interactive $(IMAGE) -ic "bin/ensure-buckets-exist.sh 2>/dev/null + $(DOCKER_RUN) --interactive $(IMAGE) -ic "bin/ensure-buckets-exist.sh 2>/dev/null" ## terraform-doctor-STACK: Fixes "duplicate resource" errors for specified STACK terraform-doctor-%: docker @@ -190,4 +190,5 @@ validate-%: docker ## Zip any lambda functions to prepare for deployment zip_lambdas: + DOTENV=$(DOTENV) \ sh app/stacks/post-deploy-mods/resources/lambdas/pre-filter-DistributionApiEndpoints/zip_lambda.sh diff --git a/app/stacks/cumulus/main.tf b/app/stacks/cumulus/main.tf index e492b0e..42e1b73 100644 --- a/app/stacks/cumulus/main.tf +++ b/app/stacks/cumulus/main.tf @@ -576,7 +576,7 @@ module "cumulus" { { id = "backgroundJobQueue", url = aws_sqs_queue.background_job_queue.id, - execution_limit = 1400 + execution_limit = 200 } ] } diff --git a/app/stacks/cumulus/resources/collections/PSScene3Band___1.json b/app/stacks/cumulus/resources/collections/PSScene3Band___1.json index 043a894..702be5d 100644 --- a/app/stacks/cumulus/resources/collections/PSScene3Band___1.json +++ b/app/stacks/cumulus/resources/collections/PSScene3Band___1.json @@ -3,15 +3,22 @@ "version": "1", "duplicateHandling": "replace", "granuleId": ".*", - "granuleIdExtraction": "^(\\d{8}_\\d{6}_.+)(?:_\\dB_.+|_thumb.*|_cmr[.]json|_metadata[.]json)$", + "granuleIdExtraction": "^(\\d{8}_\\d{6}_.+)(?:_\\dB_.+|-BROWSE.png|_cmr[.]json|_metadata[.]json|-thumb.png)$", "sampleFileName": "20160628_204526_1_0c74_3B_Analytic_DN_metadata.xml", - "ignoreFilesConfigForDiscovery": true, - "url_path": "planet/PSScene3Band", + "ignoreFilesConfigForDiscovery": false, + "url_path": "{cmrMetadata.CollectionReference.ShortName}___{cmrMetadata.CollectionReference.Version}/{dateFormat(cmrMetadata.TemporalExtent.SingleDateTime, YYYY)}/{dateFormat(cmrMetadata.TemporalExtent.SingleDateTime, MM)}/{dateFormat(cmrMetadata.TemporalExtent.SingleDateTime, DD)}/{cmrMetadata.GranuleUR}", "files": [ { - "regex": "^(\\d{8}_\\d{6}_.+)(?:_\\dB_.+|_thumb.*|_cmr[.]json|_metadata[.]json)$", + "regex": "^(\\d{8}_\\d{6}_.+)(?:_\\dB_.+|-BROWSE.png|_cmr[.]json|_metadata[.]json)$", "sampleFileName": "20160628_204526_1_0c74_3B_Analytic_DN_metadata.xml", + "type": "data", "bucket": "protected" + }, + { + "regex": "^(\\d{8}_\\d{6}_.+)(?:.*-thumb.png)$", + "sampleFileName": "20160628_204526_1_0c74-thumb.png", + "type": "browse", + "bucket": "public" } ], "meta": { diff --git a/app/stacks/cumulus/resources/collections/WV03_MSI_L1B___1.json b/app/stacks/cumulus/resources/collections/WV03_MSI_L1B___1.json index 001cf36..1667def 100644 --- a/app/stacks/cumulus/resources/collections/WV03_MSI_L1B___1.json +++ b/app/stacks/cumulus/resources/collections/WV03_MSI_L1B___1.json @@ -1,7 +1,7 @@ { "name": "WV03_MSI_L1B", "version": "1", - "duplicateHandling": "skip", + "duplicateHandling": "replace", "granuleId": ".*", "granuleIdExtraction": "^(WV03_.+-M1BS-.+_P\\d{3}).+(?