Merge branch 'main' into main

Author: SpicyGarlicAlbacoreRoll

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
       - id: check-added-large-files
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.11
+    rev: v0.15.12
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]

CHANGELOG.md

@@ -5,12 +5,19 @@ versioning. Rather than a static releases, this repository contains of a number
 of regression tests that are each semi-independent.  This CHANGELOG file should be used
 to document pull requests to this repository.
 
-## 2026-04-28 ([#275](https://github.com/nasa/harmony-regression-tests/pull/275))
+## 2026-05-07 ([#275](https://github.com/nasa/harmony-regression-tests/pull/275))
 
 ### Added
 
 - Added basic GCOV test cases to `net2cog` test.
 
+## 2026-04-29 ([#281](https://github.com/nasa/harmony-regression-tests/pull/281))
+
+### Changed
+
+- The `harmony` regression test has been changed to verify harmony's successful
+  deployment by verifying expected returns from a selection of endpoints.
+
 ## 2026-04-24 ([#277](https://github.com/nasa/harmony-regression-tests/pull/277))
 
 ### Changed

test/harmony/Harmony.ipynb

@@ -2,17 +2,27 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "source": [
     "# Harmony Regression Test Suite\n",
     "\n",
-    "This test suite ensures some overall features of the main Harmony service work as expected. Currently that is limited to ensuring the expected services are deployed to all Harmony environments."
+    "This test suite ensures some Harmony Service was deployed successfully and the expected endpoints are returning successfully."
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
     "tags": [
      "parameters"
     ]
@@ -24,7 +34,13 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "source": [
     "## Prerequisites\n",
     "\n",
@@ -37,49 +53,79 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Import required packages:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import requests"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "source": [
-    "## Ensure expected services are available, per the `/versions` endpoint:"
+    "## Ensure endpoints are returning expected values."
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "outputs": [],
    "source": [
-    "expected_service_names = [\n",
-    "    'harmony/service-example',\n",
-    "    'nasa/harmony-gdal-adapter',\n",
-    "    'podaac/l2-subsetter',\n",
+    "import requests\n",
+    "from requests.adapters import HTTPAdapter\n",
+    "from urllib3.util.retry import Retry\n",
+    "\n",
+    "# Set up retrying so we don't fail for a transient error.\n",
+    "retry_strategy = Retry(\n",
+    "    total=5,\n",
+    "    backoff_factor=2,\n",
+    "    status_forcelist=[500, 502, 503, 504],\n",
+    ")\n",
+    "\n",
+    "adapter = HTTPAdapter(max_retries=retry_strategy)\n",
+    "session = requests.Session()\n",
+    "session.mount('https://', adapter)\n",
+    "session.mount('http://', adapter)\n",
+    "\n",
+    "harmony_endpoints = [\n",
+    "    '',\n",
+    "    'cloud-access',\n",
+    "    'docs',\n",
+    "    'docs/api',\n",
+    "    'docs/edr-api',\n",
+    "    'health',\n",
+    "    'jobs',\n",
+    "    'readiness',\n",
+    "    'service-deployment',\n",
+    "    'service-deployments-state',\n",
+    "    'service-image-tag',\n",
+    "    'versions',\n",
+    "    'workflow-ui',\n",
     "]\n",
     "\n",
-    "versions_response = requests.get(f'{harmony_host_url}/versions')\n",
-    "versions_response.raise_for_status()\n",
-    "actual_services = versions_response.json()\n",
+    "for endpoint in harmony_endpoints:\n",
+    "    try:\n",
+    "        response = session.get(f'{harmony_host_url}/{endpoint}')\n",
+    "        response.raise_for_status()\n",
+    "        assert response.status_code == 200\n",
+    "        print(f'Endpoint /{endpoint} alive.')\n",
+    "    except Exception:\n",
+    "        raise Exception(\n",
+    "            f'TEST FAILED: Bad response from endpoint {harmony_host_url}/{endpoint}'\n",
+    "        ) from None\n",
+    "\n",
+    "# /capabilities requires a collection so a 400 error is expected.\n",
+    "response = session.get(f'{harmony_host_url}/capabilities')\n",
+    "assert response.status_code == 400\n",
+    "print('Endpoint /capabilities alive.')\n",
     "\n",
-    "for expected_service_name in expected_service_names:\n",
-    "    assert any(\n",
-    "        [service.get('name') == expected_service_name for service in actual_services]\n",
-    "    ), f'Could not find service: {expected_service_name}'\n",
     "\n",
-    "print('All expected services returned from /versions endpoint.')"
+    "print('All expected endpoints responding.')"
    ]
   }
  ],
@@ -100,7 +146,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.13.13"
   }
  },
  "nbformat": 4,

test/harmony/__init__.py

@@ -3,9 +3,10 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - python=3.10
-  - notebook==6.5.4
-  - requests==2.29.0
-  - papermill==2.3.4
+  - python=3.13
+  - notebook==7.5.5
+  - requests==2.32.5
+  - papermill==2.7.0
+  - pip
   - pip:
-    - harmony-py
+    - harmony-py==1.3.3

test/harmony/environment.yaml

@@ -1 +1 @@
-0.1.7
+0.2.0