Build docker

.coveragerc

@@ -1,4 +1,4 @@
 [run]
 relative_files = True
-source = app/
+source = fed_reg/
 branch = True

.devcontainer/devcontainer.json

@@ -12,36 +12,58 @@
   "customizations": {
     "vscode": {
       "extensions": [
-        "redhat.vscode-yaml",
-        "charliermarsh.ruff",
-        "ms-python.python",
-        "ms-python.vscode-pylance",
-        "yzhang.markdown-all-in-one",
-        "eamodio.gitlens",
         "ms-azuretools.vscode-docker",
+        "esbenp.prettier-vscode",
         "streetsidesoftware.code-spell-checker",
-        "esbenp.prettier-vscode"
+        "SonarSource.sonarlint-vscode",
+        "eamodio.gitlens",
+        "charliermarsh.ruff"
       ],
       "settings": {
-        "python.defaultInterpreterPath": "/usr/local/bin/python"
+        "[python]": {
+          "editor.defaultFormatter": "charliermarsh.ruff"
+        },
+        "[dockerfile]": {
+          "editor.defaultFormatter": "ms-azuretools.vscode-docker"
+        },
+        "[dockercompose]": {
+          "editor.defaultFormatter": "ms-azuretools.vscode-docker"
+        },
+        "sonarlint.connectedMode.project": {
+          "connectionId": "indigo-paas/federation-registry",
+          "projectKey": "indigo-paas_federation-registry"
+        },
+        "python.analysis.autoFormatStrings": true,
+        "python.analysis.inlayHints.functionReturnTypes": true,
+        "python.analysis.inlayHints.pytestParameters": true,
+        "python.analysis.autoImportCompletions": true,
+        "python.analysis.completeFunctionParens": true,
+        "python.defaultInterpreterPath": "/home/node/.venv/bin/python",
+        "python.testing.pytestEnabled": true
       }
     }
   },
+
   // Features to add to the dev container. More info: https://containers.dev/features.
   "features": {
     "ghcr.io/devcontainers-contrib/features/act:1": {},
     "ghcr.io/devcontainers-contrib/features/pre-commit:2": {},
     "ghcr.io/devcontainers-contrib/features/ruff:1": {},
     "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
     "ghcr.io/devcontainers/features/git:1": {},
-    "ghcr.io/devcontainers/features/github-cli:1": {}
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers/features/python:1": {
+      "installTools": true,
+      "version": "3.9"
+    },
+    "ghcr.io/devcontainers-contrib/features/poetry:2": {}
   },
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [],
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}"
+  "postStartCommand": "bash .devcontainer/postCreateCommand.sh"
 
   // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
   // "remoteUser": "root"

.devcontainer/docker-compose.yml

@@ -2,36 +2,47 @@ version: "3"
 
 services:
   db:
-    image: neo4j:5.8.0
+    image: neo4j:5.15
+    container_name: fed-reg-devc-db
     volumes:
-      - dev-db-data:/data
-      - dev-db-logs:/logs
-    ports:
-      - "7474:7474"
-      - "7687:7687"
+      - fed-reg-devc-db-data:/data
+      - fed-reg-devc-db-logs:/logs
     environment:
       - NEO4J_AUTH=none
       - NEO4J_PLUGINS=["apoc"]
+    networks:
+      - fed-reg-devc-db
 
   oidc-agent:
-    image: opensciencegrid/oidc-agent:3.6-release-20230802-1615
+    image: opensciencegrid/oidc-agent:3.6-release-20240220-1639
+    container_name: fed-reg-devc-oidc-agent
     platform: linux/amd64
+    volumes:
+      - fed-reg-devc-oidc-agent-iss-config:/root/.oidc-agent
+    networks:
+      - fed-reg-devc-oidc-agent
 
   base:
-    build:
-      context: ../.
-      target: development
-      args:
-        INSTALL_DEV: ${INSTALL_DEV-true}
+    image: mcr.microsoft.com/devcontainers/typescript-node:18
+    container_name: fed-reg-devc-base
     depends_on:
       - db
+      - oidc-agent
     volumes:
       - ..:/workspace:cached
     environment:
-      - NEO4J_SERVER=db
-    # Infinite loop to keep container live doing nothing
-    command: bash -c "while true; do sleep 1; done"
+      - NEO4J_SERVER=fed-reg-devc-db
+      - OIDC_AGENT_CONTAINER_NAME=fed-reg-devc-oidc-agent
+    networks:
+      - fed-reg-devc-db
+      - fed-reg-devc-oidc-agent
+    command: sleep infinity
 
 volumes:
-  dev-db-data:
-  dev-db-logs:
+  fed-reg-devc-db-data:
+  fed-reg-devc-db-logs:
+  fed-reg-devc-oidc-agent-iss-config:
+
+networks:
+  fed-reg-devc-db:
+  fed-reg-devc-oidc-agent:

.devcontainer/postCreateCommand.sh

