Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move to production #4286

Merged
merged 27 commits into from
Jan 27, 2025
Merged

move to production #4286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
12bf31b
Update auth service staging image tag to stage-b77b6fc2-1737917401
github-actions[bot] Jan 26, 2025
9c244cf
Update AirQo exceedance production image tag to prod-78dc2fc4-1737917447
github-actions[bot] Jan 26, 2025
0cc9662
Update KCCA exceedance production image tag to prod-78dc2fc4-1737917447
github-actions[bot] Jan 26, 2025
2d9c670
Update incentives production image tag to prod-78dc2fc4-1737917447
github-actions[bot] Jan 26, 2025
c9e2dc0
Update auth service production image tag to prod-78dc2fc4-1737917447
github-actions[bot] Jan 26, 2025
9ffdaf0
Update calibrate production tags to prod-78dc2fc4-1737917447
github-actions[bot] Jan 26, 2025
7a01104
Update device registry production image tag to prod-78dc2fc4-1737917447
github-actions[bot] Jan 26, 2025
8b27a73
Update workflows prod image tag to prod-78dc2fc4-1737917447
github-actions[bot] Jan 26, 2025
0241f44
Update predict production image tag to prod-78dc2fc4-1737917447
github-actions[bot] Jan 26, 2025
e0bbc81
just enhancing the logging for API usage
Baalmart Jan 26, 2025
24626be
Merge pull request #4285 from airqo-platform/hf-api-user-logs
Baalmart Jan 26, 2025
6a808a5
Update auth service staging image tag to stage-24626bec-1737928031
github-actions[bot] Jan 26, 2025
8751753
resolving a runtime with access token verification
Baalmart Jan 26, 2025
ef33d6c
Merge pull request #4287 from airqo-platform/hf-token-verification
Baalmart Jan 26, 2025
dd3bd0e
Update auth service staging image tag to stage-ef33d6c3-1737931922
github-actions[bot] Jan 26, 2025
40ddc5a
address runtime for cast error
Baalmart Jan 26, 2025
0a02ff2
Merge pull request #4288 from airqo-platform/hf-verify
Baalmart Jan 26, 2025
1187c39
Update auth service staging image tag to stage-0a02ff2c-1737933923
github-actions[bot] Jan 26, 2025
9c3160f
runtime for processing queue of token logging
Baalmart Jan 26, 2025
a6a0f84
Merge pull request #4289 from airqo-platform/hf-verify-1
Baalmart Jan 26, 2025
cf00561
Update auth service staging image tag to stage-a6a0f84d-1737935177
github-actions[bot] Jan 26, 2025
38fc5c2
reverting verify token changes
Baalmart Jan 27, 2025
880d004
Merge pull request #4290 from airqo-platform/hf-verify-2
Baalmart Jan 27, 2025
7696bff
Update auth service staging image tag to stage-880d0043-1737953310
github-actions[bot] Jan 27, 2025
05837e8
remove unused imports
Baalmart Jan 27, 2025
ae418a9
Merge pull request #4291 from airqo-platform/hf-verify-3
Baalmart Jan 27, 2025
7a59103
Update auth service staging image tag to stage-ae418a99-1737953821
github-actions[bot] Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion k8s/auth-service/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-auth-api
tag: prod-73e08b6e-1737906940
tag: prod-78dc2fc4-1737917447
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/auth-service/values-stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 2
image:
repository: eu.gcr.io/airqo-250220/airqo-stage-auth-api
tag: stage-e12dd8a6-1737760588
tag: stage-ae418a99-1737953821
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
4 changes: 2 additions & 2 deletions k8s/calibrate/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ app:
initContainer:
image:
repository: eu.gcr.io/airqo-250220/airqo-calibrate-pickle-file
tag: prod-73e08b6e-1737906940
tag: prod-78dc2fc4-1737917447
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-calibrate-api
tag: prod-73e08b6e-1737906940
tag: prod-78dc2fc4-1737917447
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/device-registry/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-device-registry-api
tag: prod-73e08b6e-1737906940
tag: prod-78dc2fc4-1737917447
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/exceedance/values-prod-airqo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ app:
configmap: env-exceedance-production
image:
repository: eu.gcr.io/airqo-250220/airqo-exceedance-job
tag: prod-73e08b6e-1737906940
tag: prod-78dc2fc4-1737917447
nameOverride: ''
fullnameOverride: ''
2 changes: 1 addition & 1 deletion k8s/exceedance/values-prod-kcca.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ app:
configmap: env-exceedance-production
image:
repository: eu.gcr.io/airqo-250220/kcca-exceedance-job
tag: prod-73e08b6e-1737906940
tag: prod-78dc2fc4-1737917447
nameOverride: ''
fullnameOverride: ''
2 changes: 1 addition & 1 deletion k8s/incentives/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-incentives-api
tag: prod-73e08b6e-1737906940
tag: prod-78dc2fc4-1737917447
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/predict/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ images:
predictJob: eu.gcr.io/airqo-250220/airqo-predict-job
trainJob: eu.gcr.io/airqo-250220/airqo-train-job
predictPlaces: eu.gcr.io/airqo-250220/airqo-predict-places-air-quality
tag: prod-73e08b6e-1737906940
tag: prod-78dc2fc4-1737917447
api:
name: airqo-prediction-api
label: prediction-api
Expand Down
2 changes: 1 addition & 1 deletion k8s/workflows/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ images:
initContainer: eu.gcr.io/airqo-250220/airqo-workflows-xcom
redisContainer: eu.gcr.io/airqo-250220/airqo-redis
containers: eu.gcr.io/airqo-250220/airqo-workflows
tag: prod-73e08b6e-1737906940
tag: prod-78dc2fc4-1737917447
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
4 changes: 3 additions & 1 deletion src/auth-service/config/log4js.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const constants = require("./constants");
const log4js = {
appenders: {
console: { type: "console" },
out: { type: "stdout" }, // Log to standard output (essential for Cloud Run/Functions)
access: {
type: "dateFile",
filename: "log/access.log",
Expand Down Expand Up @@ -39,9 +40,10 @@ const log4js = {
},
},
categories: {
default: { appenders: ["alerts"], level: "info" },
default: { appenders: ["alerts", "out"], level: "info" },
error: { appenders: ["alerts", "errors"], level: "error" },
http: { appenders: ["access"], level: "DEBUG" },
"api-usage-logger": { appenders: ["out"], level: "info" }, // API Usage logs *only* to stdout, not to slack!
},
};

Expand Down
2 changes: 1 addition & 1 deletion src/auth-service/models/AccessToken.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const AccessTokenSchema = new mongoose.Schema(
required: [true, "token is required!"],
},
last_used_at: { type: Date },
last_ip_address: { type: Date },
last_ip_address: { type: String },
expires_in: { type: Number },
expires: {
type: Date,
Expand Down
Loading