Merge branch 'develop' into release/0.10.0

# Conflicts:
#	poetry.lock
#	pyproject.toml

.github/workflows/build-pipeline.yml

@@ -243,7 +243,6 @@ jobs:
           pull: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
       - name: Deploy Harmony
         env:
             ENV: ${{ env.venue }}
@@ -255,6 +254,17 @@ jobs:
         working-directory: deployment
         run: 
           poetry run python harmony_deploy.py --tag ${{ env.software_version }} 
+      - name: Create Release
+        id: create_release
+        if: |
+          github.ref == 'refs/heads/main'
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: "${{ env.software_version }}"  # Use the tag that triggered the action
+          release_name: Release v{{ env.software_version }}
+          draft: false
+          generate_release_notes: true
+          token: ${{ secrets.GITHUB_TOKEN }}
 
 # As of 2023/01/23 these steps below for scanning the Docker image with Snyk are failing. I've tried both the official Snyk
 # action https://github.com/snyk/actions/tree/master/docker and this method below of manually calling the CLI.

CHANGELOG.md

@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Update Github Actions
     - Added harmony deployment into github actions.
 ### Changed
+  - [issue #117](https://github.com/podaac/concise/issues/117): Add part of URL to output file name
 ### Deprecated
 ### Removed
 ### Fixed

podaac/merger/harmony/service.py

@@ -32,7 +32,7 @@ def invoke(self):
         Primary entrypoint into the service wrapper. Overrides BaseHarmonyAdapter.invoke
         """
         if not self.catalog:
-            # Message-only support is being depreciated in Harmony so we should expect to
+            # Message-only support is being depreciated in Harmony, so we should expect to
             # only see requests with catalogs when invoked with a newer Harmony instance
             # https://github.com/nasa/harmony-service-lib-py/blob/21bcfbda17caf626fb14d2ac4f8673be9726b549/harmony/adapter.py#L71
             raise RuntimeError('Invoking CONCISE without a STAC catalog is not supported')
@@ -42,7 +42,7 @@ def invoke(self):
     def process_catalog(self, catalog: Catalog):
         """
         Recursively process a catalog and all its children. Adapted from
-        BaseHarmonyAdapter._process_catalog_recursive to specfifically
+        BaseHarmonyAdapter._process_catalog_recursive to specifically
         support our particular use case for many-to-one
 
         Parameters
@@ -85,7 +85,10 @@ def process_catalog(self, catalog: Catalog):
 
         # -- Perform merging --
         collection = self._get_item_source(items[0]).collection
-        filename = f'{collection}_merged.nc4'
+        first_granule_url = []
+        get_granule_url(items[0], first_granule_url)
+        first_url_name = Path(first_granule_url[0]).stem
+        filename = f'{first_url_name}_{datetimes[1].strftime("%Y%m%dT%H%M%SZ")}_{collection}_merged.nc4'
 
         with TemporaryDirectory() as temp_dir:
             self.logger.info('Starting granule downloads')