Bring in upstream changes

.flake8

@@ -0,0 +1,5 @@
+[flake8]
+max-line-length = 79
+# E203: whitespace before :, flake8 disagrees with PEP-8
+# W503: line break after binary operator, flake8 disagrees with PEP-8
+ignore = E203, W503

.github/workflows/ci.yaml

@@ -6,40 +6,50 @@ name: CI
       - "master"
 
 jobs:
-  yamllint:
+  lint:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+
+      - name: Set up go
+        uses: actions/setup-go@v3
+
+      - name: Install helm-docs
+        run: go install github.com/norwoodj/helm-docs/cmd/helm-docs@latest
+        env:
+          GOBIN: /usr/local/bin/
 
-      - name: yaml-lint
-        uses: ibiqlik/action-yamllint@master
+      - name: Set up Python
+        uses: actions/setup-python@v4
         with:
-          config_file: ".yamllint.yml"
+          python-version: "3.10"
+
+      - name: Run pre-commit
+        uses: pre-commit/action@v3.0.0
 
   helm:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 
       - name: Install test dependencies
-        run: pip install -r tests/requirements.txt
+        run: pip install .
 
       - name: Expand modified charts
-        run: tests/expand-services
+        run: expand-charts
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.2.0
+        uses: helm/chart-testing-action@v2.3.1
 
       - name: Run chart-testing (lint)
         run: ct lint --all --config ct.yaml
@@ -52,10 +62,11 @@ jobs:
   minikube:
     name: Test deploy
     runs-on: ubuntu-latest
+    needs: [helm]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Filter paths
         uses: dorny/paths-filter@v2
@@ -70,14 +81,15 @@ jobs:
               - "science-platform/values-minikube.yaml"
               - "services/*/Chart.yaml"
               - "services/*/templates/**"
+              - "services/*/values.yaml"
               - "services/*/values-minikube.yaml"
 
       - name: Setup Minikube
         if: steps.filter.outputs.minikube == 'true'
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.2
         with:
-          minikube version: 'v1.24.0'
-          kubernetes version: 'v1.22.5'
+          minikube version: 'v1.28.0'
+          kubernetes version: 'v1.25.2'
 
       - name: Test interaction with the cluster
         if: steps.filter.outputs.minikube == 'true'
@@ -86,16 +98,17 @@ jobs:
       - name: Download installer dependencies
         if: steps.filter.outputs.minikube == 'true'
         run: |
-          curl -sSL -o /tmp/vault.zip https://releases.hashicorp.com/vault/1.9.1/vault_1.9.1_linux_amd64.zip
+          curl -sSL -o /tmp/vault.zip https://releases.hashicorp.com/vault/1.12.1/vault_1.12.1_linux_amd64.zip
           unzip /tmp/vault.zip
           sudo mv vault /usr/local/bin/vault
           sudo chmod +x /usr/local/bin/vault
-          sudo curl -sSL -o /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/download/v2.1.7/argocd-linux-amd64
+          sudo curl -sSL -o /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/download/v2.5.1/argocd-linux-amd64
           sudo chmod +x /usr/local/bin/argocd
           sudo apt-get install socat
           sudo pip install -r installer/requirements.txt
 
       - name: Run installer
+        timeout-minutes: 30
         if: steps.filter.outputs.minikube == 'true'
         run: |
           cd installer

.github/workflows/docs.yaml

@@ -4,6 +4,8 @@ name: Docs
   pull_request:
     paths:
       - "docs/**"
+      - "services/*/Chart.yaml"
+      - "services/*/values.yaml"
   push:
     branches-ignore:
       # These should always correspond to pull requests, so ignore them for
@@ -18,32 +20,35 @@ name: Docs
       - "*"
     paths:
       - "docs/**"
+      - "services/*/Chart.yaml"
+      - "services/*/values.yaml"
 
 jobs:
   docs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Python install
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install -r docs/requirements.txt
+          python -m pip install --upgrade pip tox
+          python -m pip install -e ".[dev]"
           python -m pip install ltd-conveyor
 
       - name: Install graphviz
         run: sudo apt-get install graphviz
 
-      - name: Build
-        run: |
-          cd docs
-          make html
+      - name: Run tox
+        uses: lsst-sqre/run-tox@v1
+        with:
+          python-version: "3.10"
+          tox-envs: "docs"
 
       # Only attempt documentation uploads for long-lived branches, tagged
       # releases, and pull requests from ticket branches.  This avoids version

.gitignore

@@ -2,5 +2,167 @@
 /installer/docker-creds
 /services/*/charts/*.tgz
 /services-expanded/
-.DS_Store
 **/Chart.lock
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+docs/api/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+.idea/workspace.xml
+
+.idea/inspectionProfiles/Project_Default.xml
+
+services/alert-stream-broker/charts/.DS_Store
+
+services/.DS_Store
+
+services/alert-stream-broker/.DS_Store
+
+.idea/modules.xml
+
+.idea/phalanx.iml
+
+.idea/vcs.xml
+
+.DS_Store
+
+.idea/inspectionProfiles/profiles_settings.xml
+
+services/alert-stream-broker/.idea/alert-stream-broker.iml
+
+services/alert-stream-broker/.idea/vcs.xml
+
+services/alert-stream-broker/.idea/inspectionProfiles/profiles_settings.xml
+
+services/alert-stream-broker/.idea/inspectionProfiles/Project_Default.xml
+
+services/alert-stream-broker/.idea/modules.xml
+
+services/alert-stream-broker/.idea/misc.xml

.pre-commit-config.yaml

@@ -0,0 +1,45 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: trailing-whitespace
+      - id: check-toml
+
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.29.0
+    hooks:
+      - id: yamllint
+        args:
+          - "-c=.yamllint.yml"
+
+  - repo: https://github.com/norwoodj/helm-docs
+    rev: v1.11.0
+    hooks:
+      - id: helm-docs
+        args:
+          - "--chart-search-root=."
+          # The `./` makes it relative to the chart-search-root set above
+          - "--template-files=./helm-docs.md.gotmpl"
+
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+        additional_dependencies:
+          - toml
+
+  - repo: https://github.com/psf/black
+    rev: 23.1a1
+    hooks:
+      - id: black
+
+  - repo: https://github.com/asottile/blacken-docs
+    rev: 1.13.0
+    hooks:
+      - id: blacken-docs
+        additional_dependencies: [black==23.1a1]
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 6.0.0
+    hooks:
+      - id: flake8