esgf2-us
diff --git a/‎.github/workflows/backend.yml
+10-8 b/‎.github/workflows/backend.yml
+10-8
diff --git a/‎.github/workflows/containers.yml
+72 b/‎.github/workflows/containers.yml
+72
diff --git a/‎.github/workflows/frontend.yml
+15-7 b/‎.github/workflows/frontend.yml
+15-7
diff --git a/‎.github/workflows/pre-commit.yml
+8-8 b/‎.github/workflows/pre-commit.yml
+8-8
diff --git a/‎.gitignore
+1 b/‎.gitignore
+1
diff --git a/‎.pre-commit-config.yaml
+4-4 b/‎.pre-commit-config.yaml
+4-4
diff --git a/‎.vscode/settings.json
+1-1 b/‎.vscode/settings.json
+1-1
diff --git a/‎backend/.envs/.django
+1-1 b/‎backend/.envs/.django
+1-1
diff --git a/‎backend/README.md
+37 b/‎backend/README.md
+37
diff --git a/‎backend/config/settings/base.py
+6-5 b/‎backend/config/settings/base.py
+6-5
diff --git a/‎backend/config/settings/local.py
+3-3 b/‎backend/config/settings/local.py
+3-3
diff --git a/‎backend/config/urls.py
+12 b/‎backend/config/urls.py
+12
diff --git a/‎backend/config/wsgi.py
+1 b/‎backend/config/wsgi.py
+1
diff --git a/‎backend/docker-compose.prod.yml
-2 b/‎backend/docker-compose.prod.yml
-2
diff --git a/‎backend/docker-compose.yml
-2 b/‎backend/docker-compose.yml
-2
@@ -24,8 +24,8 @@ env:
   REACT_APP_ESGF_SOLR_URL: https://esgf-fedtest.llnl.gov/solr
   DJANGO_LOGIN_REDIRECT_URL: http://localhost:3000/search
   DJANGO_LOGOUT_REDIRECT_URL: http://localhost:3000/search
-  GLOBUS_CLIENT_KEY: 12345
-  GLOBUS_CLIENT_SECRET: 12345
+  GLOBUS_CLIENT_KEY: ${{ secrets.GLOBUS_KEY }}
+  GLOBUS_CLIENT_SECRET: ${{ secrets.GLOBUS_SECRET }}
 
 jobs:
   build:
@@ -45,15 +45,15 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.11
 
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           # This path is specific to Ubuntu
           path: ~/.cache/pip
@@ -66,15 +66,17 @@ jobs:
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip
+          pip install setuptools
           pip install -r requirements/local.txt
 
       - name: Run Tests
         run: |
           pytest
 
       - name: Upload Coverage Report
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           file: "./backend/coverage.xml"
           flags: backend
-          fail_ci_if_error: true
 
@@ -0,0 +1,72 @@
+name: Container release
+
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+
+  pull_request:
+
+  workflow_dispatch:
+
+permissions: {}
+
+jobs:
+  frontend:
+    name: Build/release frontend container
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - uses: docker/metadata-action@v5
+        id: metadata
+        with:
+          images: ghcr.io/esgf2-us/metagrid-frontend
+          tags: |
+            type=semver,pattern={{version}}
+      - uses: docker/build-push-action@v4
+        with:
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          context: frontend/
+          file: frontend/docker/production/react/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
+  backend:
+    name: Build/release backend container
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - uses: docker/metadata-action@v5
+        id: metadata
+        with:
+          images: ghcr.io/esgf2-us/metagrid-backend
+          tags: |
+            type=semver,pattern={{version}}
+      - uses: docker/build-push-action@v4
+        with:
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          context: backend/
+          file: backend/docker/production/django/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
@@ -21,15 +21,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Use Node.js 21.x
-        uses: actions/setup-node@v2
+      - name: Use Node.js 22.x
+        uses: actions/setup-node@v4
         with:
