From 27448545f2279572c335db92f3b0b9d639595f22 Mon Sep 17 00:00:00 2001 From: Chuck Daniels Date: Tue, 7 Nov 2023 10:02:34 -0500 Subject: [PATCH] Upgrade to Cumulus 18.1.0, ORCA 8.1.0 (#283) --- .terraform-version | 2 +- Dockerfile | 18 +- app/modules/cma/main.tf | 4 +- app/modules/cma/outputs.tf | 2 +- app/stacks/cumulus/config/hooks/terraform.rb | 40 +++++ app/stacks/cumulus/main.tf | 6 +- app/stacks/cumulus/orca.tf | 4 +- .../config/hooks/terraform.rb | 2 +- config/args/terraform.rb | 8 +- config/helpers/cumulus_version_helper.rb | 2 +- config/terraform/terraform.tf | 6 +- package.json | 10 +- yarn.lock | 169 +++++++++++------- 13 files changed, 177 insertions(+), 96 deletions(-) create mode 100644 app/stacks/cumulus/config/hooks/terraform.rb diff --git a/.terraform-version b/.terraform-version index ebf55b3..f01291b 100644 --- a/.terraform-version +++ b/.terraform-version @@ -1 +1 @@ -0.13.6 +1.5.7 diff --git a/Dockerfile b/Dockerfile index e9bfcd1..e1a65d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,20 +75,6 @@ RUN : \ && npm install -g hygen@6.2.11 \ && : -# Install Cumulus CLI (see https://github.com/NASA-IMPACT/cumulus-cli) -WORKDIR /usr/src -RUN git clone --depth 1 https://github.com/NASA-IMPACT/cumulus-cli.git -WORKDIR /usr/src/cumulus-cli -# hadolint ignore=SC1091 -RUN : \ - && source "${NVM_DIR}/nvm.sh" --install \ - && nvm install \ - && npm install \ - && npm run build \ - && npm install -g \ - && ln -s "$(which cumulus)" /usr/local/bin/cumulus \ - && : - WORKDIR /work # Install node dependencies @@ -107,6 +93,10 @@ RUN : \ # changes in the wrong environment. # hadolint ignore=SC2016 RUN : \ + # Add yarn bin to path so that the `cumulus` command can be found. It was + # installed by `yarn install` because it is in the `devDependencies` list in + # the package.json file. + && echo 'export PATH="$(yarn bin):${PATH}"' >> ~/.bashrc \ && echo 'export PS1="(${AWS_PROFILE:-[ERROR: AWS_PROFILE is not defined]}:${TS_ENV:-[ERROR: TS_ENV is undefined]}):\w \$ "' >> ~/.bashrc \ #----------------------------------------------------------------------------- # IMPORTANT diff --git a/app/modules/cma/main.tf b/app/modules/cma/main.tf index 400d137..26e7719 100644 --- a/app/modules/cma/main.tf +++ b/app/modules/cma/main.tf @@ -16,7 +16,7 @@ resource "null_resource" "download_cma_zip_file" { } } -resource "aws_s3_bucket_object" "cma_zip_file" { +resource "aws_s3_object" "cma_zip_file" { depends_on = [null_resource.download_cma_zip_file] bucket = var.bucket key = local.cma_zip_name @@ -30,7 +30,7 @@ resource "aws_s3_bucket_object" "cma_zip_file" { resource "aws_lambda_layer_version" "cma" { s3_bucket = var.bucket - s3_key = aws_s3_bucket_object.cma_zip_file.key + s3_key = aws_s3_object.cma_zip_file.key layer_name = "${var.prefix}-cumulus-message-adapter" description = "Lambda layer for Cumulus Message Adapter ${var.cma_version}" } diff --git a/app/modules/cma/outputs.tf b/app/modules/cma/outputs.tf index 1907a32..f2055a7 100644 --- a/app/modules/cma/outputs.tf +++ b/app/modules/cma/outputs.tf @@ -1,5 +1,5 @@ output "cma_zip_file_id" { - value = aws_s3_bucket_object.cma_zip_file.id + value = aws_s3_object.cma_zip_file.id } output "lambda_layer_version_arn" { diff --git a/app/stacks/cumulus/config/hooks/terraform.rb b/app/stacks/cumulus/config/hooks/terraform.rb new file mode 100644 index 0000000..9eac21c --- /dev/null +++ b/app/stacks/cumulus/config/hooks/terraform.rb @@ -0,0 +1,40 @@ +class PatchCumulus18_1_0 + def call(runner) + mod = runner.mod + + # This is a hack to work around the fact that the Cumulus 18.1.0 S3 + # Replicator module references an undeclared Terraform variable, due to a + # typo. This simply patches the module to fix the typo before running + # `terraform apply`. + + filepath = "#{mod.cache_dir}/.terraform/modules/s3-replicator/main.tf" + + File.write(filepath, File.open(filepath) do |f| + f.read.gsub(/lambda_memory_size\b/, "lambda_memory_sizes") + end) + + # Replace all references to deprecated `aws_s3_bucket_object` with `aws_s3_object` + # This isn't strictly necessary, but it eliminates noisy warnings from Terraform. + # This can be removed once Cumulus directly addresses the deprecations. + + filepaths = [ + "cumulus/tf-modules/archive/api.tf", + "cumulus/tf-modules/cumulus/ecs_cluster.tf", + "cumulus/tf-modules/cumulus/main.tf", + "cumulus/tf-modules/ingest/message_template.tf", + "discover_granules_workflow/tf-modules/workflow/main.tf", + "ingest_and_publish_granule_workflow/tf-modules/workflow/main.tf", + ] + + filepaths.each do |filepath| + full_filepath = "#{mod.cache_dir}/.terraform/modules/#{filepath}" + File.write(full_filepath, File.open(full_filepath) do |f| + f.read.gsub(/aws_s3_bucket_object/, "aws_s3_object") + end) + end + end +end + +before("plan", "apply", + execute: PatchCumulus18_1_0, +) diff --git a/app/stacks/cumulus/main.tf b/app/stacks/cumulus/main.tf index dccb494..7b7a746 100644 --- a/app/stacks/cumulus/main.tf +++ b/app/stacks/cumulus/main.tf @@ -163,7 +163,7 @@ resource "random_string" "token_secret" { special = true } -resource "aws_s3_bucket_object" "bucket_map_yaml_distribution" { +resource "aws_s3_object" "bucket_map_yaml_distribution" { bucket = var.system_bucket key = "${var.prefix}/cumulus_distribution/bucket_map.yaml" content = local.bucket_map_yaml @@ -402,7 +402,7 @@ module "cma" { prefix = var.prefix bucket = var.system_bucket - cma_version = "2.0.2" + cma_version = "2.0.3" } module "s3-replicator" { @@ -423,7 +423,7 @@ module "cumulus_distribution" { api_gateway_stage = "dev" api_url = var.cumulus_distribution_url - bucket_map_file = aws_s3_bucket_object.bucket_map_yaml_distribution.id + bucket_map_file = aws_s3_object.bucket_map_yaml_distribution.id bucketname_prefix = "" buckets = var.buckets cmr_acl_based_credentials = true diff --git a/app/stacks/cumulus/orca.tf b/app/stacks/cumulus/orca.tf index 1fc2df8..34caf54 100644 --- a/app/stacks/cumulus/orca.tf +++ b/app/stacks/cumulus/orca.tf @@ -15,18 +15,18 @@ data "aws_secretsmanager_secret_version" "rds_cluster_user_credentials_secret_ve } module "orca" { - source = "https://github.com/nasa/cumulus-orca/releases/download/v8.0.1/cumulus-orca-terraform.zip" + source = "https://github.com/nasa/cumulus-orca/releases/download/v8.1.0/cumulus-orca-terraform.zip" #-------------------------- # Cumulus variables #-------------------------- # REQUIRED + aws_region = data.aws_region.current.name buckets = var.buckets lambda_subnet_ids = module.vpc.subnets.ids permissions_boundary_arn = local.permissions_boundary_arn prefix = var.prefix system_bucket = var.system_bucket vpc_id = module.vpc.vpc_id - workflow_config = module.cumulus.workflow_config # OPTIONAL tags = var.tags diff --git a/app/stacks/data-persistence/config/hooks/terraform.rb b/app/stacks/data-persistence/config/hooks/terraform.rb index 135dead..d1b3453 100644 --- a/app/stacks/data-persistence/config/hooks/terraform.rb +++ b/app/stacks/data-persistence/config/hooks/terraform.rb @@ -13,7 +13,7 @@ # # See https://nasa.github.io/cumulus/docs/v9.6.0/deployment/deployment-readme#vpc-subnets-and-security-group # -# This hook simply check to see if this service linked role exists, and if not, +# This hook simply checks to see if this service linked role exists, and if not, # it creates it so that we don't have to remember to do this manually before # deploying the first Cumulus deployment to a given AWS account. # diff --git a/config/args/terraform.rb b/config/args/terraform.rb index b8e3429..70d42db 100644 --- a/config/args/terraform.rb +++ b/config/args/terraform.rb @@ -1,5 +1,11 @@ # See https://terraspace.cloud/docs/config/args/terraform/ command("init", - args: ["-reconfigure"], + args: ["-no-color", "-reconfigure", "-upgrade"], +) +command("plan", + args: ["-no-color", "-refresh=false"], +) +command("apply", + args: ["-no-color"], ) diff --git a/config/helpers/cumulus_version_helper.rb b/config/helpers/cumulus_version_helper.rb index 8d128cf..c24c4dd 100644 --- a/config/helpers/cumulus_version_helper.rb +++ b/config/helpers/cumulus_version_helper.rb @@ -1,5 +1,5 @@ module Terraspace::Project::CumulusVersionHelper def cumulus_version - "v16.1.1" + "v18.1.0" end end diff --git a/config/terraform/terraform.tf b/config/terraform/terraform.tf index 0097fb5..b79645b 100644 --- a/config/terraform/terraform.tf +++ b/config/terraform/terraform.tf @@ -1,5 +1,5 @@ terraform { - required_version = "0.13.6" + required_version = "1.5.7" required_providers { archive = { source = "hashicorp/archive", @@ -7,7 +7,7 @@ terraform { } aws = { source = "hashicorp/aws" - version = ">= 3.14.1" + version = "~> 5.0" } external = { source = "hashicorp/external" @@ -19,7 +19,7 @@ terraform { } random = { source = "hashicorp/random" - version = "~> 2.3" + version = "~> 3.1.0" } } } diff --git a/package.json b/package.json index 2d7cae6..b43459d 100644 --- a/package.json +++ b/package.json @@ -60,9 +60,9 @@ "@aws-sdk/lib-dynamodb": "^3.370.0", "@aws-sdk/lib-storage": "^3.370.0", "@aws-sdk/types": "^3.370.0", - "@cumulus/aws-client": "16.1.1", - "@cumulus/cmrjs": "16.1.1", - "@cumulus/common": "16.1.1", + "@cumulus/aws-client": "18.1.0", + "@cumulus/cmrjs": "18.1.0", + "@cumulus/common": "18.1.0", "@cumulus/cumulus-message-adapter-js": "2.0.4", "@smithy/util-stream": "^2.0.17", "date-fns": "^2.29.3", @@ -78,7 +78,8 @@ "devDependencies": { "@ava/typescript": "^3.0.1", "@aws-sdk/client-dynamodb": "^3.370.0", - "@cumulus/types": "16.1.1", + "@cumulus/api-client": "18.1.0", + "@cumulus/types": "18.1.0", "@istanbuljs/nyc-config-typescript": "^1.0.1", "@tsconfig/node16": "^16.1.1", "@types/aws-lambda": "^8.10.85", @@ -88,6 +89,7 @@ "@typescript-eslint/parser": "^5.1.0", "ava": "^4.3.3", "codecov": "^3.5.0", + "cumulus-cli": "github:NASA-IMPACT/cumulus-cli#2eb0c6b", "cz-conventional-changelog": "^3.3.0", "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", diff --git a/yarn.lock b/yarn.lock index d9ae574..72b9bde 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1074,10 +1074,19 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@cumulus/aws-client@16.1.1": - version "16.1.1" - resolved "https://registry.yarnpkg.com/@cumulus/aws-client/-/aws-client-16.1.1.tgz#c8c8e59f137143d2ca8f3478b527b87228df28d7" - integrity sha512-Xq1X5qwCVUvNZmTF2JDks5vXtrJ7PNlY5HCe4rqfxzj9+2W4wikjYIKA9ZWUwhnsklGEuREYGHzuP6Ypt2H/+Q== +"@cumulus/api-client@18.1.0": + version "18.1.0" + resolved "https://registry.yarnpkg.com/@cumulus/api-client/-/api-client-18.1.0.tgz#d087189310389235d67847b51a3258ed064c1ebe" + integrity sha512-0zwETZ7ndJ/z9E7JHk3d9ucvn1jT551vq1sjII8uKz+ldvDSJjWnFMG5y/tzbrCWO6RiYOona7J8y75lRRcJxQ== + dependencies: + "@cumulus/aws-client" "18.1.0" + "@cumulus/logger" "18.1.0" + p-retry "^2.0.0" + +"@cumulus/aws-client@18.1.0": + version "18.1.0" + resolved "https://registry.yarnpkg.com/@cumulus/aws-client/-/aws-client-18.1.0.tgz#4b11df13db9732f84d2df0008c32cd6ee89cfb8a" + integrity sha512-Ki0pkQHlEpKq7pNvk1hAo7OgthfYQKyCxqn+A2rruzAEnSokGOgERRaK90glJeL+ooR1a+jal8aitMmkTkpj9g== dependencies: "@aws-sdk/client-api-gateway" "^3.58.0" "@aws-sdk/client-dynamodb" "^3.58.0" @@ -1088,9 +1097,9 @@ "@aws-sdk/s3-request-presigner" "^3.58.0" "@aws-sdk/signature-v4-crt" "^3.58.0" "@aws-sdk/types" "^3.58.0" - "@cumulus/checksum" "16.1.1" - "@cumulus/errors" "16.1.1" - "@cumulus/logger" "16.1.1" + "@cumulus/checksum" "18.1.0" + "@cumulus/errors" "18.1.0" + "@cumulus/logger" "18.1.0" aws-sdk "^2.585.0" jsonpath-plus "^1.1.0" lodash "~4.17.21" @@ -1102,22 +1111,22 @@ pump "^3.0.0" uuid "^8.2.0" -"@cumulus/checksum@16.1.1": - version "16.1.1" - resolved "https://registry.yarnpkg.com/@cumulus/checksum/-/checksum-16.1.1.tgz#029ff6b0cbba37ed4318f31686c8879a1565a9f4" - integrity sha512-iP0ReCWHUAb69vHIRSofOvWAI6b0pcH5gSmMhf+ZL6y7YYWM1OnUFdOOO8riRKBe7qyfbRgrS+wLGU+N6io4Gw== +"@cumulus/checksum@18.1.0": + version "18.1.0" + resolved "https://registry.yarnpkg.com/@cumulus/checksum/-/checksum-18.1.0.tgz#29595c6f6bef78a7bc43805049d464224f5e652d" + integrity sha512-k3A1TiYLOE6nhHxn/ZIk3TsDpyHP3m4V/NzZ2ggusAEtKtmhTAzZQguCIPp32Ui5eAPvR7xVfG8Z9FhuiM5YCA== dependencies: cksum "^1.3.0" -"@cumulus/cmr-client@16.1.1": - version "16.1.1" - resolved "https://registry.yarnpkg.com/@cumulus/cmr-client/-/cmr-client-16.1.1.tgz#6c7368f1e923a79ead2e3b6530f169e59488f10c" - integrity sha512-oYmjI6I7ooGUCtHunp92G82OdQNkGvSXM9v7j1DPBcVZ2e6Mmte/cycvg3X01+H4G5UVzLX1LSp0NHkh4sfzpQ== +"@cumulus/cmr-client@18.1.0": + version "18.1.0" + resolved "https://registry.yarnpkg.com/@cumulus/cmr-client/-/cmr-client-18.1.0.tgz#9ac45e6585ac7a3da0aa609e2e26af5ea6f0e9ff" + integrity sha512-PWQxOXJLdGnmzEQ9MCetJlyR+BnaFh6D9PP3aPTW7iM937dRsYw/02Td/OJnhtzlpZktXJjrFKu55HXHa4a1Fw== dependencies: - "@cumulus/aws-client" "16.1.1" - "@cumulus/common" "16.1.1" - "@cumulus/errors" "16.1.1" - "@cumulus/logger" "16.1.1" + "@cumulus/aws-client" "18.1.0" + "@cumulus/common" "18.1.0" + "@cumulus/errors" "18.1.0" + "@cumulus/logger" "18.1.0" got "^11.8.5" jsonwebtoken "^9.0.0" lodash "^4.17.21" @@ -1125,18 +1134,18 @@ xml2js "0.5.0" zod "^3.20.2" -"@cumulus/cmrjs@16.1.1": - version "16.1.1" - resolved "https://registry.yarnpkg.com/@cumulus/cmrjs/-/cmrjs-16.1.1.tgz#441cb247a1fcd5505ec7d8c736464747984dfca4" - integrity sha512-hqjCyOVjD3rk5yAwei0hJm461dFCvEurJx9WwB4r4RgjltZ71oQw613aVqyC+Q4oYqn3QDgObFMkQ6a4Mx+ZJg== - dependencies: - "@cumulus/aws-client" "16.1.1" - "@cumulus/cmr-client" "16.1.1" - "@cumulus/common" "16.1.1" - "@cumulus/distribution-utils" "16.1.1" - "@cumulus/errors" "16.1.1" - "@cumulus/launchpad-auth" "16.1.1" - "@cumulus/logger" "16.1.1" +"@cumulus/cmrjs@18.1.0": + version "18.1.0" + resolved "https://registry.yarnpkg.com/@cumulus/cmrjs/-/cmrjs-18.1.0.tgz#c3196b81259cc0317c5159240b48fb8ca3e648c5" + integrity sha512-qMz/AKK2Q8xP1v1/uA1cmFvY3SZCTJBnr6rBN+0WFj66jkovJpjeBOaE6jdyIGye59XZFRu9aoSMBi/+x4f3oA== + dependencies: + "@cumulus/aws-client" "18.1.0" + "@cumulus/cmr-client" "18.1.0" + "@cumulus/common" "18.1.0" + "@cumulus/distribution-utils" "18.1.0" + "@cumulus/errors" "18.1.0" + "@cumulus/launchpad-auth" "18.1.0" + "@cumulus/logger" "18.1.0" got "^11.8.1" js2xmlparser "^4.0.0" lodash "^4.17.21" @@ -1144,16 +1153,16 @@ url-join "^1.0.0" xml2js "0.5.0" -"@cumulus/common@16.1.1": - version "16.1.1" - resolved "https://registry.yarnpkg.com/@cumulus/common/-/common-16.1.1.tgz#6026ab6875caf52dd55b99f62d50f14048879c53" - integrity sha512-aE5pC7pNASfl1nGVmxDBnPD4bEbNCFiAGKRIAlXmvofC4uDR1EQuCBI+M/Hobpl2RBBWk3i86wWBk3rmWZb0xw== +"@cumulus/common@18.1.0": + version "18.1.0" + resolved "https://registry.yarnpkg.com/@cumulus/common/-/common-18.1.0.tgz#81da39783c567701f463d0e44f8dd32046a57d41" + integrity sha512-1EBcJDKh4HkIOg9nbP1n8JXPX6GOlrR99soDz5OG4zdNVLYJI8fE/KflTTy6HipM5wJ+pW6nfyGReBEafSVI3A== dependencies: "@aws-sdk/client-s3" "^3.58.0" "@aws-sdk/signature-v4-crt" "^3.58.0" - "@cumulus/aws-client" "16.1.1" - "@cumulus/errors" "16.1.1" - "@cumulus/logger" "16.1.1" + "@cumulus/aws-client" "18.1.0" + "@cumulus/errors" "18.1.0" + "@cumulus/logger" "18.1.0" ajv "^6.12.3" aws-sdk "^2.585.0" follow-redirects "^1.2.4" @@ -1180,43 +1189,43 @@ execa "^4.0.0" lookpath "1.0.3" -"@cumulus/distribution-utils@16.1.1": - version "16.1.1" - resolved "https://registry.yarnpkg.com/@cumulus/distribution-utils/-/distribution-utils-16.1.1.tgz#a3af889b00b8e1541c91e52eb42b03a745eb369a" - integrity sha512-boXMEE8hEFqCm2+JiSOWuZUiWBg6mF3U3kdAuWoMujOIPNQOKgpW71yV6YPQlFUtB5bKAc5GD1odMLPYhtUY0Q== +"@cumulus/distribution-utils@18.1.0": + version "18.1.0" + resolved "https://registry.yarnpkg.com/@cumulus/distribution-utils/-/distribution-utils-18.1.0.tgz#016e7f99e4586de9ea770553832d739b35812789" + integrity sha512-fF8/a/FOWYF4nLH1HSmkXBXwshHNFsBqRiekirqieho2vUkveEaSPf4RYJ7L+Fl90BhsFEMdADVH8oaflIthiw== dependencies: - "@cumulus/aws-client" "16.1.1" - "@cumulus/common" "16.1.1" - "@cumulus/errors" "16.1.1" + "@cumulus/aws-client" "18.1.0" + "@cumulus/common" "18.1.0" + "@cumulus/errors" "18.1.0" url-join "^1.1.0" -"@cumulus/errors@16.1.1": - version "16.1.1" - resolved "https://registry.yarnpkg.com/@cumulus/errors/-/errors-16.1.1.tgz#68f14dc1d96b9c133a16d2d8b0d69f13bb7a1349" - integrity sha512-bJds+3KL8ExdqzjDRDzFC150p2yKKSzKpSdVSVMXn2+cXPeWAxr3S2sR7GI2LS4wun3zpd71w0kW8fBeFAkP5A== +"@cumulus/errors@18.1.0": + version "18.1.0" + resolved "https://registry.yarnpkg.com/@cumulus/errors/-/errors-18.1.0.tgz#024f01dc8f27e7e01fdd8aa1338603bbe869941d" + integrity sha512-bKtQ+rCbuO+kw8FJL5WMNQi2RtTc1UdCtd5pt8JCgRkHZWjfCsOPlzGJjcphozliUIb11IQvqLvDJh2wgmwPPQ== -"@cumulus/launchpad-auth@16.1.1": - version "16.1.1" - resolved "https://registry.yarnpkg.com/@cumulus/launchpad-auth/-/launchpad-auth-16.1.1.tgz#8bc8e411473190f143b5c09875fc6e4412d03db0" - integrity sha512-Lb8Pu04CnmWfGiSd7IxuCC5cEdyd6Id1Xf9ssBM8w5/aJV5fBJzzI174QlJu/zEMFdwK9g8U3ike0CQwhrxPBg== +"@cumulus/launchpad-auth@18.1.0": + version "18.1.0" + resolved "https://registry.yarnpkg.com/@cumulus/launchpad-auth/-/launchpad-auth-18.1.0.tgz#f07f75a84c178c4004dd1d667ad6190e15f860e0" + integrity sha512-qhy2MJqpOL5FKQBCA/RpyoUZUwUP/pnEq9LlnWkSxVrA7iSw3oPjlFXX3ZiBF96+QnPfqe2QFN9/+2mqsR+ovQ== dependencies: - "@cumulus/aws-client" "16.1.1" - "@cumulus/logger" "16.1.1" + "@cumulus/aws-client" "18.1.0" + "@cumulus/logger" "18.1.0" got "^11.8.5" lodash "^4.17.21" uuid "^3.2.1" -"@cumulus/logger@16.1.1": - version "16.1.1" - resolved "https://registry.yarnpkg.com/@cumulus/logger/-/logger-16.1.1.tgz#df6a3fe0b5dac5ac9ad5330599affdeba42c63db" - integrity sha512-WADj/TMl141For8B0jq91S87mRpkLF9quzB1O03l3WZivQq+DEe98OUTc0dZmWwsbr97JNAkie0ui7qSr0uKVQ== +"@cumulus/logger@18.1.0": + version "18.1.0" + resolved "https://registry.yarnpkg.com/@cumulus/logger/-/logger-18.1.0.tgz#bd7ddc6fedfc75e744a71ebba7bb4950f716b249" + integrity sha512-T4iREl9t4vyLKRyn2Io/UrYKeehnK5EIwcLtNFpc4OtT/MaqLjs1OjK7+PPKFExewZOIDuef7N5cWCtth6lYJg== dependencies: lodash.iserror "^3.1.1" -"@cumulus/types@16.1.1": - version "16.1.1" - resolved "https://registry.yarnpkg.com/@cumulus/types/-/types-16.1.1.tgz#ccf77426013d7bc164972787cad01b2f8ae862b5" - integrity sha512-ye1LHMVSH3ND/cuaReVVoM9PHNxrublLRzPMdKTfGGPoE1K773Lv+ZjAenUKgSdelsXqag+YrvNCetYUlm+9Aw== +"@cumulus/types@18.1.0": + version "18.1.0" + resolved "https://registry.yarnpkg.com/@cumulus/types/-/types-18.1.0.tgz#349c1b940e4dd8d83368a81792cdf274d945d77d" + integrity sha512-2O2BmwWVtmWTVPH/W4dts6flRcvRlrc7m/wkd0J6rnklKZ8eeCLrpE58u3ZhH2+gEUS1o0TNekHFc5Vi3wlw5g== "@cumulus/types@^9.6.0": version "9.9.4" @@ -2768,6 +2777,16 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== +cmd-ts@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/cmd-ts/-/cmd-ts-0.11.0.tgz#80926180f39665e35e321b72439f792a2b63b745" + integrity sha512-6RvjD+f9oGPeWoMS53oavafmQ9qC839PjP3CyvPkAIfqMEXTbrclni7t3fnyVJFNWxuBexnLshcotY0RuNrI8Q== + dependencies: + chalk "^4.0.0" + debug "^4.3.4" + didyoumean "^1.2.2" + strip-ansi "^6.0.0" + code-excerpt@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/code-excerpt/-/code-excerpt-4.0.0.tgz#2de7d46e98514385cb01f7b3b741320115f4c95e" @@ -3127,6 +3146,13 @@ crypto-random-string@^4.0.0: dependencies: type-fest "^1.0.1" +"cumulus-cli@github:NASA-IMPACT/cumulus-cli#2eb0c6b": + version "0.1.0" + resolved "https://codeload.github.com/NASA-IMPACT/cumulus-cli/tar.gz/2eb0c6b4a2fbb28bdf166eda9ab759ab5f57a5dc" + dependencies: + cmd-ts "^0.11.0" + lodash "^4.17.21" + currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -3315,6 +3341,11 @@ detect-newline@^3.1.0: resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== +didyoumean@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" + integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw== + diff@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" @@ -5935,6 +5966,13 @@ p-map@^5.4.0: dependencies: aggregate-error "^4.0.0" +p-retry@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-2.0.0.tgz#b97f1f4d6d81a3c065b2b40107b811e995c1bfba" + integrity sha512-ZbCuzAmiwJ45q4evp/IG9D+5MUllGSUeCWwPt3j/tdYSi1KPkSD+46uqmAA1LhccDhOXv8kYZKNb8x78VflzfA== + dependencies: + retry "^0.12.0" + p-retry@^4.2.0: version "4.6.2" resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" @@ -6465,6 +6503,11 @@ ret@^0.2.0: resolved "https://registry.yarnpkg.com/ret/-/ret-0.2.2.tgz#b6861782a1f4762dce43402a71eb7a283f44573c" integrity sha512-M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ== +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + retry@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"