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

Add IAP_ALERT_WEBHOOK_URL #198

Merged
merged 3 commits into from
Dec 9, 2023
Merged

Add IAP_ALERT_WEBHOOK_URL #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b8fcab
Set webhook urls to send slack message
U-lis Dec 4, 2023
f310594
Handle session in well-known way
U-lis Dec 4, 2023
506485b
Merge branch 'release/0.8.0' into bugfix/iap-monitor-slack
U-lis Dec 9, 2023
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
4 changes: 4 additions & 0 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ on:
required: true
IAP_GARAGE_WEBHOOK_URL:
required: true
IAP_ALERT_WEBHOOK_URL:
required: true
GOLDEN_DUST_REQUEST_SHEET_ID:
required: true
GOLDEN_DUST_WORK_SHEET_ID:
Expand Down Expand Up @@ -137,6 +139,7 @@ jobs:
APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
IAP_GARAGE_WEBHOOK_URL: ${{ secrets.IAP_GARAGE_WEBHOOK_URL }}
IAP_ALERT_WEBHOOK_URL: ${{ secrets.IAP_ALERT_WEBHOOK_URL }}
GOLDEN_DUST_REQUEST_SHEET_ID: ${{ secrets.GOLDEN_DUST_REQUEST_SHEET_ID }}
GOLDEN_DUST_WORK_SHEET_ID: ${{ secrets.GOLDEN_DUST_WORK_SHEET_ID }}
FORM_SHEET: ${{ vars.FORM_SHEET }}
Expand Down Expand Up @@ -169,6 +172,7 @@ jobs:
APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
IAP_GARAGE_WEBHOOK_URL: ${{ secrets.IAP_GARAGE_WEBHOOK_URL }}
IAP_ALERT_WEBHOOK_URL: ${{ secrets.IAP_ALERT_WEBHOOK_URL }}
GOLDEN_DUST_REQUEST_SHEET_ID: ${{ secrets.GOLDEN_DUST_REQUEST_SHEET_ID }}
GOLDEN_DUST_WORK_SHEET_ID: ${{ secrets.GOLDEN_DUST_WORK_SHEET_ID }}
FORM_SHEET: ${{ vars.FORM_SHEET }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
IAP_GARAGE_WEBHOOK_URL: ${{ secrets.IAP_GARAGE_WEBHOOK_URL }}
IAP_ALERT_WEBHOOK_URL: ${{ secrets.IAP_ALERT_WEBHOOK_URL }}
GOLDEN_DUST_REQUEST_SHEET_ID: ${{ secrets.GOLDEN_DUST_REQUEST_SHEET_ID }}
GOLDEN_DUST_WORK_SHEET_ID: ${{ secrets.GOLDEN_DUST_WORK_SHEET_ID }}
SEASON_PASS_JWT_SECRET: ${{ secrets.SEASON_PASS_JWT_SECRET }}
Expand All @@ -68,6 +69,7 @@ jobs:
APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
IAP_GARAGE_WEBHOOK_URL: ${{ secrets.IAP_GARAGE_WEBHOOK_URL }}
IAP_ALERT_WEBHOOK_URL: ${{ secrets.IAP_ALERT_WEBHOOK_URL }}
GOLDEN_DUST_REQUEST_SHEET_ID: ${{ secrets.GOLDEN_DUST_REQUEST_SHEET_ID }}
GOLDEN_DUST_WORK_SHEET_ID: ${{ secrets.GOLDEN_DUST_WORK_SHEET_ID }}
SEASON_PASS_JWT_SECRET: ${{ secrets.SEASON_PASS_JWT_SECRET }}
Expand Down Expand Up @@ -106,6 +108,7 @@ jobs:
APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
IAP_GARAGE_WEBHOOK_URL: ${{ secrets.IAP_GARAGE_WEBHOOK_URL }}
IAP_ALERT_WEBHOOK_URL: ${{ secrets.IAP_ALERT_WEBHOOK_URL }}
GOLDEN_DUST_REQUEST_SHEET_ID: ${{ secrets.GOLDEN_DUST_REQUEST_SHEET_ID }}
GOLDEN_DUST_WORK_SHEET_ID: ${{ secrets.GOLDEN_DUST_WORK_SHEET_ID }}
SEASON_PASS_JWT_SECRET: ${{ secrets.SEASON_PASS_JWT_SECRET }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/synth.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ on:
required: true
IAP_GARAGE_WEBHOOK_URL:
required: true
IAP_ALERT_WEBHOOK_URL:
required: true
GOLDEN_DUST_REQUEST_SHEET_ID:
required: true
GOLDEN_DUST_WORK_SHEET_ID:
Expand Down Expand Up @@ -124,6 +126,7 @@ jobs:
APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
IAP_GARAGE_WEBHOOK_URL: ${{ secrets.IAP_GARAGE_WEBHOOK_URL }}
IAP_ALERT_WEBHOOK_URL: ${{ secrets.IAP_ALERT_WEBHOOK_URL }}
GOLDEN_DUST_REQUEST_SHEET_ID: ${{ secrets.GOLDEN_DUST_REQUEST_SHEET_ID }}
GOLDEN_DUST_WORK_SHEET_ID: ${{ secrets.GOLDEN_DUST_WORK_SHEET_ID }}
FORM_SHEET: ${{ vars.FORM_SHEET }}
Expand Down
4 changes: 4 additions & 0 deletions common/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ class Config:
golden_dust_work_sheet_id: Optional[str] = None
form_sheet: Optional[str] = None

# Status monitor
iap_garage_webhook_url: str = None
iap_alert_webhook_url: str = None

# SeasonPass
season_pass_jwt_secret: str = None

Expand Down
12 changes: 8 additions & 4 deletions worker/worker/status_monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,17 @@ def check_garage():


def handle(event, context):
session = scoped_session(sessionmaker(bind=engine))
sess = scoped_session(sessionmaker(bind=engine))
if datetime.utcnow().hour == 3 and datetime.now().minute == 0: # 12:00 KST
check_garage()

check_invalid_receipt(sess)
check_halt_tx(sess)
check_tx_failure(sess)
try:
check_invalid_receipt(sess)
check_halt_tx(sess)
check_tx_failure(sess)
finally:
if sess is not None:
sess.close()


if __name__ == "__main__":
Expand Down
5 changes: 4 additions & 1 deletion worker/worker_cdk_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,17 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
minute_event_rule.add_target(_event_targets.LambdaFunction(tracker))

# IAP Status Monitor
monitor_env = deepcopy(env)
monitor_env["IAP_GARAGE_WEBHOOK_URL"] = config.iap_garage_webhook_url
monitor_env["IAP_ALERT_WEBHOOK_URL"] = config.iap_alert_webhook_url
status_monitor = _lambda.Function(
self, f"{config.stage}-9c-iap-status-monitor-function",
function_name=f"{config.stage}-9c-iap-status-monitor",
description="Receipt and Tx. status monitor for Nine Chronicles",
runtime=_lambda.Runtime.PYTHON_3_10,
code=_lambda.AssetCode("worker/worker", exclude=exclude_list),
handler="status_monitor.handle",
environment=env,
environment=monitor_env,
layers=[layer],
role=role,
vpc=shared_stack.vpc,
Expand Down