diff --git a/.github/workflows/image-build-scan.yml b/.github/workflows/image-build-scan.yml
index 8bc213bc..c8e3de8b 100644
--- a/.github/workflows/image-build-scan.yml
+++ b/.github/workflows/image-build-scan.yml
@@ -3,11 +3,11 @@ name: "Build Docker image and run Trivy vulnerability scan"
on:
push:
# Publish `master` as `latest` image.
- branches: [ master ]
- # Publish `2.*` tags as releases.
- tags: [ '2.*' ]
+ branches: [master]
+ # Publish tagged commits as releases.
+ tags: ["*"]
pull_request:
- branches: [ master ]
+ branches: [master]
env:
REGISTRY: ghcr.io
@@ -77,16 +77,18 @@ jobs:
# Run vulnerability scan on built image
#----------------------------------------------
- name: Run Trivy vulnerability scanner
- uses: aquasecurity/trivy-action@master
+ uses: aquasecurity/trivy-action@0.29.0
+ env:
+ TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
with:
- scan-type: 'image'
- scanners: 'vuln'
+ scan-type: "image"
+ scanners: "vuln"
image-ref: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- vuln-type: 'os,library'
- severity: 'HIGH,CRITICAL'
- format: 'sarif'
- output: 'trivy-results.sarif'
+ vuln-type: "os,library"
+ severity: "HIGH,CRITICAL"
+ format: "sarif"
+ output: "trivy-results.sarif"
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v3
with:
- sarif_file: 'trivy-results.sarif'
+ sarif_file: "trivy-results.sarif"
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 22fb005f..93a2233a 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -3,9 +3,9 @@ name: "Run Django unit tests"
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
- branches: [ master ]
+ branches: [master]
pull_request:
- branches: [ master ]
+ branches: [master]
workflow_dispatch:
jobs:
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-python@v5
id: setup-python
with:
- python-version: '3.12'
+ python-version: "3.12"
#----------------------------------------------
# Install GDAL into the environment
#----------------------------------------------
diff --git a/.github/workflows/secret-scan.yml b/.github/workflows/secret-scan.yml
index d19177f6..22cde016 100644
--- a/.github/workflows/secret-scan.yml
+++ b/.github/workflows/secret-scan.yml
@@ -13,13 +13,13 @@ jobs:
name: Scan project for secrets
runs-on: ubuntu-latest
steps:
- - name: Checkout repository
- uses: actions/checkout@v4
- with:
- fetch-depth: 0
- - name: Secret scanning
- uses: trufflesecurity/trufflehog@main
- with:
- base: ""
- head: ${{ github.ref_name }}
- extra_args: --only-verified
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ - name: Secret scanning
+ uses: trufflesecurity/trufflehog@main
+ with:
+ base: ""
+ head: ${{ github.ref_name }}
+ extra_args: --only-verified
diff --git a/Dockerfile b/Dockerfile
index 21702815..3a2405c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
# Prepare the base environment.
-FROM python:3.12.6-alpine AS builder_base
+FROM python:3.12.8-alpine AS builder_base
LABEL org.opencontainers.image.authors=asi@dbca.wa.gov.au
LABEL org.opencontainers.image.source=https://github.com/dbca-wa/it-assets
@@ -26,11 +26,11 @@ RUN apk add --no-cache \
proj \
binutils \
&& ln -s /usr/lib/libproj.so.25 /usr/lib/libproj.so \
- && ln -s /usr/lib/libgdal.so.35 /usr/lib/libgdal.so \
+ && ln -s /usr/lib/libgdal.so.36 /usr/lib/libgdal.so \
&& ln -s /usr/lib/libgeos_c.so.1 /usr/lib/libgeos_c.so
WORKDIR /app
COPY poetry.lock pyproject.toml ./
-ARG POETRY_VERSION=1.8.3
+ARG POETRY_VERSION=1.8.5
RUN pip install --no-cache-dir --root-user-action=ignore poetry==${POETRY_VERSION} \
&& poetry config virtualenvs.create false \
&& poetry install --no-interaction --no-ansi --only main
diff --git a/kustomize/README.md b/kustomize/README.md
index 6c5f7b2b..cb12eba8 100644
--- a/kustomize/README.md
+++ b/kustomize/README.md
@@ -2,7 +2,7 @@
Declarative management of IT Assets Kubernetes resources using Kustomize.
-# How to use
+## How to use
Within an overlay directory, create a `.env` file to contain required secret
values in the format KEY=value (i.e. `overlays/uat/.env`). Required values:
@@ -22,8 +22,8 @@ Run `kubectl` with the `-k` flag to generate resources for a given overlay:
kubectl apply -k kustomize/overlays/uat --namespace sss --dry-run=client
```
-# References:
+## References
-* https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/
-* https://github.com/kubernetes-sigs/kustomize
-* https://github.com/kubernetes-sigs/kustomize/tree/master/examples
+-
+-
+-
diff --git a/kustomize/base/clusterip.yaml b/kustomize/base/clusterip.yaml
index dbfff528..ef14c7a6 100644
--- a/kustomize/base/clusterip.yaml
+++ b/kustomize/base/clusterip.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
type: ClusterIP
ports:
- - name: wsgi
- port: 8080
- protocol: TCP
- targetPort: 8080
+ - name: wsgi
+ port: 8080
+ protocol: TCP
+ targetPort: 8080
diff --git a/kustomize/base/deployment.yaml b/kustomize/base/deployment.yaml
index 1302852d..b3b1d275 100644
--- a/kustomize/base/deployment.yaml
+++ b/kustomize/base/deployment.yaml
@@ -2,73 +2,81 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: itassets-deployment
+ labels:
+ app: itassets-deployment
spec:
+ selector:
+ matchLabels:
+ app: itassets-deployment
strategy:
type: RollingUpdate
template:
+ metadata:
+ labels:
+ app: itassets-deployment
spec:
containers:
- - name: itassets
- image: ghcr.io/dbca-wa/it-assets
- env:
- - name: ALLOWED_HOSTS
- value: ".dbca.wa.gov.au"
- - name: CSRF_TRUSTED_ORIGINS
- value: "https://*.dbca.wa.gov.au"
- - name: CSRF_COOKIE_SECURE
- value: "True"
- - name: SESSION_COOKIE_SECURE
- value: "True"
- - name: TZ
- value: "Australia/Perth"
- resources:
- requests:
- memory: "100Mi"
- cpu: "5m"
- limits:
- memory: "4096Mi"
- cpu: "1000m"
- startupProbe:
- httpGet:
- path: /livez
- port: 8080
- scheme: HTTP
- initialDelaySeconds: 3
- periodSeconds: 15
- timeoutSeconds: 10
- successThreshold: 1
- failureThreshold: 3
- livenessProbe:
- httpGet:
- path: /livez
- port: 8080
- scheme: HTTP
- initialDelaySeconds: 0
- periodSeconds: 15
- successThreshold: 1
- failureThreshold: 3
- timeoutSeconds: 10
- readinessProbe:
- httpGet:
- path: /readyz
- port: 8080
- scheme: HTTP
- initialDelaySeconds: 0
- periodSeconds: 15
- successThreshold: 1
- failureThreshold: 3
- timeoutSeconds: 10
- securityContext:
- runAsNonRoot: true
- privileged: false
- allowPrivilegeEscalation: false
- capabilities:
- drop:
- - ALL
- readOnlyRootFilesystem: true
- volumeMounts:
- - mountPath: /tmp
- name: tmpfs-ram
+ - name: itassets
+ image: ghcr.io/dbca-wa/it-assets
+ env:
+ - name: ALLOWED_HOSTS
+ value: ".dbca.wa.gov.au"
+ - name: CSRF_TRUSTED_ORIGINS
+ value: "https://*.dbca.wa.gov.au"
+ - name: CSRF_COOKIE_SECURE
+ value: "True"
+ - name: SESSION_COOKIE_SECURE
+ value: "True"
+ - name: TZ
+ value: "Australia/Perth"
+ resources:
+ requests:
+ memory: "100Mi"
+ cpu: "5m"
+ limits:
+ memory: "4096Mi"
+ cpu: "1000m"
+ startupProbe:
+ httpGet:
+ path: /livez
+ port: 8080
+ scheme: HTTP
+ initialDelaySeconds: 3
+ periodSeconds: 15
+ timeoutSeconds: 10
+ successThreshold: 1
+ failureThreshold: 3
+ livenessProbe:
+ httpGet:
+ path: /livez
+ port: 8080
+ scheme: HTTP
+ initialDelaySeconds: 0
+ periodSeconds: 15
+ successThreshold: 1
+ failureThreshold: 3
+ timeoutSeconds: 10
+ readinessProbe:
+ httpGet:
+ path: /readyz
+ port: 8080
+ scheme: HTTP
+ initialDelaySeconds: 0
+ periodSeconds: 15
+ successThreshold: 1
+ failureThreshold: 3
+ timeoutSeconds: 10
+ securityContext:
+ runAsNonRoot: true
+ privileged: false
+ allowPrivilegeEscalation: false
+ capabilities:
+ drop:
+ - ALL
+ readOnlyRootFilesystem: true
+ volumeMounts:
+ - mountPath: /tmp
+ name: tmpfs-ram
volumes:
- name: tmpfs-ram
emptyDir:
diff --git a/kustomize/base/postgres_fdw.yaml b/kustomize/base/postgres_fdw.yaml
index 83d6b462..a89031b4 100644
--- a/kustomize/base/postgres_fdw.yaml
+++ b/kustomize/base/postgres_fdw.yaml
@@ -9,27 +9,27 @@ spec:
template:
spec:
containers:
- - name: itassets-postgres-fdw
- image: ghcr.io/dbca-wa/postgres-oracle-fdw:16-3.4
- imagePullPolicy: IfNotPresent
- env:
- - name: TZ
- value: "Australia/Perth"
- - name: POSTGRES_DB
- value: "fdw"
- resources:
- requests:
- memory: "128Mi"
- cpu: "10m"
- limits:
- memory: "1Gi"
- cpu: "1000m"
- securityContext:
- runAsUser: 999
- privileged: false
- allowPrivilegeEscalation: false
- capabilities:
- drop:
- - ALL
- readOnlyRootFilesystem: false
+ - name: itassets-postgres-fdw
+ image: ghcr.io/dbca-wa/postgres-oracle-fdw:16-3.4
+ imagePullPolicy: IfNotPresent
+ env:
+ - name: TZ
+ value: "Australia/Perth"
+ - name: POSTGRES_DB
+ value: "fdw"
+ resources:
+ requests:
+ memory: "128Mi"
+ cpu: "10m"
+ limits:
+ memory: "1Gi"
+ cpu: "1000m"
+ securityContext:
+ runAsUser: 999
+ privileged: false
+ allowPrivilegeEscalation: false
+ capabilities:
+ drop:
+ - ALL
+ readOnlyRootFilesystem: false
restartPolicy: Always
diff --git a/kustomize/base/postgres_fdw_service.yaml b/kustomize/base/postgres_fdw_service.yaml
index 4bc596c4..fd6c0572 100644
--- a/kustomize/base/postgres_fdw_service.yaml
+++ b/kustomize/base/postgres_fdw_service.yaml
@@ -6,7 +6,7 @@ spec:
type: ClusterIP
clusterIP: None
ports:
- - name: default
- port: 42
- protocol: TCP
- targetPort: 42
+ - name: default
+ port: 42
+ protocol: TCP
+ targetPort: 42
diff --git a/kustomize/overlays/prod/cronjobs/ascender-csv-upload/patch.yaml b/kustomize/overlays/prod/cronjobs/ascender-csv-upload/patch.yaml
index 77ae9c9e..42c2f817 100644
--- a/kustomize/overlays/prod/cronjobs/ascender-csv-upload/patch.yaml
+++ b/kustomize/overlays/prod/cronjobs/ascender-csv-upload/patch.yaml
@@ -10,36 +10,36 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "department_users_upload_ascender_sftp"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: ASCENDER_SFTP_HOSTNAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_SFTP_HOSTNAME
- - name: ASCENDER_SFTP_PORT
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_SFTP_PORT
- - name: ASCENDER_SFTP_USERNAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_SFTP_USERNAME
- - name: ASCENDER_SFTP_PASSWORD
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_SFTP_PASSWORD
- - name: ASCENDER_SFTP_DIRECTORY
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_SFTP_DIRECTORY
+ - name: itassets-cronjob
+ args: ["manage.py", "department_users_upload_ascender_sftp"]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: ASCENDER_SFTP_HOSTNAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_SFTP_HOSTNAME
+ - name: ASCENDER_SFTP_PORT
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_SFTP_PORT
+ - name: ASCENDER_SFTP_USERNAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_SFTP_USERNAME
+ - name: ASCENDER_SFTP_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_SFTP_PASSWORD
+ - name: ASCENDER_SFTP_DIRECTORY
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_SFTP_DIRECTORY
diff --git a/kustomize/overlays/prod/cronjobs/deptusers-audit-email/patch.yaml b/kustomize/overlays/prod/cronjobs/deptusers-audit-email/patch.yaml
index 53db44e6..b906629e 100644
--- a/kustomize/overlays/prod/cronjobs/deptusers-audit-email/patch.yaml
+++ b/kustomize/overlays/prod/cronjobs/deptusers-audit-email/patch.yaml
@@ -10,31 +10,31 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "department_users_audit_emails"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: AZURE_TENANT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_TENANT_ID
- - name: MS_GRAPH_API_CLIENT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_ID
- - name: MS_GRAPH_API_CLIENT_SECRET
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_SECRET
- - name: AZURE_CONNECTION_STRING
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_CONNECTION_STRING
+ - name: itassets-cronjob
+ args: ["manage.py", "department_users_audit_emails"]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: AZURE_TENANT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_TENANT_ID
+ - name: MS_GRAPH_API_CLIENT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_ID
+ - name: MS_GRAPH_API_CLIENT_SECRET
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_SECRET
+ - name: AZURE_CONNECTION_STRING
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_CONNECTION_STRING
diff --git a/kustomize/overlays/prod/cronjobs/deptusers-audit-employeeid/patch.yaml b/kustomize/overlays/prod/cronjobs/deptusers-audit-employeeid/patch.yaml
index cdc58691..84b6e111 100644
--- a/kustomize/overlays/prod/cronjobs/deptusers-audit-employeeid/patch.yaml
+++ b/kustomize/overlays/prod/cronjobs/deptusers-audit-employeeid/patch.yaml
@@ -10,51 +10,51 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "department_users_audit_employee_ids"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: FOREIGN_DB_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_HOST
- - name: FOREIGN_DB_PORT
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_PORT
- - name: FOREIGN_DB_NAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_NAME
- - name: FOREIGN_DB_USERNAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_USERNAME
- - name: FOREIGN_DB_PASSWORD
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_PASSWORD
- - name: FOREIGN_SCHEMA
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_SCHEMA
- - name: FOREIGN_SERVER
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_SERVER
- - name: FOREIGN_TABLE
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_TABLE
+ - name: itassets-cronjob
+ args: ["manage.py", "department_users_audit_employee_ids"]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: FOREIGN_DB_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_HOST
+ - name: FOREIGN_DB_PORT
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_PORT
+ - name: FOREIGN_DB_NAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_NAME
+ - name: FOREIGN_DB_USERNAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_USERNAME
+ - name: FOREIGN_DB_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_PASSWORD
+ - name: FOREIGN_SCHEMA
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_SCHEMA
+ - name: FOREIGN_SERVER
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_SERVER
+ - name: FOREIGN_TABLE
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_TABLE
diff --git a/kustomize/overlays/prod/cronjobs/deptusers-changes-report/patch.yaml b/kustomize/overlays/prod/cronjobs/deptusers-changes-report/patch.yaml
index 64f148fb..fef5984b 100644
--- a/kustomize/overlays/prod/cronjobs/deptusers-changes-report/patch.yaml
+++ b/kustomize/overlays/prod/cronjobs/deptusers-changes-report/patch.yaml
@@ -10,16 +10,22 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "department_users_changes_report", "--emails", "kmsupport@dbca.wa.gov.au"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: EMAIL_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: EMAIL_HOST
+ - name: itassets-cronjob
+ args:
+ [
+ "manage.py",
+ "department_users_changes_report",
+ "--emails",
+ "kmsupport@dbca.wa.gov.au",
+ ]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: EMAIL_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: EMAIL_HOST
diff --git a/kustomize/overlays/prod/cronjobs/deptusers-check-ascender/patch.yaml b/kustomize/overlays/prod/cronjobs/deptusers-check-ascender/patch.yaml
index 2a465c57..2f2a89ec 100644
--- a/kustomize/overlays/prod/cronjobs/deptusers-check-ascender/patch.yaml
+++ b/kustomize/overlays/prod/cronjobs/deptusers-check-ascender/patch.yaml
@@ -11,98 +11,98 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "check_ascender_accounts"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: EMAIL_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: EMAIL_HOST
- - name: ADMIN_EMAILS
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ADMIN_EMAILS
- - name: ASCENDER_CREATE_AZURE_AD
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_CREATE_AZURE_AD
- - name: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
- - name: FOREIGN_DB_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_HOST
- - name: FOREIGN_DB_PORT
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_PORT
- - name: FOREIGN_DB_NAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_NAME
- - name: FOREIGN_DB_USERNAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_USERNAME
- - name: FOREIGN_DB_PASSWORD
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_PASSWORD
- - name: FOREIGN_SCHEMA
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_SCHEMA
- - name: FOREIGN_SERVER
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_SERVER
- - name: FOREIGN_TABLE
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_TABLE
- - name: AZURE_TENANT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_TENANT_ID
- - name: MS_GRAPH_API_CLIENT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_ID
- - name: MS_GRAPH_API_CLIENT_SECRET
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_SECRET
- - name: SENTRY_DSN
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: SENTRY_DSN
- - name: SENTRY_ENVIRONMENT
- value: "prod"
- - name: SENTRY_CRON_CHECK_ASCENDER
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: SENTRY_CRON_CHECK_ASCENDER
+ - name: itassets-cronjob
+ args: ["manage.py", "check_ascender_accounts"]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: EMAIL_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: EMAIL_HOST
+ - name: ADMIN_EMAILS
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ADMIN_EMAILS
+ - name: ASCENDER_CREATE_AZURE_AD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_CREATE_AZURE_AD
+ - name: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
+ - name: FOREIGN_DB_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_HOST
+ - name: FOREIGN_DB_PORT
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_PORT
+ - name: FOREIGN_DB_NAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_NAME
+ - name: FOREIGN_DB_USERNAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_USERNAME
+ - name: FOREIGN_DB_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_PASSWORD
+ - name: FOREIGN_SCHEMA
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_SCHEMA
+ - name: FOREIGN_SERVER
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_SERVER
+ - name: FOREIGN_TABLE
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_TABLE
+ - name: AZURE_TENANT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_TENANT_ID
+ - name: MS_GRAPH_API_CLIENT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_ID
+ - name: MS_GRAPH_API_CLIENT_SECRET
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_SECRET
+ - name: SENTRY_DSN
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: SENTRY_DSN
+ - name: SENTRY_ENVIRONMENT
+ value: "prod"
+ - name: SENTRY_CRON_CHECK_ASCENDER
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: SENTRY_CRON_CHECK_ASCENDER
diff --git a/kustomize/overlays/prod/cronjobs/deptusers-check-azure/patch.yaml b/kustomize/overlays/prod/cronjobs/deptusers-check-azure/patch.yaml
index 56b0e690..378ff45b 100644
--- a/kustomize/overlays/prod/cronjobs/deptusers-check-azure/patch.yaml
+++ b/kustomize/overlays/prod/cronjobs/deptusers-check-azure/patch.yaml
@@ -10,43 +10,43 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "check_azure_accounts"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: AZURE_TENANT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_TENANT_ID
- - name: MS_GRAPH_API_CLIENT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_ID
- - name: MS_GRAPH_API_CLIENT_SECRET
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_SECRET
- - name: AZURE_CONNECTION_STRING
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_CONNECTION_STRING
- - name: SENTRY_DSN
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: SENTRY_DSN
- - name: SENTRY_ENVIRONMENT
- value: "prod"
- - name: SENTRY_CRON_CHECK_AZURE
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: SENTRY_CRON_CHECK_AZURE
+ - name: itassets-cronjob
+ args: ["manage.py", "check_azure_accounts"]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: AZURE_TENANT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_TENANT_ID
+ - name: MS_GRAPH_API_CLIENT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_ID
+ - name: MS_GRAPH_API_CLIENT_SECRET
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_SECRET
+ - name: AZURE_CONNECTION_STRING
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_CONNECTION_STRING
+ - name: SENTRY_DSN
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: SENTRY_DSN
+ - name: SENTRY_ENVIRONMENT
+ value: "prod"
+ - name: SENTRY_CRON_CHECK_AZURE
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: SENTRY_CRON_CHECK_AZURE
diff --git a/kustomize/overlays/prod/cronjobs/deptusers-check-onprem/patch.yaml b/kustomize/overlays/prod/cronjobs/deptusers-check-onprem/patch.yaml
index a20cfe43..25c10012 100644
--- a/kustomize/overlays/prod/cronjobs/deptusers-check-onprem/patch.yaml
+++ b/kustomize/overlays/prod/cronjobs/deptusers-check-onprem/patch.yaml
@@ -10,28 +10,36 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "check_onprem_accounts", "--container", "azuread", "--path", "adusers.json"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: AZURE_CONNECTION_STRING
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_CONNECTION_STRING
- - name: SENTRY_DSN
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: SENTRY_DSN
- - name: SENTRY_ENVIRONMENT
- value: "prod"
- - name: SENTRY_CRON_CHECK_ONPREM
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: SENTRY_CRON_CHECK_ONPREM
+ - name: itassets-cronjob
+ args:
+ [
+ "manage.py",
+ "check_onprem_accounts",
+ "--container",
+ "azuread",
+ "--path",
+ "adusers.json",
+ ]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: AZURE_CONNECTION_STRING
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_CONNECTION_STRING
+ - name: SENTRY_DSN
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: SENTRY_DSN
+ - name: SENTRY_ENVIRONMENT
+ value: "prod"
+ - name: SENTRY_CRON_CHECK_ONPREM
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: SENTRY_CRON_CHECK_ONPREM
diff --git a/kustomize/overlays/prod/cronjobs/deptusers-sync-ad/patch.yaml b/kustomize/overlays/prod/cronjobs/deptusers-sync-ad/patch.yaml
index 97b488d2..a3dec3ab 100644
--- a/kustomize/overlays/prod/cronjobs/deptusers-sync-ad/patch.yaml
+++ b/kustomize/overlays/prod/cronjobs/deptusers-sync-ad/patch.yaml
@@ -10,36 +10,36 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "department_users_sync_ad_data"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: ASCENDER_DEACTIVATE_EXPIRED
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_DEACTIVATE_EXPIRED
- - name: AZURE_TENANT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_TENANT_ID
- - name: MS_GRAPH_API_CLIENT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_ID
- - name: MS_GRAPH_API_CLIENT_SECRET
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_SECRET
- - name: AZURE_CONNECTION_STRING
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_CONNECTION_STRING
+ - name: itassets-cronjob
+ args: ["manage.py", "department_users_sync_ad_data"]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: ASCENDER_DEACTIVATE_EXPIRED
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_DEACTIVATE_EXPIRED
+ - name: AZURE_TENANT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_TENANT_ID
+ - name: MS_GRAPH_API_CLIENT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_ID
+ - name: MS_GRAPH_API_CLIENT_SECRET
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_SECRET
+ - name: AZURE_CONNECTION_STRING
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_CONNECTION_STRING
diff --git a/kustomize/overlays/prod/cronjobs/deptusers-sync-freshservice/patch.yaml b/kustomize/overlays/prod/cronjobs/deptusers-sync-freshservice/patch.yaml
index fe5807d6..06f578aa 100644
--- a/kustomize/overlays/prod/cronjobs/deptusers-sync-freshservice/patch.yaml
+++ b/kustomize/overlays/prod/cronjobs/deptusers-sync-freshservice/patch.yaml
@@ -10,36 +10,36 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "department_users_sync_freshservice"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: FRESHSERVICE_ENDPOINT
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FRESHSERVICE_ENDPOINT
- - name: FRESHSERVICE_API_KEY
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FRESHSERVICE_API_KEY
- - name: AZURE_TENANT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_TENANT_ID
- - name: MS_GRAPH_API_CLIENT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_ID
- - name: MS_GRAPH_API_CLIENT_SECRET
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_SECRET
+ - name: itassets-cronjob
+ args: ["manage.py", "department_users_sync_freshservice"]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: FRESHSERVICE_ENDPOINT
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FRESHSERVICE_ENDPOINT
+ - name: FRESHSERVICE_API_KEY
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FRESHSERVICE_API_KEY
+ - name: AZURE_TENANT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_TENANT_ID
+ - name: MS_GRAPH_API_CLIENT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_ID
+ - name: MS_GRAPH_API_CLIENT_SECRET
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_SECRET
diff --git a/kustomize/overlays/prod/cronjobs/m365-licence-check/patch.yaml b/kustomize/overlays/prod/cronjobs/m365-licence-check/patch.yaml
index fde7f75a..085fffd2 100644
--- a/kustomize/overlays/prod/cronjobs/m365-licence-check/patch.yaml
+++ b/kustomize/overlays/prod/cronjobs/m365-licence-check/patch.yaml
@@ -10,31 +10,39 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "check_m365_licence_count", "--threshold", "10", "--emails", "oim.servicedesk@dbca.wa.gov.au,cyber@dbca.wa.gov.au,oiminfrastructure@dbca.wa.gov.au"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: EMAIL_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: EMAIL_HOST
- - name: AZURE_TENANT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_TENANT_ID
- - name: MS_GRAPH_API_CLIENT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_ID
- - name: MS_GRAPH_API_CLIENT_SECRET
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_SECRET
+ - name: itassets-cronjob
+ args:
+ [
+ "manage.py",
+ "check_m365_licence_count",
+ "--threshold",
+ "10",
+ "--emails",
+ "oim.servicedesk@dbca.wa.gov.au,cyber@dbca.wa.gov.au,oiminfrastructure@dbca.wa.gov.au",
+ ]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: EMAIL_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: EMAIL_HOST
+ - name: AZURE_TENANT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_TENANT_ID
+ - name: MS_GRAPH_API_CLIENT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_ID
+ - name: MS_GRAPH_API_CLIENT_SECRET
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_SECRET
diff --git a/kustomize/overlays/prod/cronjobs/storage-usage/patch.yaml b/kustomize/overlays/prod/cronjobs/storage-usage/patch.yaml
index 7ebe6710..a1709110 100644
--- a/kustomize/overlays/prod/cronjobs/storage-usage/patch.yaml
+++ b/kustomize/overlays/prod/cronjobs/storage-usage/patch.yaml
@@ -10,31 +10,31 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "site_storage_upload"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: AZURE_TENANT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_TENANT_ID
- - name: MS_GRAPH_API_CLIENT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_ID
- - name: MS_GRAPH_API_CLIENT_SECRET
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_SECRET
- - name: AZURE_CONNECTION_STRING
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_CONNECTION_STRING
+ - name: itassets-cronjob
+ args: ["manage.py", "site_storage_upload"]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: AZURE_TENANT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_TENANT_ID
+ - name: MS_GRAPH_API_CLIENT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_ID
+ - name: MS_GRAPH_API_CLIENT_SECRET
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_SECRET
+ - name: AZURE_CONNECTION_STRING
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_CONNECTION_STRING
diff --git a/kustomize/overlays/prod/cronjobs/update-ccm/patch.yaml b/kustomize/overlays/prod/cronjobs/update-ccm/patch.yaml
index 8ac60227..d75ac4b3 100644
--- a/kustomize/overlays/prod/cronjobs/update-ccm/patch.yaml
+++ b/kustomize/overlays/prod/cronjobs/update-ccm/patch.yaml
@@ -10,61 +10,61 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "check_cost_centre_managers"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: EMAIL_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: EMAIL_HOST
- - name: ADMIN_EMAILS
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ADMIN_EMAILS
- - name: FOREIGN_DB_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_HOST
- - name: FOREIGN_DB_PORT
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_PORT
- - name: FOREIGN_DB_NAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_NAME
- - name: FOREIGN_DB_USERNAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_USERNAME
- - name: FOREIGN_DB_PASSWORD
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_PASSWORD
- - name: FOREIGN_SCHEMA
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_SCHEMA
- - name: FOREIGN_SERVER
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_SERVER
- - name: FOREIGN_TABLE_CC_MANAGER
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_TABLE_CC_MANAGER
+ - name: itassets-cronjob
+ args: ["manage.py", "check_cost_centre_managers"]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: EMAIL_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: EMAIL_HOST
+ - name: ADMIN_EMAILS
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ADMIN_EMAILS
+ - name: FOREIGN_DB_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_HOST
+ - name: FOREIGN_DB_PORT
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_PORT
+ - name: FOREIGN_DB_NAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_NAME
+ - name: FOREIGN_DB_USERNAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_USERNAME
+ - name: FOREIGN_DB_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_PASSWORD
+ - name: FOREIGN_SCHEMA
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_SCHEMA
+ - name: FOREIGN_SERVER
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_SERVER
+ - name: FOREIGN_TABLE_CC_MANAGER
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_TABLE_CC_MANAGER
diff --git a/kustomize/overlays/prod/deployment_patch.yaml b/kustomize/overlays/prod/deployment_patch.yaml
index d381edf4..e5c5c407 100644
--- a/kustomize/overlays/prod/deployment_patch.yaml
+++ b/kustomize/overlays/prod/deployment_patch.yaml
@@ -3,202 +3,196 @@ kind: Deployment
metadata:
name: itassets-deployment
spec:
- selector:
- matchLabels:
- app: itassets-deployment
template:
- metadata:
- labels:
- app: itassets-deployment
spec:
containers:
- - name: itassets
- imagePullPolicy: IfNotPresent
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: DATABASE_URL
- - name: SECRET_KEY
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: SECRET_KEY
- - name: ADMIN_EMAILS
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ADMIN_EMAILS
- - name: EMAIL_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: EMAIL_HOST
- - name: AZURE_ACCOUNT_NAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_ACCOUNT_NAME
- - name: AZURE_ACCOUNT_KEY
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_ACCOUNT_KEY
- - name: AZURE_CONTAINER
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_CONTAINER
- - name: AZURE_CONNECTION_STRING
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_CONNECTION_STRING
- - name: AZURE_TENANT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: AZURE_TENANT_ID
- - name: MS_GRAPH_API_CLIENT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_ID
- - name: MS_GRAPH_API_CLIENT_SECRET
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: MS_GRAPH_API_CLIENT_SECRET
- - name: ASCENDER_DEACTIVATE_EXPIRED
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_DEACTIVATE_EXPIRED
- - name: ASCENDER_CREATE_AZURE_AD
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_CREATE_AZURE_AD
- - name: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
- - name: FOREIGN_DB_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_HOST
- - name: FOREIGN_DB_PORT
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_PORT
- - name: FOREIGN_DB_NAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_NAME
- - name: FOREIGN_DB_USERNAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_USERNAME
- - name: FOREIGN_DB_PASSWORD
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_DB_PASSWORD
- - name: FOREIGN_SCHEMA
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_SCHEMA
- - name: FOREIGN_SERVER
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_SERVER
- - name: FOREIGN_TABLE
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_TABLE
- - name: FOREIGN_TABLE_CC_MANAGER
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FOREIGN_TABLE_CC_MANAGER
- - name: FRESHSERVICE_ENDPOINT
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FRESHSERVICE_ENDPOINT
- - name: FRESHSERVICE_API_KEY
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: FRESHSERVICE_API_KEY
- - name: ASCENDER_SFTP_HOSTNAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_SFTP_HOSTNAME
- - name: ASCENDER_SFTP_PORT
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_SFTP_PORT
- - name: ASCENDER_SFTP_USERNAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_SFTP_USERNAME
- - name: ASCENDER_SFTP_PASSWORD
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_SFTP_PASSWORD
- - name: ASCENDER_SFTP_DIRECTORY
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: ASCENDER_SFTP_DIRECTORY
- - name: SENTRY_DSN
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: SENTRY_DSN
- - name: SENTRY_SAMPLE_RATE
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: SENTRY_SAMPLE_RATE
- - name: SENTRY_TRANSACTION_SAMPLE_RATE
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: SENTRY_TRANSACTION_SAMPLE_RATE
- - name: SENTRY_PROFILES_SAMPLE_RATE
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: SENTRY_PROFILES_SAMPLE_RATE
- - name: SENTRY_ENVIRONMENT
- value: "prod"
- - name: GEOSERVER_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: GEOSERVER_URL
- - name: REDIS_CACHE_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: REDIS_CACHE_HOST
- - name: API_RESPONSE_CACHE_SECONDS
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: API_RESPONSE_CACHE_SECONDS
+ - name: itassets
+ imagePullPolicy: IfNotPresent
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: DATABASE_URL
+ - name: SECRET_KEY
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: SECRET_KEY
+ - name: ADMIN_EMAILS
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ADMIN_EMAILS
+ - name: EMAIL_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: EMAIL_HOST
+ - name: AZURE_ACCOUNT_NAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_ACCOUNT_NAME
+ - name: AZURE_ACCOUNT_KEY
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_ACCOUNT_KEY
+ - name: AZURE_CONTAINER
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_CONTAINER
+ - name: AZURE_CONNECTION_STRING
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_CONNECTION_STRING
+ - name: AZURE_TENANT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: AZURE_TENANT_ID
+ - name: MS_GRAPH_API_CLIENT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_ID
+ - name: MS_GRAPH_API_CLIENT_SECRET
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: MS_GRAPH_API_CLIENT_SECRET
+ - name: ASCENDER_DEACTIVATE_EXPIRED
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_DEACTIVATE_EXPIRED
+ - name: ASCENDER_CREATE_AZURE_AD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_CREATE_AZURE_AD
+ - name: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
+ - name: FOREIGN_DB_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_HOST
+ - name: FOREIGN_DB_PORT
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_PORT
+ - name: FOREIGN_DB_NAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_NAME
+ - name: FOREIGN_DB_USERNAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_USERNAME
+ - name: FOREIGN_DB_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_DB_PASSWORD
+ - name: FOREIGN_SCHEMA
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_SCHEMA
+ - name: FOREIGN_SERVER
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_SERVER
+ - name: FOREIGN_TABLE
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_TABLE
+ - name: FOREIGN_TABLE_CC_MANAGER
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FOREIGN_TABLE_CC_MANAGER
+ - name: FRESHSERVICE_ENDPOINT
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FRESHSERVICE_ENDPOINT
+ - name: FRESHSERVICE_API_KEY
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: FRESHSERVICE_API_KEY
+ - name: ASCENDER_SFTP_HOSTNAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_SFTP_HOSTNAME
+ - name: ASCENDER_SFTP_PORT
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_SFTP_PORT
+ - name: ASCENDER_SFTP_USERNAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_SFTP_USERNAME
+ - name: ASCENDER_SFTP_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_SFTP_PASSWORD
+ - name: ASCENDER_SFTP_DIRECTORY
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: ASCENDER_SFTP_DIRECTORY
+ - name: SENTRY_DSN
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: SENTRY_DSN
+ - name: SENTRY_SAMPLE_RATE
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: SENTRY_SAMPLE_RATE
+ - name: SENTRY_TRANSACTION_SAMPLE_RATE
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: SENTRY_TRANSACTION_SAMPLE_RATE
+ - name: SENTRY_PROFILES_SAMPLE_RATE
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: SENTRY_PROFILES_SAMPLE_RATE
+ - name: SENTRY_ENVIRONMENT
+ value: "prod"
+ - name: GEOSERVER_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: GEOSERVER_URL
+ - name: REDIS_CACHE_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: REDIS_CACHE_HOST
+ - name: API_RESPONSE_CACHE_SECONDS
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: API_RESPONSE_CACHE_SECONDS
diff --git a/kustomize/overlays/prod/ingress.yaml b/kustomize/overlays/prod/ingress.yaml
index 08698e49..4a76c3c8 100644
--- a/kustomize/overlays/prod/ingress.yaml
+++ b/kustomize/overlays/prod/ingress.yaml
@@ -5,16 +5,16 @@ metadata:
spec:
ingressClassName: nginx
rules:
- - host: itassets.dbca.wa.gov.au
- http:
- paths:
- - path: /
- pathType: Prefix
- backend:
- service:
- name: itassets-clusterip-prod
- port:
- number: 8080
+ - host: itassets.dbca.wa.gov.au
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: itassets-clusterip-prod
+ port:
+ number: 8080
---
apiVersion: networking.k8s.io/v1
kind: Ingress
@@ -23,13 +23,13 @@ metadata:
spec:
ingressClassName: nginx
rules:
- - host: addressbook.dbca.wa.gov.au
- http:
- paths:
- - path: /
- pathType: Prefix
- backend:
- service:
- name: itassets-clusterip-prod
- port:
- number: 8080
+ - host: addressbook.dbca.wa.gov.au
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: itassets-clusterip-prod
+ port:
+ number: 8080
diff --git a/kustomize/overlays/prod/postgres_fdw_patch.yaml b/kustomize/overlays/prod/postgres_fdw_patch.yaml
index ed5c95e5..ddc61ed5 100644
--- a/kustomize/overlays/prod/postgres_fdw_patch.yaml
+++ b/kustomize/overlays/prod/postgres_fdw_patch.yaml
@@ -14,28 +14,28 @@ spec:
app: itassets-postgres-fdw
spec:
initContainers:
- - name: data-vol-chown
- image: busybox
- imagePullPolicy: IfNotPresent
- command:
- - chown
- - -R
- - "999:999"
- - /var/lib/postgresql/data
- volumeMounts:
- - name: itassets-postgres-fdw-data
- mountPath: /var/lib/postgresql/data
+ - name: data-vol-chown
+ image: busybox
+ imagePullPolicy: IfNotPresent
+ command:
+ - chown
+ - -R
+ - "999:999"
+ - /var/lib/postgresql/data
+ volumeMounts:
+ - name: itassets-postgres-fdw-data
+ mountPath: /var/lib/postgresql/data
containers:
- - name: itassets-postgres-fdw
- env:
- - name: POSTGRES_PASSWORD
- valueFrom:
- secretKeyRef:
- name: itassets-env-prod
- key: POSTGRES_PASSWORD
- volumeMounts:
- - name: itassets-postgres-fdw-data
- mountPath: /var/lib/postgresql/data
+ - name: itassets-postgres-fdw
+ env:
+ - name: POSTGRES_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-prod
+ key: POSTGRES_PASSWORD
+ volumeMounts:
+ - name: itassets-postgres-fdw-data
+ mountPath: /var/lib/postgresql/data
volumes:
- name: itassets-postgres-fdw-data
persistentVolumeClaim:
diff --git a/kustomize/overlays/uat/cronjobs/deptusers-check-ascender/patch.yaml b/kustomize/overlays/uat/cronjobs/deptusers-check-ascender/patch.yaml
index 2524c98c..195410d7 100644
--- a/kustomize/overlays/uat/cronjobs/deptusers-check-ascender/patch.yaml
+++ b/kustomize/overlays/uat/cronjobs/deptusers-check-ascender/patch.yaml
@@ -10,86 +10,86 @@ spec:
template:
spec:
containers:
- - name: itassets-cronjob
- args: ["manage.py", "check_ascender_accounts"]
- env:
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: DATABASE_URL
- - name: EMAIL_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: EMAIL_HOST
- - name: ADMIN_EMAILS
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: ADMIN_EMAILS
- - name: ASCENDER_CREATE_AZURE_AD
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: ASCENDER_CREATE_AZURE_AD
- - name: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
- - name: FOREIGN_DB_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_DB_HOST
- - name: FOREIGN_DB_PORT
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_DB_PORT
- - name: FOREIGN_DB_NAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_DB_NAME
- - name: FOREIGN_DB_USERNAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_DB_USERNAME
- - name: FOREIGN_DB_PASSWORD
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_DB_PASSWORD
- - name: FOREIGN_SCHEMA
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_SCHEMA
- - name: FOREIGN_SERVER
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_SERVER
- - name: FOREIGN_TABLE
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_TABLE
- - name: AZURE_TENANT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: AZURE_TENANT_ID
- - name: MS_GRAPH_API_CLIENT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: MS_GRAPH_API_CLIENT_ID
- - name: MS_GRAPH_API_CLIENT_SECRET
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: MS_GRAPH_API_CLIENT_SECRET
+ - name: itassets-cronjob
+ args: ["manage.py", "check_ascender_accounts"]
+ env:
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: DATABASE_URL
+ - name: EMAIL_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: EMAIL_HOST
+ - name: ADMIN_EMAILS
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: ADMIN_EMAILS
+ - name: ASCENDER_CREATE_AZURE_AD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: ASCENDER_CREATE_AZURE_AD
+ - name: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
+ - name: FOREIGN_DB_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_DB_HOST
+ - name: FOREIGN_DB_PORT
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_DB_PORT
+ - name: FOREIGN_DB_NAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_DB_NAME
+ - name: FOREIGN_DB_USERNAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_DB_USERNAME
+ - name: FOREIGN_DB_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_DB_PASSWORD
+ - name: FOREIGN_SCHEMA
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_SCHEMA
+ - name: FOREIGN_SERVER
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_SERVER
+ - name: FOREIGN_TABLE
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_TABLE
+ - name: AZURE_TENANT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: AZURE_TENANT_ID
+ - name: MS_GRAPH_API_CLIENT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: MS_GRAPH_API_CLIENT_ID
+ - name: MS_GRAPH_API_CLIENT_SECRET
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: MS_GRAPH_API_CLIENT_SECRET
diff --git a/kustomize/overlays/uat/deployment_patch.yaml b/kustomize/overlays/uat/deployment_patch.yaml
index a2d3859d..20789dbb 100644
--- a/kustomize/overlays/uat/deployment_patch.yaml
+++ b/kustomize/overlays/uat/deployment_patch.yaml
@@ -2,209 +2,201 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: itassets-deployment
- labels:
- app: itassets-deployment
spec:
- selector:
- matchLabels:
- app: itassets-deployment
template:
- metadata:
- labels:
- app: itassets-deployment
spec:
containers:
- - name: itassets
- imagePullPolicy: Always
- env:
- - name: ENVIRONMENT_COLOUR
- value: "darkorange"
- - name: ENVIRONMENT_NAME
- value: "UAT"
- - name: DATABASE_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: DATABASE_URL
- - name: SECRET_KEY
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: SECRET_KEY
- - name: ADMIN_EMAILS
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: ADMIN_EMAILS
- - name: EMAIL_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: EMAIL_HOST
- - name: AZURE_ACCOUNT_NAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: AZURE_ACCOUNT_NAME
- - name: AZURE_ACCOUNT_KEY
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: AZURE_ACCOUNT_KEY
- - name: AZURE_CONTAINER
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: AZURE_CONTAINER
- - name: AZURE_CONNECTION_STRING
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: AZURE_CONNECTION_STRING
- - name: AZURE_TENANT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: AZURE_TENANT_ID
- - name: MS_GRAPH_API_CLIENT_ID
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: MS_GRAPH_API_CLIENT_ID
- - name: MS_GRAPH_API_CLIENT_SECRET
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: MS_GRAPH_API_CLIENT_SECRET
- - name: ASCENDER_DEACTIVATE_EXPIRED
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: ASCENDER_DEACTIVATE_EXPIRED
- - name: ASCENDER_CREATE_AZURE_AD
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: ASCENDER_CREATE_AZURE_AD
- - name: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
- - name: FOREIGN_DB_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_DB_HOST
- - name: FOREIGN_DB_PORT
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_DB_PORT
- - name: FOREIGN_DB_NAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_DB_NAME
- - name: FOREIGN_DB_USERNAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_DB_USERNAME
- - name: FOREIGN_DB_PASSWORD
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_DB_PASSWORD
- - name: FOREIGN_SCHEMA
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_SCHEMA
- - name: FOREIGN_SERVER
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_SERVER
- - name: FOREIGN_TABLE
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_TABLE
- - name: FOREIGN_TABLE_CC_MANAGER
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FOREIGN_TABLE_CC_MANAGER
- - name: FRESHSERVICE_ENDPOINT
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FRESHSERVICE_ENDPOINT
- - name: FRESHSERVICE_API_KEY
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: FRESHSERVICE_API_KEY
- - name: ASCENDER_SFTP_HOSTNAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: ASCENDER_SFTP_HOSTNAME
- - name: ASCENDER_SFTP_PORT
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: ASCENDER_SFTP_PORT
- - name: ASCENDER_SFTP_USERNAME
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: ASCENDER_SFTP_USERNAME
- - name: ASCENDER_SFTP_PASSWORD
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: ASCENDER_SFTP_PASSWORD
- - name: ASCENDER_SFTP_DIRECTORY
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: ASCENDER_SFTP_DIRECTORY
- - name: SENTRY_DSN
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: SENTRY_DSN
- - name: SENTRY_SAMPLE_RATE
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: SENTRY_SAMPLE_RATE
- - name: SENTRY_TRANSACTION_SAMPLE_RATE
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: SENTRY_TRANSACTION_SAMPLE_RATE
- - name: SENTRY_PROFILES_SAMPLE_RATE
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: SENTRY_PROFILES_SAMPLE_RATE
- - name: SENTRY_ENVIRONMENT
- value: "uat"
- - name: GEOSERVER_URL
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: GEOSERVER_URL
- - name: REDIS_CACHE_HOST
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: REDIS_CACHE_HOST
- - name: API_RESPONSE_CACHE_SECONDS
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: API_RESPONSE_CACHE_SECONDS
+ - name: itassets
+ imagePullPolicy: Always
+ env:
+ - name: ENVIRONMENT_COLOUR
+ value: "darkorange"
+ - name: ENVIRONMENT_NAME
+ value: "UAT"
+ - name: DATABASE_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: DATABASE_URL
+ - name: SECRET_KEY
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: SECRET_KEY
+ - name: ADMIN_EMAILS
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: ADMIN_EMAILS
+ - name: EMAIL_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: EMAIL_HOST
+ - name: AZURE_ACCOUNT_NAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: AZURE_ACCOUNT_NAME
+ - name: AZURE_ACCOUNT_KEY
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: AZURE_ACCOUNT_KEY
+ - name: AZURE_CONTAINER
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: AZURE_CONTAINER
+ - name: AZURE_CONNECTION_STRING
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: AZURE_CONNECTION_STRING
+ - name: AZURE_TENANT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: AZURE_TENANT_ID
+ - name: MS_GRAPH_API_CLIENT_ID
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: MS_GRAPH_API_CLIENT_ID
+ - name: MS_GRAPH_API_CLIENT_SECRET
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: MS_GRAPH_API_CLIENT_SECRET
+ - name: ASCENDER_DEACTIVATE_EXPIRED
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: ASCENDER_DEACTIVATE_EXPIRED
+ - name: ASCENDER_CREATE_AZURE_AD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: ASCENDER_CREATE_AZURE_AD
+ - name: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: ASCENDER_CREATE_AZURE_AD_LIMIT_DAYS
+ - name: FOREIGN_DB_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_DB_HOST
+ - name: FOREIGN_DB_PORT
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_DB_PORT
+ - name: FOREIGN_DB_NAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_DB_NAME
+ - name: FOREIGN_DB_USERNAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_DB_USERNAME
+ - name: FOREIGN_DB_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_DB_PASSWORD
+ - name: FOREIGN_SCHEMA
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_SCHEMA
+ - name: FOREIGN_SERVER
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_SERVER
+ - name: FOREIGN_TABLE
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_TABLE
+ - name: FOREIGN_TABLE_CC_MANAGER
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FOREIGN_TABLE_CC_MANAGER
+ - name: FRESHSERVICE_ENDPOINT
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FRESHSERVICE_ENDPOINT
+ - name: FRESHSERVICE_API_KEY
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: FRESHSERVICE_API_KEY
+ - name: ASCENDER_SFTP_HOSTNAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: ASCENDER_SFTP_HOSTNAME
+ - name: ASCENDER_SFTP_PORT
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: ASCENDER_SFTP_PORT
+ - name: ASCENDER_SFTP_USERNAME
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: ASCENDER_SFTP_USERNAME
+ - name: ASCENDER_SFTP_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: ASCENDER_SFTP_PASSWORD
+ - name: ASCENDER_SFTP_DIRECTORY
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: ASCENDER_SFTP_DIRECTORY
+ - name: SENTRY_DSN
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: SENTRY_DSN
+ - name: SENTRY_SAMPLE_RATE
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: SENTRY_SAMPLE_RATE
+ - name: SENTRY_TRANSACTION_SAMPLE_RATE
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: SENTRY_TRANSACTION_SAMPLE_RATE
+ - name: SENTRY_PROFILES_SAMPLE_RATE
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: SENTRY_PROFILES_SAMPLE_RATE
+ - name: SENTRY_ENVIRONMENT
+ value: "uat"
+ - name: GEOSERVER_URL
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: GEOSERVER_URL
+ - name: REDIS_CACHE_HOST
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: REDIS_CACHE_HOST
+ - name: API_RESPONSE_CACHE_SECONDS
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: API_RESPONSE_CACHE_SECONDS
diff --git a/kustomize/overlays/uat/ingress.yaml b/kustomize/overlays/uat/ingress.yaml
index 1ad83d70..a31d7690 100644
--- a/kustomize/overlays/uat/ingress.yaml
+++ b/kustomize/overlays/uat/ingress.yaml
@@ -5,16 +5,16 @@ metadata:
spec:
ingressClassName: nginx
rules:
- - host: itassets-uat.dbca.wa.gov.au
- http:
- paths:
- - path: /
- pathType: Prefix
- backend:
- service:
- name: itassets-clusterip-uat
- port:
- number: 8080
+ - host: itassets-uat.dbca.wa.gov.au
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: itassets-clusterip-uat
+ port:
+ number: 8080
---
apiVersion: networking.k8s.io/v1
kind: Ingress
@@ -23,13 +23,13 @@ metadata:
spec:
ingressClassName: nginx
rules:
- - host: addressbook-uat.dbca.wa.gov.au
- http:
- paths:
- - path: /
- pathType: Prefix
- backend:
- service:
- name: itassets-clusterip-uat
- port:
- number: 8080
+ - host: addressbook-uat.dbca.wa.gov.au
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: itassets-clusterip-uat
+ port:
+ number: 8080
diff --git a/kustomize/overlays/uat/postgres_fdw_patch.yaml b/kustomize/overlays/uat/postgres_fdw_patch.yaml
index 1f418aa9..937815c1 100644
--- a/kustomize/overlays/uat/postgres_fdw_patch.yaml
+++ b/kustomize/overlays/uat/postgres_fdw_patch.yaml
@@ -14,28 +14,28 @@ spec:
app: itassets-postgres-fdw
spec:
initContainers:
- - name: data-vol-chown
- image: busybox
- imagePullPolicy: IfNotPresent
- command:
- - chown
- - -R
- - "999:999"
- - /var/lib/postgresql/data
- volumeMounts:
- - name: itassets-postgres-fdw-data
- mountPath: /var/lib/postgresql/data
+ - name: data-vol-chown
+ image: busybox
+ imagePullPolicy: IfNotPresent
+ command:
+ - chown
+ - -R
+ - "999:999"
+ - /var/lib/postgresql/data
+ volumeMounts:
+ - name: itassets-postgres-fdw-data
+ mountPath: /var/lib/postgresql/data
containers:
- - name: itassets-postgres-fdw
- env:
- - name: POSTGRES_PASSWORD
- valueFrom:
- secretKeyRef:
- name: itassets-env-uat
- key: POSTGRES_PASSWORD
- volumeMounts:
- - name: itassets-postgres-fdw-data
- mountPath: /var/lib/postgresql/data
+ - name: itassets-postgres-fdw
+ env:
+ - name: POSTGRES_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: itassets-env-uat
+ key: POSTGRES_PASSWORD
+ volumeMounts:
+ - name: itassets-postgres-fdw-data
+ mountPath: /var/lib/postgresql/data
volumes:
- name: itassets-postgres-fdw-data
persistentVolumeClaim:
diff --git a/kustomize/template/cronjob.yaml b/kustomize/template/cronjob.yaml
index 657f5e6a..25facdca 100644
--- a/kustomize/template/cronjob.yaml
+++ b/kustomize/template/cronjob.yaml
@@ -15,24 +15,24 @@ spec:
spec:
restartPolicy: Never
containers:
- - name: itassets-cronjob
- image: ghcr.io/dbca-wa/it-assets
- command: ["python"]
- args: ["--version"]
- env:
- - name: TZ
- value: "Australia/Perth"
- securityContext:
- runAsNonRoot: true
- privileged: false
- allowPrivilegeEscalation: false
- capabilities:
- drop:
- - ALL
- readOnlyRootFilesystem: true
- volumeMounts:
- - mountPath: /tmp
- name: tmpfs-ram
+ - name: itassets-cronjob
+ image: ghcr.io/dbca-wa/it-assets
+ command: ["python"]
+ args: ["--version"]
+ env:
+ - name: TZ
+ value: "Australia/Perth"
+ securityContext:
+ runAsNonRoot: true
+ privileged: false
+ allowPrivilegeEscalation: false
+ capabilities:
+ drop:
+ - ALL
+ readOnlyRootFilesystem: true
+ volumeMounts:
+ - mountPath: /tmp
+ name: tmpfs-ram
volumes:
- name: tmpfs-ram
emptyDir:
diff --git a/kustomize/template/kustomization.yaml b/kustomize/template/kustomization.yaml
index 93adb4f8..f694edc5 100644
--- a/kustomize/template/kustomization.yaml
+++ b/kustomize/template/kustomization.yaml
@@ -1,4 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
-- cronjob.yaml
+ - cronjob.yaml
diff --git a/poetry.lock b/poetry.lock
index 7c53f5c6..a352511c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -16,21 +16,18 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"]
[[package]]
name = "asttokens"
-version = "2.4.1"
+version = "3.0.0"
description = "Annotate AST trees with source code positions"
optional = false
-python-versions = "*"
+python-versions = ">=3.8"
files = [
- {file = "asttokens-2.4.1-py2.py3-none-any.whl", hash = "sha256:051ed49c3dcae8913ea7cd08e46a606dba30b79993209636c4875bc1d637bc24"},
- {file = "asttokens-2.4.1.tar.gz", hash = "sha256:b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0"},
+ {file = "asttokens-3.0.0-py3-none-any.whl", hash = "sha256:e3078351a059199dd5138cb1c706e6430c05eff2ff136af5eb4790f9d28932e2"},
+ {file = "asttokens-3.0.0.tar.gz", hash = "sha256:0dcd8baa8d62b0c1d118b399b2ddba3c4aff271d0d7a9e0d4c1681c79035bbc7"},
]
-[package.dependencies]
-six = ">=1.12.0"
-
[package.extras]
-astroid = ["astroid (>=1,<2)", "astroid (>=2,<4)"]
-test = ["astroid (>=1,<2)", "astroid (>=2,<4)", "pytest"]
+astroid = ["astroid (>=2,<4)"]
+test = ["astroid (>=2,<4)", "pytest", "pytest-cov", "pytest-xdist"]
[[package]]
name = "azure-core"
@@ -53,13 +50,13 @@ aio = ["aiohttp (>=3.0)"]
[[package]]
name = "azure-storage-blob"
-version = "12.23.1"
+version = "12.24.0"
description = "Microsoft Azure Blob Storage Client Library for Python"
optional = false
python-versions = ">=3.8"
files = [
- {file = "azure_storage_blob-12.23.1-py3-none-any.whl", hash = "sha256:1c2238aa841d1545f42714a5017c010366137a44a0605da2d45f770174bfc6b4"},
- {file = "azure_storage_blob-12.23.1.tar.gz", hash = "sha256:a587e54d4e39d2a27bd75109db164ffa2058fe194061e5446c5a89bca918272f"},
+ {file = "azure_storage_blob-12.24.0-py3-none-any.whl", hash = "sha256:4f0bb4592ea79a2d986063696514c781c9e62be240f09f6397986e01755bc071"},
+ {file = "azure_storage_blob-12.24.0.tar.gz", hash = "sha256:eaaaa1507c8c363d6e1d1342bd549938fdf1adec9b1ada8658c8f5bf3aea844e"},
]
[package.dependencies]
@@ -73,38 +70,36 @@ aio = ["azure-core[aio] (>=1.30.0)"]
[[package]]
name = "bcrypt"
-version = "4.2.0"
+version = "4.2.1"
description = "Modern password hashing for your software and your servers"
optional = false
python-versions = ">=3.7"
files = [
- {file = "bcrypt-4.2.0-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:096a15d26ed6ce37a14c1ac1e48119660f21b24cba457f160a4b830f3fe6b5cb"},
- {file = "bcrypt-4.2.0-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c02d944ca89d9b1922ceb8a46460dd17df1ba37ab66feac4870f6862a1533c00"},
- {file = "bcrypt-4.2.0-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1d84cf6d877918620b687b8fd1bf7781d11e8a0998f576c7aa939776b512b98d"},
- {file = "bcrypt-4.2.0-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:1bb429fedbe0249465cdd85a58e8376f31bb315e484f16e68ca4c786dcc04291"},
- {file = "bcrypt-4.2.0-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:655ea221910bcac76ea08aaa76df427ef8625f92e55a8ee44fbf7753dbabb328"},
- {file = "bcrypt-4.2.0-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:1ee38e858bf5d0287c39b7a1fc59eec64bbf880c7d504d3a06a96c16e14058e7"},
- {file = "bcrypt-4.2.0-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:0da52759f7f30e83f1e30a888d9163a81353ef224d82dc58eb5bb52efcabc399"},
- {file = "bcrypt-4.2.0-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:3698393a1b1f1fd5714524193849d0c6d524d33523acca37cd28f02899285060"},
- {file = "bcrypt-4.2.0-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:762a2c5fb35f89606a9fde5e51392dad0cd1ab7ae64149a8b935fe8d79dd5ed7"},
- {file = "bcrypt-4.2.0-cp37-abi3-win32.whl", hash = "sha256:5a1e8aa9b28ae28020a3ac4b053117fb51c57a010b9f969603ed885f23841458"},
- {file = "bcrypt-4.2.0-cp37-abi3-win_amd64.whl", hash = "sha256:8f6ede91359e5df88d1f5c1ef47428a4420136f3ce97763e31b86dd8280fbdf5"},
- {file = "bcrypt-4.2.0-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:c52aac18ea1f4a4f65963ea4f9530c306b56ccd0c6f8c8da0c06976e34a6e841"},
- {file = "bcrypt-4.2.0-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3bbbfb2734f0e4f37c5136130405332640a1e46e6b23e000eeff2ba8d005da68"},
- {file = "bcrypt-4.2.0-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3413bd60460f76097ee2e0a493ccebe4a7601918219c02f503984f0a7ee0aebe"},
- {file = "bcrypt-4.2.0-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:8d7bb9c42801035e61c109c345a28ed7e84426ae4865511eb82e913df18f58c2"},
- {file = "bcrypt-4.2.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:3d3a6d28cb2305b43feac298774b997e372e56c7c7afd90a12b3dc49b189151c"},
- {file = "bcrypt-4.2.0-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:9c1c4ad86351339c5f320ca372dfba6cb6beb25e8efc659bedd918d921956bae"},
- {file = "bcrypt-4.2.0-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:27fe0f57bb5573104b5a6de5e4153c60814c711b29364c10a75a54bb6d7ff48d"},
- {file = "bcrypt-4.2.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:8ac68872c82f1add6a20bd489870c71b00ebacd2e9134a8aa3f98a0052ab4b0e"},
- {file = "bcrypt-4.2.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:cb2a8ec2bc07d3553ccebf0746bbf3d19426d1c6d1adbd4fa48925f66af7b9e8"},
- {file = "bcrypt-4.2.0-cp39-abi3-win32.whl", hash = "sha256:77800b7147c9dc905db1cba26abe31e504d8247ac73580b4aa179f98e6608f34"},
- {file = "bcrypt-4.2.0-cp39-abi3-win_amd64.whl", hash = "sha256:61ed14326ee023917ecd093ee6ef422a72f3aec6f07e21ea5f10622b735538a9"},
- {file = "bcrypt-4.2.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:39e1d30c7233cfc54f5c3f2c825156fe044efdd3e0b9d309512cc514a263ec2a"},
- {file = "bcrypt-4.2.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:f4f4acf526fcd1c34e7ce851147deedd4e26e6402369304220250598b26448db"},
- {file = "bcrypt-4.2.0-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:1ff39b78a52cf03fdf902635e4c81e544714861ba3f0efc56558979dd4f09170"},
- {file = "bcrypt-4.2.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:373db9abe198e8e2c70d12b479464e0d5092cc122b20ec504097b5f2297ed184"},
- {file = "bcrypt-4.2.0.tar.gz", hash = "sha256:cf69eaf5185fd58f268f805b505ce31f9b9fc2d64b376642164e9244540c1221"},
+ {file = "bcrypt-4.2.1-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:1340411a0894b7d3ef562fb233e4b6ed58add185228650942bdc885362f32c17"},
+ {file = "bcrypt-4.2.1-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1ee315739bc8387aa36ff127afc99120ee452924e0df517a8f3e4c0187a0f5f"},
+ {file = "bcrypt-4.2.1-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8dbd0747208912b1e4ce730c6725cb56c07ac734b3629b60d4398f082ea718ad"},
+ {file = "bcrypt-4.2.1-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:aaa2e285be097050dba798d537b6efd9b698aa88eef52ec98d23dcd6d7cf6fea"},
+ {file = "bcrypt-4.2.1-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:76d3e352b32f4eeb34703370e370997065d28a561e4a18afe4fef07249cb4396"},
+ {file = "bcrypt-4.2.1-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:b7703ede632dc945ed1172d6f24e9f30f27b1b1a067f32f68bf169c5f08d0425"},
+ {file = "bcrypt-4.2.1-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:89df2aea2c43be1e1fa066df5f86c8ce822ab70a30e4c210968669565c0f4685"},
+ {file = "bcrypt-4.2.1-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:04e56e3fe8308a88b77e0afd20bec516f74aecf391cdd6e374f15cbed32783d6"},
+ {file = "bcrypt-4.2.1-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:cfdf3d7530c790432046c40cda41dfee8c83e29482e6a604f8930b9930e94139"},
+ {file = "bcrypt-4.2.1-cp37-abi3-win32.whl", hash = "sha256:adadd36274510a01f33e6dc08f5824b97c9580583bd4487c564fc4617b328005"},
+ {file = "bcrypt-4.2.1-cp37-abi3-win_amd64.whl", hash = "sha256:8c458cd103e6c5d1d85cf600e546a639f234964d0228909d8f8dbeebff82d526"},
+ {file = "bcrypt-4.2.1-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:8ad2f4528cbf0febe80e5a3a57d7a74e6635e41af1ea5675282a33d769fba413"},
+ {file = "bcrypt-4.2.1-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:909faa1027900f2252a9ca5dfebd25fc0ef1417943824783d1c8418dd7d6df4a"},
+ {file = "bcrypt-4.2.1-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cde78d385d5e93ece5479a0a87f73cd6fa26b171c786a884f955e165032b262c"},
+ {file = "bcrypt-4.2.1-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:533e7f3bcf2f07caee7ad98124fab7499cb3333ba2274f7a36cf1daee7409d99"},
+ {file = "bcrypt-4.2.1-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:687cf30e6681eeda39548a93ce9bfbb300e48b4d445a43db4298d2474d2a1e54"},
+ {file = "bcrypt-4.2.1-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:041fa0155c9004eb98a232d54da05c0b41d4b8e66b6fc3cb71b4b3f6144ba837"},
+ {file = "bcrypt-4.2.1-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:f85b1ffa09240c89aa2e1ae9f3b1c687104f7b2b9d2098da4e923f1b7082d331"},
+ {file = "bcrypt-4.2.1-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:c6f5fa3775966cca251848d4d5393ab016b3afed251163c1436fefdec3b02c84"},
+ {file = "bcrypt-4.2.1-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:807261df60a8b1ccd13e6599c779014a362ae4e795f5c59747f60208daddd96d"},
+ {file = "bcrypt-4.2.1-cp39-abi3-win32.whl", hash = "sha256:b588af02b89d9fad33e5f98f7838bf590d6d692df7153647724a7f20c186f6bf"},
+ {file = "bcrypt-4.2.1-cp39-abi3-win_amd64.whl", hash = "sha256:e84e0e6f8e40a242b11bce56c313edc2be121cec3e0ec2d76fce01f6af33c07c"},
+ {file = "bcrypt-4.2.1-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:76132c176a6d9953cdc83c296aeaed65e1a708485fd55abf163e0d9f8f16ce0e"},
+ {file = "bcrypt-4.2.1-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:e158009a54c4c8bc91d5e0da80920d048f918c61a581f0a63e4e93bb556d362f"},
+ {file = "bcrypt-4.2.1.tar.gz", hash = "sha256:6765386e3ab87f569b276988742039baab087b2cdb01e809d74e74503c2faafe"},
]
[package.extras]
@@ -431,51 +426,53 @@ files = [
[[package]]
name = "cryptography"
-version = "43.0.3"
+version = "44.0.0"
description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
optional = false
-python-versions = ">=3.7"
-files = [
- {file = "cryptography-43.0.3-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:bf7a1932ac4176486eab36a19ed4c0492da5d97123f1406cf15e41b05e787d2e"},
- {file = "cryptography-43.0.3-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:63efa177ff54aec6e1c0aefaa1a241232dcd37413835a9b674b6e3f0ae2bfd3e"},
- {file = "cryptography-43.0.3-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e1ce50266f4f70bf41a2c6dc4358afadae90e2a1e5342d3c08883df1675374f"},
- {file = "cryptography-43.0.3-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:443c4a81bb10daed9a8f334365fe52542771f25aedaf889fd323a853ce7377d6"},
- {file = "cryptography-43.0.3-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:74f57f24754fe349223792466a709f8e0c093205ff0dca557af51072ff47ab18"},
- {file = "cryptography-43.0.3-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:9762ea51a8fc2a88b70cf2995e5675b38d93bf36bd67d91721c309df184f49bd"},
- {file = "cryptography-43.0.3-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:81ef806b1fef6b06dcebad789f988d3b37ccaee225695cf3e07648eee0fc6b73"},
- {file = "cryptography-43.0.3-cp37-abi3-win32.whl", hash = "sha256:cbeb489927bd7af4aa98d4b261af9a5bc025bd87f0e3547e11584be9e9427be2"},
- {file = "cryptography-43.0.3-cp37-abi3-win_amd64.whl", hash = "sha256:f46304d6f0c6ab8e52770addfa2fc41e6629495548862279641972b6215451cd"},
- {file = "cryptography-43.0.3-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:8ac43ae87929a5982f5948ceda07001ee5e83227fd69cf55b109144938d96984"},
- {file = "cryptography-43.0.3-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:846da004a5804145a5f441b8530b4bf35afbf7da70f82409f151695b127213d5"},
- {file = "cryptography-43.0.3-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0f996e7268af62598f2fc1204afa98a3b5712313a55c4c9d434aef49cadc91d4"},
- {file = "cryptography-43.0.3-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:f7b178f11ed3664fd0e995a47ed2b5ff0a12d893e41dd0494f406d1cf555cab7"},
- {file = "cryptography-43.0.3-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:c2e6fc39c4ab499049df3bdf567f768a723a5e8464816e8f009f121a5a9f4405"},
- {file = "cryptography-43.0.3-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:e1be4655c7ef6e1bbe6b5d0403526601323420bcf414598955968c9ef3eb7d16"},
- {file = "cryptography-43.0.3-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:df6b6c6d742395dd77a23ea3728ab62f98379eff8fb61be2744d4679ab678f73"},
- {file = "cryptography-43.0.3-cp39-abi3-win32.whl", hash = "sha256:d56e96520b1020449bbace2b78b603442e7e378a9b3bd68de65c782db1507995"},
- {file = "cryptography-43.0.3-cp39-abi3-win_amd64.whl", hash = "sha256:0c580952eef9bf68c4747774cde7ec1d85a6e61de97281f2dba83c7d2c806362"},
- {file = "cryptography-43.0.3-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d03b5621a135bffecad2c73e9f4deb1a0f977b9a8ffe6f8e002bf6c9d07b918c"},
- {file = "cryptography-43.0.3-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:a2a431ee15799d6db9fe80c82b055bae5a752bef645bba795e8e52687c69efe3"},
- {file = "cryptography-43.0.3-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:281c945d0e28c92ca5e5930664c1cefd85efe80e5c0d2bc58dd63383fda29f83"},
- {file = "cryptography-43.0.3-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:f18c716be16bc1fea8e95def49edf46b82fccaa88587a45f8dc0ff6ab5d8e0a7"},
- {file = "cryptography-43.0.3-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:4a02ded6cd4f0a5562a8887df8b3bd14e822a90f97ac5e544c162899bc467664"},
- {file = "cryptography-43.0.3-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:53a583b6637ab4c4e3591a15bc9db855b8d9dee9a669b550f311480acab6eb08"},
- {file = "cryptography-43.0.3-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1ec0bcf7e17c0c5669d881b1cd38c4972fade441b27bda1051665faaa89bdcaa"},
- {file = "cryptography-43.0.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:2ce6fae5bdad59577b44e4dfed356944fbf1d925269114c28be377692643b4ff"},
- {file = "cryptography-43.0.3.tar.gz", hash = "sha256:315b9001266a492a6ff443b61238f956b214dbec9910a081ba5b6646a055a805"},
+python-versions = "!=3.9.0,!=3.9.1,>=3.7"
+files = [
+ {file = "cryptography-44.0.0-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:84111ad4ff3f6253820e6d3e58be2cc2a00adb29335d4cacb5ab4d4d34f2a123"},
+ {file = "cryptography-44.0.0-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b15492a11f9e1b62ba9d73c210e2416724633167de94607ec6069ef724fad092"},
+ {file = "cryptography-44.0.0-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:831c3c4d0774e488fdc83a1923b49b9957d33287de923d58ebd3cec47a0ae43f"},
+ {file = "cryptography-44.0.0-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:761817a3377ef15ac23cd7834715081791d4ec77f9297ee694ca1ee9c2c7e5eb"},
+ {file = "cryptography-44.0.0-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:3c672a53c0fb4725a29c303be906d3c1fa99c32f58abe008a82705f9ee96f40b"},
+ {file = "cryptography-44.0.0-cp37-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:4ac4c9f37eba52cb6fbeaf5b59c152ea976726b865bd4cf87883a7e7006cc543"},
+ {file = "cryptography-44.0.0-cp37-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:60eb32934076fa07e4316b7b2742fa52cbb190b42c2df2863dbc4230a0a9b385"},
+ {file = "cryptography-44.0.0-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:ed3534eb1090483c96178fcb0f8893719d96d5274dfde98aa6add34614e97c8e"},
+ {file = "cryptography-44.0.0-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:f3f6fdfa89ee2d9d496e2c087cebef9d4fcbb0ad63c40e821b39f74bf48d9c5e"},
+ {file = "cryptography-44.0.0-cp37-abi3-win32.whl", hash = "sha256:eb33480f1bad5b78233b0ad3e1b0be21e8ef1da745d8d2aecbb20671658b9053"},
+ {file = "cryptography-44.0.0-cp37-abi3-win_amd64.whl", hash = "sha256:abc998e0c0eee3c8a1904221d3f67dcfa76422b23620173e28c11d3e626c21bd"},
+ {file = "cryptography-44.0.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:660cb7312a08bc38be15b696462fa7cc7cd85c3ed9c576e81f4dc4d8b2b31591"},
+ {file = "cryptography-44.0.0-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1923cb251c04be85eec9fda837661c67c1049063305d6be5721643c22dd4e2b7"},
+ {file = "cryptography-44.0.0-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:404fdc66ee5f83a1388be54300ae978b2efd538018de18556dde92575e05defc"},
+ {file = "cryptography-44.0.0-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:c5eb858beed7835e5ad1faba59e865109f3e52b3783b9ac21e7e47dc5554e289"},
+ {file = "cryptography-44.0.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:f53c2c87e0fb4b0c00fa9571082a057e37690a8f12233306161c8f4b819960b7"},
+ {file = "cryptography-44.0.0-cp39-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:9e6fc8a08e116fb7c7dd1f040074c9d7b51d74a8ea40d4df2fc7aa08b76b9e6c"},
+ {file = "cryptography-44.0.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:9abcc2e083cbe8dde89124a47e5e53ec38751f0d7dfd36801008f316a127d7ba"},
+ {file = "cryptography-44.0.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:d2436114e46b36d00f8b72ff57e598978b37399d2786fd39793c36c6d5cb1c64"},
+ {file = "cryptography-44.0.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a01956ddfa0a6790d594f5b34fc1bfa6098aca434696a03cfdbe469b8ed79285"},
+ {file = "cryptography-44.0.0-cp39-abi3-win32.whl", hash = "sha256:eca27345e1214d1b9f9490d200f9db5a874479be914199194e746c893788d417"},
+ {file = "cryptography-44.0.0-cp39-abi3-win_amd64.whl", hash = "sha256:708ee5f1bafe76d041b53a4f95eb28cdeb8d18da17e597d46d7833ee59b97ede"},
+ {file = "cryptography-44.0.0-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:37d76e6863da3774cd9db5b409a9ecfd2c71c981c38788d3fcfaf177f447b731"},
+ {file = "cryptography-44.0.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:f677e1268c4e23420c3acade68fac427fffcb8d19d7df95ed7ad17cdef8404f4"},
+ {file = "cryptography-44.0.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:f5e7cb1e5e56ca0933b4873c0220a78b773b24d40d186b6738080b73d3d0a756"},
+ {file = "cryptography-44.0.0-pp310-pypy310_pp73-manylinux_2_34_aarch64.whl", hash = "sha256:8b3e6eae66cf54701ee7d9c83c30ac0a1e3fa17be486033000f2a73a12ab507c"},
+ {file = "cryptography-44.0.0-pp310-pypy310_pp73-manylinux_2_34_x86_64.whl", hash = "sha256:be4ce505894d15d5c5037167ffb7f0ae90b7be6f2a98f9a5c3442395501c32fa"},
+ {file = "cryptography-44.0.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:62901fb618f74d7d81bf408c8719e9ec14d863086efe4185afd07c352aee1d2c"},
+ {file = "cryptography-44.0.0.tar.gz", hash = "sha256:cd4e834f340b4293430701e772ec543b0fbe6c2dea510a5286fe0acabe153a02"},
]
[package.dependencies]
cffi = {version = ">=1.12", markers = "platform_python_implementation != \"PyPy\""}
[package.extras]
-docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"]
-docstest = ["pyenchant (>=1.6.11)", "readme-renderer", "sphinxcontrib-spelling (>=4.0.1)"]
-nox = ["nox"]
-pep8test = ["check-sdist", "click", "mypy", "ruff"]
-sdist = ["build"]
+docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=3.0.0)"]
+docstest = ["pyenchant (>=3)", "readme-renderer (>=30.0)", "sphinxcontrib-spelling (>=7.3.1)"]
+nox = ["nox (>=2024.4.15)", "nox[uv] (>=2024.3.2)"]
+pep8test = ["check-sdist", "click (>=8.0.1)", "mypy (>=1.4)", "ruff (>=0.3.6)"]
+sdist = ["build (>=1.0.0)"]
ssh = ["bcrypt (>=3.1.5)"]
-test = ["certifi", "cryptography-vectors (==43.0.3)", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist"]
+test = ["certifi (>=2024)", "cryptography-vectors (==44.0.0)", "pretend (>=0.7)", "pytest (>=7.4.0)", "pytest-benchmark (>=4.0)", "pytest-cov (>=2.10.1)", "pytest-xdist (>=3.5.0)"]
test-randomorder = ["pytest-randomly"]
[[package]]
@@ -530,13 +527,13 @@ typing_extensions = ">=3.10.0.0"
[[package]]
name = "django"
-version = "4.2.16"
+version = "4.2.17"
description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design."
optional = false
python-versions = ">=3.8"
files = [
- {file = "Django-4.2.16-py3-none-any.whl", hash = "sha256:1ddc333a16fc139fd253035a1606bb24261951bbc3a6ca256717fa06cc41a898"},
- {file = "Django-4.2.16.tar.gz", hash = "sha256:6f1616c2786c408ce86ab7e10f792b8f15742f7b7b7460243929cb371e7f1dad"},
+ {file = "Django-4.2.17-py3-none-any.whl", hash = "sha256:3a93350214ba25f178d4045c0786c61573e7dbfa3c509b3551374f1e11ba8de0"},
+ {file = "Django-4.2.17.tar.gz", hash = "sha256:6b56d834cc94c8b21a8f4e775064896be3b4a4ca387f2612d4406a5927cd2fdc"},
]
[package.dependencies]
@@ -654,13 +651,13 @@ tornado = ["tornado (>=0.2)"]
[[package]]
name = "identify"
-version = "2.6.2"
+version = "2.6.3"
description = "File identification library for Python"
optional = false
python-versions = ">=3.9"
files = [
- {file = "identify-2.6.2-py2.py3-none-any.whl", hash = "sha256:c097384259f49e372f4ea00a19719d95ae27dd5ff0fd77ad630aa891306b82f3"},
- {file = "identify-2.6.2.tar.gz", hash = "sha256:fab5c716c24d7a789775228823797296a2994b075fb6080ac83a102772a98cbd"},
+ {file = "identify-2.6.3-py2.py3-none-any.whl", hash = "sha256:9edba65473324c2ea9684b1f944fe3191db3345e50b6d04571d10ed164f8d7bd"},
+ {file = "identify-2.6.3.tar.gz", hash = "sha256:62f5dae9b5fef52c84cc188514e9ea4f3f636b1d8799ab5ebc475471f9e47a02"},
]
[package.extras]
@@ -697,13 +694,13 @@ ipython = {version = ">=7.31.1", markers = "python_version >= \"3.11\""}
[[package]]
name = "ipython"
-version = "8.29.0"
+version = "8.30.0"
description = "IPython: Productive Interactive Computing"
optional = false
python-versions = ">=3.10"
files = [
- {file = "ipython-8.29.0-py3-none-any.whl", hash = "sha256:0188a1bd83267192123ccea7f4a8ed0a78910535dbaa3f37671dca76ebd429c8"},
- {file = "ipython-8.29.0.tar.gz", hash = "sha256:40b60e15b22591450eef73e40a027cf77bd652e757523eebc5bd7c7c498290eb"},
+ {file = "ipython-8.30.0-py3-none-any.whl", hash = "sha256:85ec56a7e20f6c38fce7727dcca699ae4ffc85985aa7b23635a8008f918ae321"},
+ {file = "ipython-8.30.0.tar.gz", hash = "sha256:cb0a405a306d2995a5cbb9901894d240784a9f341394c6ba3f4fe8c6eb89ff6e"},
]
[package.dependencies]
@@ -712,15 +709,15 @@ decorator = "*"
jedi = ">=0.16"
matplotlib-inline = "*"
pexpect = {version = ">4.3", markers = "sys_platform != \"win32\" and sys_platform != \"emscripten\""}
-prompt-toolkit = ">=3.0.41,<3.1.0"
+prompt_toolkit = ">=3.0.41,<3.1.0"
pygments = ">=2.4.0"
-stack-data = "*"
+stack_data = "*"
traitlets = ">=5.13.0"
[package.extras]
all = ["ipython[black,doc,kernel,matplotlib,nbconvert,nbformat,notebook,parallel,qtconsole]", "ipython[test,test-extra]"]
black = ["black"]
-doc = ["docrepr", "exceptiongroup", "intersphinx-registry", "ipykernel", "ipython[test]", "matplotlib", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "sphinxcontrib-jquery", "tomli", "typing-extensions"]
+doc = ["docrepr", "exceptiongroup", "intersphinx_registry", "ipykernel", "ipython[test]", "matplotlib", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "sphinxcontrib-jquery", "tomli", "typing_extensions"]
kernel = ["ipykernel"]
matplotlib = ["matplotlib"]
nbconvert = ["nbconvert"]
@@ -794,13 +791,13 @@ tests = ["Django (>=3.0)", "Flask (>=1.0)", "Marshmallow (>=3.9)", "SQLAlchemy (
[[package]]
name = "msal"
-version = "1.31.0"
+version = "1.31.1"
description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect."
optional = false
python-versions = ">=3.7"
files = [
- {file = "msal-1.31.0-py3-none-any.whl", hash = "sha256:96bc37cff82ebe4b160d5fc0f1196f6ca8b50e274ecd0ec5bf69c438514086e7"},
- {file = "msal-1.31.0.tar.gz", hash = "sha256:2c4f189cf9cc8f00c80045f66d39b7c0f3ed45873fd3d1f2af9f22db2e12ff4b"},
+ {file = "msal-1.31.1-py3-none-any.whl", hash = "sha256:29d9882de247e96db01386496d59f29035e5e841bcac892e6d7bf4390bf6bd17"},
+ {file = "msal-1.31.1.tar.gz", hash = "sha256:11b5e6a3f802ffd3a72107203e20c4eac6ef53401961b880af2835b723d80578"},
]
[package.dependencies]
@@ -1031,13 +1028,13 @@ files = [
[[package]]
name = "psycopg-pool"
-version = "3.2.3"
+version = "3.2.4"
description = "Connection Pool for Psycopg"
optional = false
python-versions = ">=3.8"
files = [
- {file = "psycopg_pool-3.2.3-py3-none-any.whl", hash = "sha256:53bd8e640625e01b2927b2ad96df8ed8e8f91caea4597d45e7673fc7bbb85eb1"},
- {file = "psycopg_pool-3.2.3.tar.gz", hash = "sha256:bb942f123bef4b7fbe4d55421bd3fb01829903c95c0f33fd42b7e94e5ac9b52a"},
+ {file = "psycopg_pool-3.2.4-py3-none-any.whl", hash = "sha256:f6a22cff0f21f06d72fb2f5cb48c618946777c49385358e0c88d062c59cbd224"},
+ {file = "psycopg_pool-3.2.4.tar.gz", hash = "sha256:61774b5bbf23e8d22bedc7504707135aaf744679f8ef9b3fe29942920746a6ed"},
]
[package.dependencies]
@@ -1095,13 +1092,13 @@ windows-terminal = ["colorama (>=0.4.6)"]
[[package]]
name = "pyjwt"
-version = "2.9.0"
+version = "2.10.1"
description = "JSON Web Token implementation in Python"
optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
files = [
- {file = "PyJWT-2.9.0-py3-none-any.whl", hash = "sha256:3b02fb0f44517787776cf48f2ae25d8e14f300e6d7545a4315cee571a415e850"},
- {file = "pyjwt-2.9.0.tar.gz", hash = "sha256:7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c"},
+ {file = "PyJWT-2.10.1-py3-none-any.whl", hash = "sha256:dcdd193e30abefd5debf142f9adfcdd2b58004e644f25406ffaebd50bd98dacb"},
+ {file = "pyjwt-2.10.1.tar.gz", hash = "sha256:3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953"},
]
[package.dependencies]
@@ -1280,13 +1277,13 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
[[package]]
name = "sentry-sdk"
-version = "2.18.0"
+version = "2.19.0"
description = "Python client for Sentry (https://sentry.io)"
optional = false
python-versions = ">=3.6"
files = [
- {file = "sentry_sdk-2.18.0-py2.py3-none-any.whl", hash = "sha256:ee70e27d1bbe4cd52a38e1bd28a5fadb9b17bc29d91b5f2b97ae29c0a7610442"},
- {file = "sentry_sdk-2.18.0.tar.gz", hash = "sha256:0dc21febd1ab35c648391c664df96f5f79fb0d92d7d4225cd9832e53a617cafd"},
+ {file = "sentry_sdk-2.19.0-py2.py3-none-any.whl", hash = "sha256:7b0b3b709dee051337244a09a30dbf6e95afe0d34a1f8b430d45e0982a7c125b"},
+ {file = "sentry_sdk-2.19.0.tar.gz", hash = "sha256:ee4a4d2ae8bfe3cac012dcf3e4607975904c137e1738116549fc3dbbb6ff0e36"},
]
[package.dependencies]
@@ -1313,7 +1310,7 @@ grpcio = ["grpcio (>=1.21.1)", "protobuf (>=3.8.0)"]
http2 = ["httpcore[http2] (==1.*)"]
httpx = ["httpx (>=0.16.0)"]
huey = ["huey (>=2)"]
-huggingface-hub = ["huggingface-hub (>=0.22)"]
+huggingface-hub = ["huggingface_hub (>=0.22)"]
langchain = ["langchain (>=0.0.210)"]
launchdarkly = ["launchdarkly-server-sdk (>=9.8.0)"]
litestar = ["litestar (>=2.0.0)"]
@@ -1322,7 +1319,7 @@ openai = ["openai (>=1.0.0)", "tiktoken (>=0.3.0)"]
openfeature = ["openfeature-sdk (>=0.7.1)"]
opentelemetry = ["opentelemetry-distro (>=0.35b0)"]
opentelemetry-experimental = ["opentelemetry-distro"]
-pure-eval = ["asttokens", "executing", "pure-eval"]
+pure-eval = ["asttokens", "executing", "pure_eval"]
pymongo = ["pymongo (>=3.1)"]
pyspark = ["pyspark (>=2.4.4)"]
quart = ["blinker (>=1.1)", "quart (>=0.16.1)"]
@@ -1335,24 +1332,24 @@ tornado = ["tornado (>=6)"]
[[package]]
name = "six"
-version = "1.16.0"
+version = "1.17.0"
description = "Python 2 and 3 compatibility utilities"
optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
files = [
- {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
- {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+ {file = "six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274"},
+ {file = "six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"},
]
[[package]]
name = "sqlparse"
-version = "0.5.1"
+version = "0.5.2"
description = "A non-validating SQL parser."
optional = false
python-versions = ">=3.8"
files = [
- {file = "sqlparse-0.5.1-py3-none-any.whl", hash = "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4"},
- {file = "sqlparse-0.5.1.tar.gz", hash = "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e"},
+ {file = "sqlparse-0.5.2-py3-none-any.whl", hash = "sha256:e99bc85c78160918c3e1d9230834ab8d80fc06c59d03f8db2618f65f65dda55e"},
+ {file = "sqlparse-0.5.2.tar.gz", hash = "sha256:9e37b35e16d1cc652a2545f0997c1deb23ea28fa1f3eefe609eee3063c3b105f"},
]
[package.extras]
@@ -1444,13 +1441,13 @@ zstd = ["zstandard (>=0.18.0)"]
[[package]]
name = "virtualenv"
-version = "20.27.1"
+version = "20.28.0"
description = "Virtual Python Environment builder"
optional = false
python-versions = ">=3.8"
files = [
- {file = "virtualenv-20.27.1-py3-none-any.whl", hash = "sha256:f11f1b8a29525562925f745563bfd48b189450f61fb34c4f9cc79dd5aa32a1f4"},
- {file = "virtualenv-20.27.1.tar.gz", hash = "sha256:142c6be10212543b32c6c45d3d3893dff89112cc588b7d0879ae5a1ec03a47ba"},
+ {file = "virtualenv-20.28.0-py3-none-any.whl", hash = "sha256:23eae1b4516ecd610481eda647f3a7c09aea295055337331bb4e6892ecce47b0"},
+ {file = "virtualenv-20.28.0.tar.gz", hash = "sha256:2c9c3262bb8e7b87ea801d715fae4495e6032450c71d2309be9550e7364049aa"},
]
[package.dependencies]
@@ -1475,16 +1472,17 @@ files = [
[[package]]
name = "webtemplate-dbca"
-version = "1.7.1"
+version = "1.7.2"
description = "Base HTML templates for DBCA Django projects"
optional = false
-python-versions = "*"
+python-versions = "<4.0,>=3.9"
files = [
- {file = "webtemplate-dbca-1.7.1.tar.gz", hash = "sha256:0fe4ccd143dfee138c85969989a9757d14dbdf3387f1317f37f4667d90131da0"},
+ {file = "webtemplate_dbca-1.7.2-py3-none-any.whl", hash = "sha256:4ebfa62ad7261dcf9e49b19430444e3c12ea1db0e487fb4aa4a05ffa5849d917"},
+ {file = "webtemplate_dbca-1.7.2.tar.gz", hash = "sha256:fbd6fdf342bacc0f43bd9005a302539f6680ed15e6fcdfc0e120d368ce59a391"},
]
[package.dependencies]
-Django = ">=3.2"
+django = ">=3.2,<5.1"
[[package]]
name = "whitenoise"
@@ -1517,4 +1515,4 @@ files = [
[metadata]
lock-version = "2.0"
python-versions = "^3.12"
-content-hash = "d26a6b4919f35704de1021c15aa5fbc741cd329e7ddc34b455f2560c8ba516b1"
+content-hash = "ecb7c8cb42c5519730f6116db235306f53091ffe80d2867f094f4cd30482a604"
diff --git a/pyproject.toml b/pyproject.toml
index 21850ce8..7193730a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ package-mode = false
[tool.poetry.dependencies]
python = "^3.12"
-django = "4.2.16"
+django = "4.2.17"
psycopg = { version = "3.2.3", extras = ["binary", "pool"] }
dbca-utils = "2.0.2"
django-extensions = "3.2.3"
@@ -17,19 +17,19 @@ dj-database-url = "2.3.0"
gunicorn = "23.0.0"
unicodecsv = "0.14.1"
python-dateutil = "2.8.2"
-webtemplate-dbca = "1.7.1"
+webtemplate-dbca = "1.7.2"
mixer = "7.2.2"
-msal = "1.31.0"
+msal = "1.31.1"
whitenoise = { version = "6.8.2", extras = ["brotli"] }
pysftp = "0.2.9"
-azure-storage-blob = "12.23.1"
+azure-storage-blob = "12.24.0"
django-storages = { version = "1.14.4", extras = ["azure"] }
xlsxwriter = "3.2.0"
-sentry-sdk = { version = "2.18.0", extras = ["django"] }
+sentry-sdk = {version = "2.19.0", extras = ["django"]}
redis = "5.2.0"
[tool.poetry.group.dev.dependencies]
-ipython = "^8.29.0"
+ipython = "^8.30.0"
ipdb = "^0.13.13"
pre-commit = "^4.0.1"