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

Feature/new forge py #39

Merged
merged 23 commits into from
Nov 26, 2024
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ jobs:
TF_VAR_aws_security_group_ids: ${{ secrets[format('SECURITY_GROUP_IDS_{0}', env.TARGET_ENV_UPPERCASE)] }}

run: |
curl -L -o metadata-aggregator.zip https://github.com/podaac/cumulus-metadata-aggregator/releases/download/v8.6.0/cumulus-metadata-aggregator-8.6.0.zip
curl -L -o metadata-aggregator.zip https://github.com/podaac/cumulus-metadata-aggregator/releases/download/v8.7.0-alpha.6-SNAPSHOT/cumulus-metadata-aggregator-8.7.0-alpha.6-SNAPSHOT.zip
python3 override.py "${{ env.TARGET_ENV_LOWERCASE }}"
source bin/config.sh ${{ env.TARGET_ENV_LOWERCASE }}
terraform plan -var-file=tfvars/"${{ env.TARGET_ENV_LOWERCASE }}".tfvars -var="app_version=${{ env.the_version }}" -out="tfplan"
Expand Down
4 changes: 3 additions & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,9 @@ disable=raw-checker-failed,
use-symbolic-message-instead,
use-implicit-booleaness-not-comparison-to-string,
use-implicit-booleaness-not-comparison-to-zero,
broad-exception-raised
broad-exception-raised,
too-many-positional-arguments,
raising-bad-type

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- List can be a list of GranuleURs or granule concept-IDs
- Update db size from t2.micro to t3.micro
- Made argument *--cumulus-configurations* optional in preview mode
- Update forge-py to 0.3.0
- Update metadata aggregator to cumulus-metadata-aggregator-8.7.0-alpha.6-SNAPSHOT
### Deprecated
### Removed
### Fixed
Expand Down
713 changes: 360 additions & 353 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion terraform-deploy/forge_py.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ module "forge_py_module" {
subnet_ids = data.aws_subnets.private.ids
memory_size = 1024
timeout = 900
}
}
2 changes: 1 addition & 1 deletion terraform-deploy/metadata_aggregator.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ resource "aws_lambda_function" "metadata_aggregator_task" {
source_code_hash = filebase64sha256("metadata-aggregator.zip")
handler = "gov.nasa.cumulus.metadata.aggregator.MetadataAggregatorHandler::handleRequestStreams"
role = aws_iam_role.iam_execution.arn
runtime = "java11"
runtime = "java17"
timeout = 300
memory_size = 512

Expand Down
4 changes: 2 additions & 2 deletions terraform-deploy/terraform_env/ops.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"tig_image":"ghcr.io/podaac/tig:0.12.0",
"forge_source":"https://github.com/podaac/forge/releases/download/0.11.0/forge-0.11.0.zip",
"forge_image":"ghcr.io/podaac/forge:0.11.0",
"forge_py_source" : "https://github.com/podaac/forge-py/releases/download/0.2.0/forge-py-terraform-0.2.0.zip",
"forge_py_image": "ghcr.io/podaac/forge-py:0.2.0",
"forge_py_source" : "https://github.com/podaac/forge-py/releases/download/0.3.0/forge-py-terraform-0.3.0.zip",
"forge_py_image": "ghcr.io/podaac/forge-py:0.3.0",
"backfill_lambdas_source": "https://github.com/podaac/hitide-backfill-lambdas/releases/download/0.4.0/hitide-backfill-lambdas-0.4.0.zip"
}
4 changes: 2 additions & 2 deletions terraform-deploy/terraform_env/uat.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"tig_image":"ghcr.io/podaac/tig:0.12.0-rc.3",
"forge_source":"https://github.com/podaac/forge/releases/download/0.11.0-rc.3/forge-0.11.0-rc.3.zip",
"forge_image":"ghcr.io/podaac/forge:0.11.0-rc.3",
"forge_py_source" : "https://github.com/podaac/forge-py/releases/download/0.2.0-rc.6/forge-py-terraform-0.2.0-rc.6.zip",
"forge_py_image": "ghcr.io/podaac/forge-py:0.2.0-rc.6",
"forge_py_source" : "https://github.com/podaac/forge-py/releases/download/0.3.0-rc.2/forge-py-terraform-0.3.0-rc.2.zip",
"forge_py_image": "ghcr.io/podaac/forge-py:0.3.0-rc.2",
"backfill_lambdas_source": "https://github.com/podaac/hitide-backfill-lambdas/releases/download/0.4.0-rc.1/hitide-backfill-lambdas-0.4.0-rc.1.zip"
}