diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..8e6f556 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,16 @@ +## Description + +A short description of the changes in this PR. + +## Jira Issue ID + + +## Local Test Steps + + +## PR Acceptance Checklist +* [ ] Jira ticket acceptance criteria met. +* [ ] `CHANGELOG.md` updated to include high level summary of PR changes. +* [ ] `docker/service_version.txt` updated if publishing a release. +* [ ] Tests added/updated and passing. +* [ ] Documentation updated (if needed). diff --git a/.github/workflows/publish_docker_image.yml b/.github/workflows/publish_docker_image.yml new file mode 100644 index 0000000..3abaf33 --- /dev/null +++ b/.github/workflows/publish_docker_image.yml @@ -0,0 +1,83 @@ +# This workflow will run when changes are detected in the `main` branch, which +# must include an update to the `docker/service_version.txt` file. The workflow +# can also be manually triggered by a repository maintainer. This workflow will +# first trigger the reusable workflow in `.github/workflows/run_tests.yml`, +# which runs the `unittest` suite. If that workflow is successful, the latest +# version of the service Docker image is pushed to ghcr.io, a tag is added to +# the latest git commit, and a GitHub release is created with the release notes +# from the latest version of the Harmony Regridding Service. +name: Publish Harmony Regridding Service Docker image + +on: + push: + branches: [ main ] + paths: docker/service_version.txt + workflow_dispatch: + +env: + IMAGE_NAME: ${{ github.repository }} + REGISTRY: ghcr.io + +jobs: + run_tests: + uses: ./.github/workflows/run_tests.yml + + build_and_publish_image: + needs: run_tests + runs-on: ubuntu-latest + environment: release + permissions: + # write permission is required to create a GitHub release + contents: write + id-token: write + packages: write + strategy: + fail-fast: false + + steps: + - name: Checkout harmony-regridding-service repository + uses: actions/checkout@v3 + with: + lfs: true + + - name: Extract semantic version number + run: echo "semantic_version=$(cat docker/service_version.txt)" >> $GITHUB_ENV + + - name: Extract release version notes + run: | + version_release_notes=$(./bin/extract-release-notes.sh) + echo "RELEASE_NOTES<> $GITHUB_ENV + echo "${version_release_notes}" >> $GITHUB_ENV + echo "EOF" >> $GITHUB_ENV + + - name: Log-in to ghcr.io registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Add tags to the Docker image + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + type=semver,pattern={{version}},value=${{ env.semantic_version }} + + - name: Push Docker image + uses: docker/build-push-action@v3 + with: + context: . + file: docker/service.Dockerfile + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + + - name: Publish GitHub release + uses: ncipollo/release-action@v1 + with: + body: ${{ env.RELEASE_NOTES }} + commit: main + name: Version ${{ env.semantic_version }} + tag: ${{ env.semantic_version }} diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml new file mode 100644 index 0000000..e3476b2 --- /dev/null +++ b/.github/workflows/run_tests.yml @@ -0,0 +1,42 @@ +# This workflow will build the service and test Docker images for the Harmony +# Regridding service, then run the Python `unittest` suite within a test Docker +# container, reporting test results and code coverage as artefacts. It will be +# called by the workflow that run tests against new PRs and as a first step in +# the workflow that publishes new Docker images. +name: Run Python unit tests + +on: + workflow_call + +jobs: + build_and_test: + runs-on: ubuntu-latest + strategy: + fail-fast: false + + steps: + - name: Checkout harmony-regridding-service repository + uses: actions/checkout@v3 + with: + lfs: true + + - name: Build service image + run: ./bin/build-image + + - name: Build test image + run: ./bin/build-test + + - name: Run test image + run: ./bin/run-test + + - name: Archive test results + uses: actions/upload-artifact@v3 + with: + name: Test results + path: test-reports/ + + - name: Archive coverage report + uses: actions/upload-artifact@v3 + with: + name: Coverage report + path: coverage/* diff --git a/.github/workflows/run_tests_on_pull_requests.yml b/.github/workflows/run_tests_on_pull_requests.yml new file mode 100644 index 0000000..a948fd1 --- /dev/null +++ b/.github/workflows/run_tests_on_pull_requests.yml @@ -0,0 +1,13 @@ +# This workflow will run when a PR is opened against the `main` branch. It will +# trigger the reusable workflow in `.github/workflows/run_tests.yml`, which +# builds the service and test Docker images, and runs the `unittest` suite in a +# Docker container built from the test image. +name: Run Python unit tests for pull requests against main + +on: + pull_request: + branches: [ main ] + +jobs: + build_and_test: + uses: ./.github/workflows/run_tests.yml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c59f584..230e5c4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,3 +1,5 @@ +ci: + autofix_prs: false repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v3.2.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 82f74b3..6d92d16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,38 +1,13 @@ -## v0.0.4 -### 2024-04-10 - -This version of the Harmony Regridding service implements `black` code -formatting across the entire repository. There should be no functional changes -to the service. - -## v0.0.3 -### 2023-12-18 - -No user facing changes. Refactors code to use Harmony Message utilities from -harmony-service-lib. - -## v0.0.2 -### 2023-10-17 - -No user facing changes. Migrates sds-varinfo to the public facing -earthdata-varinfo package. - -## v0.0.1 -### 2023-03-28 - -Initial minimum viable product version of the harmony-regridding-service. The -service now can be added to harmony to return a resampled granule. The service -is limited to resampling geographic data only. If an input granule has multiple -grids defined, the data from all grids will be resampled to the target grid. - -## v0.0.0 -### 2023-03-03 - -This initial version of the Harmony Regridding service sets up the core -infrastructure required for a backend service. It contains a RegriddingServiceAdapter -class that can be invoked within a Harmony Kubernetes cluster, and will return -the input granule without any transformation. The `RegriddingServiceAdapter` performs -basic message validation, to ensure the message defines a valid target grid, -and that it does not specify a target CRS or interpolation method that is -incompatible with the service. The service itself will be implemented in future -tickets. +## v1.0.0 +### 2024-04-12 + +This version of the Harmony Regridding Service contains all functionality +previously released internally to EOSDIS as `sds/harmony-regridder:0.0.4`. +Minor reformatting of the repository structure has occurred to comply with +recommended best practices for a Harmony backend service repository, but the +service itself is functionally unchanged. Additional contents to the repository +include updated documentation and files outlined by the +[NASA open-source guidelines](https://code.nasa.gov/#/guide). + +For more information on internal releases prior to NASA open-source approval, +see legacy-CHANGELOG.md. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..4a15065 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,48 @@ +# Contributing to the Harmony Regridding Service + +Thanks for contributing! + +## Making Changes + +To allow us to incorporate your changes, please use the +[Fork-and-Pull](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/getting-started/about-collaborative-development-models#fork-and-pull-model) +development model: + +1. Fork this repository to your personal account. +2. Create a branch and make your changes. +3. Test the changes locally/in your personal fork. +4. Submit a pull request to open a discussion about your proposed changes. +5. The maintainers will talk with you about it and decide to merge or request + additional changes. + +For larger items, consider contacting the maintainers first to coordinate +development efforts. + +## Commits + +Our ticketing and CI/CD tools are configured to sync statuses amongst each +other. Commits play an important role in this process. Please start all commits +with the Jira ticket number associated with your feature, task, or bug. All +commit messages should follow the format +"[Jira Project]-XXXX - [Your commit message here]", for example: +"DAS-1234 - Add amazing feature to the Harmony Regridder." + +## General coding practices: + +This repository adheres to Python coding style recommendations from +[black](https://black.readthedocs.io/en/stable/). Additionally, type hints are +encouraged in all function signatures. + +When adding or updating functionality, please ensure unit tests are added to +the existing `unittest` suite in the `tests` directory, which cover each branch +of the code. + +## Disclaimer + +Harmony Regridding Service maintainers will review all pull requests submitted. +Only requests that meet the standard of quality set forth by existing code, +following the patterns set forth by existing code, and adhering to existing +design patterns will be considered and/or accepted. + +For general tips on open source contributions, see +[Contributing to Open Source on GitHub](https://guides.github.com/activities/contributing-to-open-source/). diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..50186e0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,60 @@ +Copyright © 2022 United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +--- + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + You must give any other recipients of the Work or Derivative Works a copy of this License; and + You must cause any modified files to carry prominent notices stating that You changed the files; and + You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS diff --git a/README.md b/README.md index 7e5a230..0c7721e 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,9 @@ GPM/IMERGHH and MERRA collections. ``` |- CHANGELOG.md +|- CONTRIBUTING.md |- README.md +|- legacy-CHANGELOG.md |- bin |- docker |- harmony_regridding_service @@ -19,12 +21,19 @@ GPM/IMERGHH and MERRA collections. ``` * CHANGELOG.md - This file contains a record of changes applied to each new - release of a service Docker image. Any release of a new service version - should have a record of what was changed in this file. + public release of a service Docker image. Any release of a new service + version since migrating to GitHub should have a record of what was changed in + this file (e.g., starting at version 1.0.0). +* CONTRIBUTING.md - General guidelines for making contributions to the + repository. +* LICENSE - The NASA open-source license under which this software has been + made available. * README.md - This file, containing guidance on developing the service. +* legacy-CHANGELOG.md - This file contains release notes for all versions of + the service that were released internally to EOSDIS, before migrating the + service code and Docker image to GitHub. * bin - A directory containing utility scripts to build the service and test - images. This also includes scripts that Bamboo uses to deploy new service - images to AWS ECR. + images. * docker - A directory containing the Dockerfiles for the service and test images. It also contains `service_version.txt`, which contains the semantic version number of the service image. Any time an update is made that should @@ -37,6 +46,10 @@ GPM/IMERGHH and MERRA collections. * pip_requirements.txt - A list of service Python package dependencies. * tests - A directory containing the service unit test suite. +## Contributing: + +Contributions are welcome! For more information, see `CONNTRIBUTING.md`. + ## Python dependencies: At this time, the service only requires dependencies that can be obtained via @@ -69,10 +82,9 @@ $ ./bin/run-test The `tests/run_tests.sh` script will also generate a coverage report, rendered in HTML, and scan the code with `pylint`. -Currently, the `unittest` suite is run automatically within Bamboo as part of a -CI/CD pipeline. In future, this project will be migrated from Bitbucket to -GitHub, at which point the CI/CD will be migrated to workflows that use GitHub -Actions. +The `unittest` suite is run automatically via GitHub Actions as part of a +GitHub "workflow". These workflows are defined in the `.github/workflows` +directory. ## pre-commit hooks: @@ -107,10 +119,13 @@ review and `git add` the changes before you can make a commit. It is planned to implement additional hooks, possibly including tools such as `mypy`. +[pre-commit.ci](pre-commit.ci) is configured such that these same hooks will be +automatically run for every pull request. + ## Versioning: Service Docker images for the Harmony Regridding Service adhere to semantic -version numbers: major.minor.patch. +version numbers: `major.minor.patch`. * Major increments: These are non-backwards compatible API changes. * Minor increments: These are backwards compatible API changes. @@ -124,9 +139,8 @@ updated: ## Docker image publication: -Initially service Docker images will be hosted in AWS Elastic Container -Registry (ECR). When this repository is migrated to the NASA GitHub -organisation, service images will be published to ghcr.io, instead. +Service Docker images are published to ghcr.io any time a change is merged to +the `main` branch that contains an update to `docker/service_version.txt`. ## Releasing a new version of the service: @@ -135,3 +149,11 @@ that service version can be released to a Harmony environment by updating the main Harmony Bamboo deployment project. Find the environment you wish to release the service version to and update the associated environment variable to update the semantic version tag at the end of the full Docker image name. + +## Get in touch: + +You can reach out to the maintainers of this repository via email: + +* david.p.auty@nasa.gov +* owen.m.littlejohns@nasa.gov +* matthew.savoie@colorado.edu diff --git a/bin/build-image b/bin/build-image index d36999b..150a194 100755 --- a/bin/build-image +++ b/bin/build-image @@ -6,10 +6,11 @@ # 2020-05-07: Adapted from SwotRepr. # 2022-01-03: Updated Dockerfile path and added comments for tags. # 2023-01-26: Updated for the Harmony Regridding service. +# 2024-04-12: Updated image name to: ghcr.io/nasa/harmony-regridder. # ############################################################################### -image="sds/harmony-regridder" +image="ghcr.io/nasa/harmony-regridder" # Retrieve the tag from the script arguments, or default to "latest". Bamboo # will pass the contents of `docker/service_version.txt` as this argument, @@ -18,7 +19,7 @@ image="sds/harmony-regridder" tag=${1:-latest} -# Remove old versions of: sds/harmony-regridder and sds/harmony-regridder-test +# Remove old versions of service and test images. ./bin/clean-images # Build the image diff --git a/bin/build-test b/bin/build-test index 2891b41..d547019 100755 --- a/bin/build-test +++ b/bin/build-test @@ -4,17 +4,18 @@ # Build a Docker container to run the test suite for the Harmony Regridding # service. # -# To build the sds/harmony-regridder-test image, the sds/harmony-regridder -# image must also be present locally, as it is used as the base image in -# `docker/tests.Dockerfile`. +# To build the ghcr.io/nasa/harmony-regridder-test image, the +# ghcr.io/nasa/harmony-regridder image must also be present locally, as it is +# used as the base image in `docker/tests.Dockerfile`. # # 2020-05-07: Adapted from SwotRepr. # 2022-01-03: Updated Dockerfile path. # 2023-01-26: Updated for the Harmony Regridding service. +# 2024-04-12: Updated image name to: ghcr.io/nasa/harmony-regridder-test. # ############################################################################### -image="sds/harmony-regridder-test" +image="ghcr.io/nasa/harmony-regridder-test" tag=${1:-latest} diff --git a/bin/clean-images b/bin/clean-images index b402bac..2571549 100755 --- a/bin/clean-images +++ b/bin/clean-images @@ -1,11 +1,12 @@ #!/bin/bash ############################################################################### # -# Look for all versions of images containing the string "sds/harmony-regridder" +# Look for all versions of images containing the string "ghcr.io/nasa/harmony-regridder" # and remove them. This is primarily for clean-up after development. # # 2020-05-07: Adapted from SwotRepr. # 2023-01-26: Updated for the Harmony Regridding Service. +# 2024-04-12: Update to account for new open-source Docker image names. # ############################################################################### remove_image_by_name() { @@ -17,7 +18,7 @@ remove_image_by_name() { fi } -image_base_name="sds/harmony-regridder" +image_base_name="ghcr.io/nasa/harmony-regridder" # First remove test images: remove_image_by_name "${image_base_name}-test" diff --git a/bin/extract-release-notes.sh b/bin/extract-release-notes.sh new file mode 100755 index 0000000..6fe9d54 --- /dev/null +++ b/bin/extract-release-notes.sh @@ -0,0 +1,23 @@ +#!/bin/bash +############################################################################### +# +# A bash script to extract only the notes related to the most recent version of +# the Harmony Regridding service from CHANGELOG.md +# +# 2023-06-16: Created. +# 2023-10-10: Copied from earthdata-varinfo repository to HOSS. +# 2024-04-12: Copied from HOSS to the Harmony Regridding service. +# +############################################################################### + +CHANGELOG_FILE="CHANGELOG.md" +VERSION_PATTERN="^## v" +# Count number of versions in version file: +number_of_versions=$(grep -c "${VERSION_PATTERN}" ${CHANGELOG_FILE}) + +if [ ${number_of_versions} -gt 1 ] +then + grep -B 9999 -m 2 "${VERSION_PATTERN}" ${CHANGELOG_FILE} | sed '$d' | sed '$d' +else + cat ${CHANGELOG_FILE} +fi diff --git a/bin/install-aws-cli b/bin/install-aws-cli deleted file mode 100644 index ca1127e..0000000 --- a/bin/install-aws-cli +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -############################################################################### -# -# Sets up the AWS CLI to run in Bamboo -# -# Adapted from SwotRepr: 2020-05-07 -# -############################################################################### - -set -e - -mkdir -p exec_bin -pushd exec_bin - -cat > aws </dev/null && echo "-i") \ - -e "AWS_ACCESS_KEY_ID=\${AWS_ACCESS_KEY_ID}" \ - -e "AWS_SECRET_ACCESS_KEY=\${AWS_SECRET_ACCESS_KEY}" \ - -e "AWS_DEFAULT_REGION=\${AWS_DEFAULT_REGION}" \ - -v "\$(pwd):/project" \ - maven.earthdata.nasa.gov/aws-cli \ - "\$@" -EOS - -chmod a+x aws - -export PATH=$PWD:$PATH -popd diff --git a/bin/push-image b/bin/push-image deleted file mode 100755 index 1bd03d2..0000000 --- a/bin/push-image +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -############################################################################### -# -# Pushes the latest version of the sds/harmony-regridder image to an AWS ECR -# repository. This script requires AWS credentials to be set. -# -# This script can be called with an optional parameter denoting the tag to -# associate with the Docker image. The Bamboo build plan should use the -# semantic version number saved in `docker/service_version.txt`. This script -# will default to use "latest" if no tag is supplied as an argument. -# -# 2020-05-07: Adapted from SwotRepr. -# 2023-01-26: Update for the Harmony Regridding Service. -# -############################################################################### -set -ex - -image="sds/harmony-regridder" - -# This tag should be supplied by Bamboo during deployment. If not, it will -# default to "latest". -# -tag=${1:-latest} - -region=${AWS_DEFAULT_REGION-"us-west-2"} - -account=$(aws sts get-caller-identity --output text --query 'Account') -# Need to remove \r returned on all aws commands run from Bamboo -account=${account//$'\r'/} - -login_command=$(aws ecr get-login --no-include-email --region ${region}) -# Need to remove \r returned on all aws commands run from Bamboo -login_command=${login_command//$'\r'/} -$login_command - -docker tag ${image}:${tag} ${account}.dkr.ecr.${region}.amazonaws.com/${image}:${tag} - -# Create ECR repo if it doesn't exist -aws ecr describe-repositories --repository-names ${image} || aws ecr create-repository --repository-name ${image} - -docker push ${account}.dkr.ecr.${region}.amazonaws.com/${image}:${tag} diff --git a/bin/run-test b/bin/run-test index cee0b4c..e1da17f 100755 --- a/bin/run-test +++ b/bin/run-test @@ -1,12 +1,13 @@ #!/bin/bash ############################################################################### # -# Execute the sds/harmony-regridder-test Docker image as a container, within -# Bamboo. +# Execute the ghcr.io/nasa/harmony-regridder-test Docker image as a container, +# either locally or within a GitHub Action. # # 2020-05-07: Adapted from SwotRepr. # 2021-01-05: Updated for JUnit output. # 2023-01-26: Updated for the Harmony Regridding service. +# 2024-04-12: Updated to use new open-source Docker image names. # ############################################################################### @@ -26,4 +27,4 @@ mkdir -p coverage docker run --rm \ -v $(pwd)/test-reports:/home/tests/reports \ -v $(pwd)/coverage:/home/tests/coverage \ - sds/harmony-regridder-test "$@" + ghcr.io/nasa/harmony-regridder-test "$@" diff --git a/docker/service.Dockerfile b/docker/service.Dockerfile index 71889e9..a24c328 100644 --- a/docker/service.Dockerfile +++ b/docker/service.Dockerfile @@ -1,12 +1,12 @@ ############################################################################### # -# Service image for sds/harmony-regridder, a Harmony backend service that -# transforms Level 3 or Level 4 data to another grid. +# Service image for ghcr.io/nasa/harmony-regridder, a Harmony backend service +# that transforms Level 3 or Level 4 data to another grid. # # This image installs dependencies via Pip. The service code is then copied # into the Docker image. # -# Updated: 2023-01-26 +# 2023-01-26: Added to repository. # ############################################################################### FROM python:3.9.14-slim-bullseye diff --git a/docker/service_version.txt b/docker/service_version.txt index 81340c7..3eefcb9 100644 --- a/docker/service_version.txt +++ b/docker/service_version.txt @@ -1 +1 @@ -0.0.4 +1.0.0 diff --git a/docker/tests.Dockerfile b/docker/tests.Dockerfile index a49d1f5..f0cd4ad 100644 --- a/docker/tests.Dockerfile +++ b/docker/tests.Dockerfile @@ -1,14 +1,15 @@ ############################################################################### # # Test image for the Harmony Regridding service. This test image uses the main -# service image, sds/harmony-regridder, as a base layer for the tests. This -# ensures that the contents of the service image are tested, preventing +# service image, ghcr.io/nasa/harmony-regridder, as a base layer for the tests. +# This ensures that the contents of the service image are tested, preventing # discrepancies between the service and test environments. # -# Updated: 2023-01-26 +# 2023-01-26: Added to repository. +# 2024-04-12: Update base image to ghcr.io/nasa/harmony-regridder. # ############################################################################### -FROM sds/harmony-regridder +FROM ghcr.io/nasa/harmony-regridder ENV PYTHONDONTWRITEBYTECODE=1 diff --git a/legacy-CHANGELOG.md b/legacy-CHANGELOG.md new file mode 100644 index 0000000..82f74b3 --- /dev/null +++ b/legacy-CHANGELOG.md @@ -0,0 +1,38 @@ +## v0.0.4 +### 2024-04-10 + +This version of the Harmony Regridding service implements `black` code +formatting across the entire repository. There should be no functional changes +to the service. + +## v0.0.3 +### 2023-12-18 + +No user facing changes. Refactors code to use Harmony Message utilities from +harmony-service-lib. + +## v0.0.2 +### 2023-10-17 + +No user facing changes. Migrates sds-varinfo to the public facing +earthdata-varinfo package. + +## v0.0.1 +### 2023-03-28 + +Initial minimum viable product version of the harmony-regridding-service. The +service now can be added to harmony to return a resampled granule. The service +is limited to resampling geographic data only. If an input granule has multiple +grids defined, the data from all grids will be resampled to the target grid. + +## v0.0.0 +### 2023-03-03 + +This initial version of the Harmony Regridding service sets up the core +infrastructure required for a backend service. It contains a RegriddingServiceAdapter +class that can be invoked within a Harmony Kubernetes cluster, and will return +the input granule without any transformation. The `RegriddingServiceAdapter` performs +basic message validation, to ensure the message defines a valid target grid, +and that it does not specify a target CRS or interpolation method that is +incompatible with the service. The service itself will be implemented in future +tickets.