Removed stac-auth-proxy charts patch.

Author: pantierra

charts/eoapi/Chart.yaml

@@ -78,6 +78,6 @@ dependencies:
     repository: https://grafana.github.io/helm-charts
     condition: observability.grafana.enabled
   - name: stac-auth-proxy
-    version: "0.1.0"
+    version: "0.1.1"
     repository: "oci://ghcr.io/developmentseed/stac-auth-proxy/charts"
     condition: stac-auth-proxy.enabled

charts/eoapi/templates/core/stac-auth-proxy-patch-rbac.yaml

@@ -78,6 +78,16 @@ spec:
                   number: {{ $.Values.service.port }}
           {{- end }}
 
+          {{- if and $.Values.mockOidcServer.enabled $.Values.mockOidcServer.ingress.enabled }}
+          - pathType: {{ if eq $.Values.ingress.className "nginx" }}ImplementationSpecific{{ else }}Prefix{{ end }}
+            path: {{ $.Values.mockOidcServer.ingress.path }}{{ if eq $.Values.ingress.className "nginx" }}(/|$)(.*){{ end }}
+            backend:
+              service:
+                name: {{ $.Release.Name }}-mock-oidc-server
+                port:
+                  number: {{ $.Values.mockOidcServer.service.port | default 8080 }}
+          {{- end }}
+
           {{- if $.Values.docServer.enabled }}
           - pathType: Prefix
             path: "/{{ $.Values.ingress.rootPath | default "" }}"
@@ -138,6 +148,16 @@ spec:
                   number: {{ .Values.service.port }}
           {{- end }}
 
+          {{- if and .Values.mockOidcServer.enabled .Values.mockOidcServer.ingress.enabled }}
+          - pathType: {{ if eq .Values.ingress.className "nginx" }}ImplementationSpecific{{ else }}Prefix{{ end }}
+            path: {{ .Values.mockOidcServer.ingress.path }}{{ if eq .Values.ingress.className "nginx" }}(/|$)(.*){{ end }}
+            backend:
+              service:
+                name: {{ .Release.Name }}-mock-oidc-server
+                port:
+                  number: {{ .Values.mockOidcServer.service.port | default 8080 }}
+          {{- end }}
+
           {{- if .Values.docServer.enabled }}
           - pathType: Prefix
             path: "/{{ $.Values.ingress.rootPath | default "" }}"

charts/eoapi/templates/core/stac-auth-proxy-patch.yaml

@@ -19,4 +19,7 @@ spec:
       {{- if .Values.multidim.enabled }}
       - {{ .Values.multidim.ingress.path }}
       {{- end }}
+      {{- if and .Values.mockOidcServer.enabled .Values.mockOidcServer.ingress.enabled }}
+      - {{ .Values.mockOidcServer.ingress.path }}
+      {{- end }}
 {{- end }}

charts/eoapi/templates/mock-oidc/ingress.yaml

@@ -37,7 +37,7 @@ def get_mock_token(mock_oidc_endpoint: Optional[str] = None) -> str:
         )
 
     response = requests.post(
-        mock_oidc_endpoint,
+        f"{mock_oidc_endpoint}/",
         data={
             "username": "test-user",
             "scopes": "openid profile stac:read stac:write",
@@ -47,9 +47,16 @@ def get_mock_token(mock_oidc_endpoint: Optional[str] = None) -> str:
 
     if response.status_code == 200:
         html = response.text
-        if 'value="' in html:
-            token = html.split('value="')[1].split('"')[0]
-            return f"Bearer {token}"
+        # Extract token from textarea element
+        if "<textarea" in html and ">" in html:
+            # Find the textarea content between > and </textarea>
+            start_marker = html.find("<textarea")
+            if start_marker != -1:
+                content_start = html.find(">", start_marker) + 1
+                content_end = html.find("</textarea>", content_start)
+                if content_start != -1 and content_end != -1:
+                    token = html[content_start:content_end].strip()
+                    return f"Bearer {token}"
 
     raise Exception(
         f"Could not get token from mock OIDC server at {mock_oidc_endpoint}"

charts/eoapi/templates/networking/ingress.yaml

@@ -1,6 +1,7 @@
 """Test STAC API with auth proxy authentication."""
 
 import os
+import time
 
 import httpx
 import pytest
@@ -24,7 +25,7 @@ def test_stac_auth_without_token(stac_endpoint: str) -> None:
         f"{stac_endpoint}/collections/noaa-emergency-response/items",
         headers={"Content-Type": "application/json"},
         json={
-            "id": "test-no-token",
+            "id": f"test-no-token-{int(time.time() * 1000)}",
             "type": "Feature",
             "stac_version": "1.0.0",
             "properties": {"datetime": "2024-01-01T00:00:00Z"},
@@ -52,7 +53,7 @@ def test_stac_auth_with_invalid_token(stac_endpoint: str) -> None:
             "Content-Type": "application/json",
         },
         json={
-            "id": "test-invalid-token",
+            "id": f"test-invalid-token-{int(time.time() * 1000)}",
             "type": "Feature",
             "stac_version": "1.0.0",
             "properties": {"datetime": "2024-01-01T00:00:00Z"},
@@ -80,7 +81,7 @@ def test_stac_auth_with_valid_token(
             "Content-Type": "application/json",
         },
         json={
-            "id": "test-valid-token",
+            "id": f"test-valid-token-{int(time.time() * 1000)}",
             "type": "Feature",
             "stac_version": "1.0.0",
             "properties": {"datetime": "2024-01-01T00:00:00Z"},

charts/eoapi/templates/networking/traefik-middleware.yaml

@@ -239,31 +239,17 @@ def test_update_notification(
 
     before_time = time.time()
 
-    updated_item["properties"]["description"] = "Updated for notification test"
-
-    response = requests.put(
-        f"{stac_client['base_url']}/collections/noaa-emergency-response/items/{test_item['id']}",
-        json=updated_item,
-        headers=stac_client["headers"],
-        timeout=stac_client["timeout"],
-    )
-
-    assert response.status_code in [200, 201], (
-        f"Failed to create item: {response.text}"
-    )
-
+    test_item["properties"]["description"] = "Updated for notification test"
     test_item["properties"]["test_version"] = "v2"
 
-    before_time = time.time()
-
     response = requests.put(
         f"{stac_client['base_url']}/collections/noaa-emergency-response/items/{test_item_id}",
         json=test_item,
         headers=stac_client["headers"],
         timeout=stac_client["timeout"],
     )
 
-    assert response.status_code in [200, 204], (
+    assert response.status_code in [200, 201], (
         f"Failed to update item: {response.text}"
     )
 
@@ -317,18 +303,6 @@ def test_delete_notification(
 
     before_time = time.time()
 
-    response = requests.delete(
-        f"{stac_client['base_url']}/collections/noaa-emergency-response/items/{test_item['id']}",
-        headers=stac_client["headers"],
-        timeout=stac_client["timeout"],
-    )
-
-    assert response.status_code in [200, 201], (
-        f"Failed to create item: {response.text}"
-    )
-
-    before_time = time.time()
-
     response = requests.delete(
         f"{stac_client['base_url']}/collections/noaa-emergency-response/items/{test_item_id}",
         headers=stac_client["headers"],