-          node-version: "21.x"
+          node-version: "22.x"
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -44,12 +44,20 @@ jobs:
         run: yarn install --frozen-lockfile
 
       - name: Run Tests
+        env:
+          RELEASE: dev
+          ENV_FILE: .envs/.react
+          HTML_PATH: public
         run: |
+          # Replaces react-scripts substitution during build for index.html and generates runtime_env.js
+          docker/production/react/entrypoint
+
           yarn test:coverage
 
       - name: Upload Coverage Report
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           file: "./frontend/coverage/coverage-final.json"
           flags: frontend
-          fail_ci_if_error: true
 
@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # Required to run the local ESLint hook
-      - name: Use Node.js 21.x
-        uses: actions/setup-node@v2
+      - name: Use Node.js 22.x
+        uses: actions/setup-node@v4
         with:
-          node-version: "21.x"
+          node-version: "22.x"
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -36,12 +36,12 @@ jobs:
           yarn install --frozen-lockfile
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.11
 
       # Run all pre-commit hooks on all the files.
       # Getting only staged files can be tricky in case a new PR is opened
       # since the action is run on a branch in detached head state
       - name: Install and Run Pre-commit
-        uses: pre-commit/action@v2.0.2
+        uses: pre-commit/action@v3.0.1
@@ -189,3 +189,4 @@ tags
 .env
 .envs/*
 !.envs/.local/
+frontend/public/runtime_env.js
@@ -4,7 +4,7 @@ fail_fast: true
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -13,20 +13,20 @@ repos:
   # Back-end
   # ------------------------------------------------------------------------------
   - repo: https://github.com/pycqa/flake8
-    rev: 3.9.2
+    rev: 7.1.1
     hooks:
       - id: flake8
         args: ["--config=backend/setup.cfg"]
         additional_dependencies: [flake8-isort]
 
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 24.10.0
     hooks:
       - id: black
         args: ["--config=backend/pyproject.toml"]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.950
+    rev: v1.12.0
     hooks:
       - id: mypy
         additional_dependencies: ["types-requests"]
 
@@ -6,7 +6,7 @@
     "editor.rulers": [72, 79, 120],
     "editor.wordWrap": "wordWrapColumn",
     "editor.wordWrapColumn": 120,
-    "editor.defaultFormatter": "ms-python.python"
+    "editor.defaultFormatter": "ms-python.black-formatter"
   },
   // Update as needed
   "python.pythonPath": "backend/venv/bin/python",
 
@@ -30,7 +30,7 @@ REACT_APP_SEARCH_URL=https://esgf-node.llnl.gov/esg-search/search
 REACT_APP_ESGF_NODE_STATUS_URL=https://aims2.llnl.gov/metagrid-backend/proxy/status
 
 # ESGF Solr URL
-REACT_APP_ESGF_SOLR_URL=https://esgf-fedtest.llnl.gov/solr
+REACT_APP_ESGF_SOLR_URL=http://esgf-node.llnl.gov/solr/files/select
 
 # https://docs.djangoproject.com/en/4.2/ref/settings/#login-redirect-url
 # https://docs.djangoproject.com/en/4.2/ref/settings/#logout-redirect-url
 
@@ -1 +1,38 @@
 # MetaGrid API Back-end
+
+# Create a new python virtual environment for testing
+python3 -m venv backend/venv
+
+# Activate virtual env
+source backend/venv/bin/activate
+
+# Deactivate virtual env
+deactivate
+
+# Run pre-commit process on all files (will run flake8, black etc.)
+pre-commit run --all-files
+
+# Use Black formatting, cd to backend
+black .
+
+# Run Flake8 to linter in backend, cd to backend
+flake8 .
+
+# Update virtual environment with current requirements (after activating it)
+pip install -r requirements/local.txt
+
+# Rebuild container for testing backend
+docker compose -p metagrid_backend_dev build --no-cache
+
+# Run pyTest (May need to rebuild container before tests)
+docker compose -p metagrid_backend_dev run --rm django pytest
+
+# Run pyTest for a specific test (example)
+docker compose -p metagrid_backend_dev run --rm django pytest metagrid/api_proxy/tests/test_views.py::TestProxyViewSet::test_do_globus_auth
+
+# Run manage.py function
+docker compose -p metagrid_backend_dev run --rm django python manage.py <function>
+
+# View backend output in browser (localhost: example)
+
+Enter this browser url: https://aims2.llnl.gov/metagrid-backend/api/v1/projects
@@ -1,6 +1,7 @@
 """
 Base settings to build other settings files upon.
 """
+
 from datetime import timedelta
 from typing import List  # noqa
 
@@ -154,7 +155,7 @@
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
         "DIRS": STATICFILES_DIRS,
-        "APP_DIRS": True,
+        "APP_DIRS": False,
         "OPTIONS": {
             "context_processors": [
                 "django.template.context_processors.debug",
@@ -334,11 +335,11 @@
 # django-cors-headers
 # -------------------------------------------------------------------------------
 # https://github.com/adamchainz/django-cors-headers#setup
-CORS_ALLOWED_ORIGINS = [
-    "http://localhost:3000",
-]
+CORS_ALLOWED_ORIGINS = env.list(
+    "CORS_ALLOWED_ORIGINS", default=["http://localhost:5000"]
+)
 CORS_ALLOW_CREDENTIALS = True
-CORS_ORIGIN_WHITELIST = env.list("CORS_ORIGIN_WHITELIST")
+CORS_ORIGIN_WHITELIST = env.list("CORS_ORIGIN_WHITELIST", default=[])
 
 SEARCH_URL = env("REACT_APP_SEARCH_URL")
 WGET_URL = env("REACT_APP_WGET_API_URL")
 
@@ -28,9 +28,9 @@
 DEFAULT_RENDERER_CLASSES.append(  # noqa F405
     "rest_framework.renderers.BrowsableAPIRenderer",
 )
-REST_FRAMEWORK[  # noqa F405
-    "DEFAULT_RENDERER_CLASSES"
-] = DEFAULT_RENDERER_CLASSES  # noqa F405
+REST_FRAMEWORK["DEFAULT_RENDERER_CLASSES"] = (  # noqa F405
+    DEFAULT_RENDERER_CLASSES  # noqa F405
+)
 
 # WhiteNoise
 # ------------------------------------------------------------------------------
 
@@ -16,7 +16,9 @@
 from metagrid.api_proxy.views import (
     do_citation,
     do_globus_auth,
+    do_globus_get_endpoint,
     do_globus_logout,
+    do_globus_search_endpoints,
     do_search,
     do_status,
     do_wget,
@@ -56,6 +58,16 @@ class KeycloakLogin(SocialLoginView):
     path("", include("social_django.urls", namespace="social")),
     path("proxy/globus-logout/", do_globus_logout, name="globus-logout"),
     path("proxy/globus-auth/", do_globus_auth, name="globus-auth"),
+    path(
+        "proxy/globus-get-endpoint/",
+        do_globus_get_endpoint,
+        name="globus-get-endpoint",
+    ),
+    path(
+        "proxy/globus-search-endpoints/",
+        do_globus_search_endpoints,
+        name="globus-search-endpoints",
+    ),
     # all-auth
     path("accounts/", include("allauth.urls"), name="socialaccount_signup"),
     # dj-rest-auth
 
@@ -13,6 +13,7 @@
 framework.
 
 """
+
 import os
 import sys
 
 
@@ -1,5 +1,3 @@
-version: "3"
-
 volumes:
   production_postgres_data: {}
   production_postgres_data_backups: {}
 
@@ -1,5 +1,3 @@
-version: "3"
-
 volumes:
   local_postgres_data: {}
   local_postgres_data_backups: {}
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-version: "3"`
`2`		`-`
`3`	`1`	`volumes:`
`4`	`2`	`production_postgres_data: {}`
`5`	`3`	`production_postgres_data_backups: {}`