@@ -0,0 +1,5 @@
+poetry install
+
+echo alias oidc-add=\'docker exec -it \${OIDC_AGENT_CONTAINER_NAME} oidc-add\' >> /home/node/.bashrc
+echo alias oidc-gen=\'docker exec -it \${OIDC_AGENT_CONTAINER_NAME} oidc-gen\' >> /home/node/.bashrc
+echo alias oidc-token=\'docker exec \${OIDC_AGENT_CONTAINER_NAME} oidc-token\' >> /home/node/.bashrc

.github/workflows/docker-build.yaml

@@ -0,0 +1,43 @@
+name: Build and push docker image to Docker Hub
+
+on:
+  push:
+    branches: [main, build-docker]
+    tags:
+      - "v*"
+  pull_request:
+    branches: [main]
+
+  workflow_dispatch:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Docker meta
+        id: docker_meta
+        uses: crazy-max/ghaction-docker-meta@v5
+        with:
+          images: indigopaas/federation-registry
+          tags: |
+            type=sha
+            type=semver,pattern={{raw}}
+            type=ref,event=branch
+      - name: Build & Push image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}

.github/workflows/sonar.yaml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - devel
+      - ci
   pull_request:
     types:
       - opened
@@ -15,23 +16,22 @@ jobs:
   test-analysis:
     name: Python tests
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        python-version: [3.8]
-        #, 3.9, 3.10, 3.11]
 
     services:
+      neo4j-db:
       # Set up neo4j DB with APOC extension for UUIDs.
-      neo4j:
         image: neo4j:5.8.0
         ports:
-          - 7474:7474
-          - 7687:7687
+          - 7687
         env:
           NEO4J_AUTH: none
           NEO4J_PLUGINS: "apoc"
 
+    strategy:
+      fail-fast: true
+      matrix:
+        python-version: ["3.9", "3.10", "3.11"]
+
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -44,6 +44,7 @@ jobs:
         uses: snok/install-poetry@v1
         with:
           virtualenvs-create: true
+          virtualenvs-in-project: true
 
       # Set up python versions to use
       - name: Set up Python ${{ matrix.python-version }}
@@ -59,16 +60,17 @@ jobs:
 
       # Run tests
       - name: Run tests
-        run: poetry run pytest --cov --cov-report=xml --cov-report=html
+        run: poetry run pytest tests/test_auth.py --cov --cov-report=xml --cov-report=html
         env:
-          NEO4J_SERVER: localhost:7687
+          NEO4J_SERVER: "localhost:${{ job.services.neo4j-db.ports[7687] }}"
 
       # Upload coverage as artifacts
       - name: Upload HTML coverage as artifact
         uses: actions/upload-artifact@v3
         with:
           name: code-coverage-${{ matrix.python-version }}-html
           path: htmlcov
+
       - name: Upload XML coverage as artifact
         uses: actions/upload-artifact@v3
         with:
@@ -85,7 +87,7 @@ jobs:
           args: >
             -Dsonar.organization=${{ github.repository_owner }}
             -Dsonar.projectKey=${{ github.repository_owner }}_federation-registry
-            -Dsonar.sources=app
+            -Dsonar.sources=fed_reg
             -Dsonar.tests=tests
             -Dsonar.python.version=${{ matrix.python-version }}
             -Dsonar.python.coverage.reportPaths=coverage.xml

.gitignore

@@ -1,5 +1,6 @@
 # VSCode and other IDEs
-**/.vscode
+**/.vscode/**
+!**/.vscode/launch.json
 
 # Python Build
 **/__pycache__

.vscode/launch.json

@@ -0,0 +1,61 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Python: Current File and Dependencies",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "${file}",
+      "console": "integratedTerminal",
+      "justMyCode": false
+    },
+    {
+      "name": "Uvicorn: FastAPI App",
+      "type": "debugpy",
+      "request": "launch",
+      "module": "uvicorn",
+      "args": ["fed_reg.main:app", "--reload"],
+      "console": "integratedTerminal",
+      "justMyCode": false
+    },
+    {
+      "name": "Pytest: Specific test",
+      "type": "debugpy",
+      "request": "launch",
+      "module": "pytest",
+      "args": ["${lineNumber}"],
+      "console": "integratedTerminal",
+      "justMyCode": true
+    },
+    {
+      "name": "Pytest: Specific file",
+      "type": "debugpy",
+      "request": "launch",
+      "module": "pytest",
+      "args": ["${relativeFile}"],
+      "console": "integratedTerminal",
+      "justMyCode": true
+    },
+    {
+      "name": "Pytest: Specific folder",
+      "type": "debugpy",
+      "request": "launch",
+      "module": "pytest",
+      "args": ["${relativeFileDirname}"],
+      "console": "integratedTerminal",
+      "justMyCode": true
+    },
+    {
+      "name": "Pytest: All",
+      "type": "debugpy",
+      "request": "launch",
+      "module": "pytest",
+      "args": ["${workspaceFolder}/tests"],
+      "console": "integratedTerminal",
+      "justMyCode": true
+    }
+  ]
+}