## 概要 [Task2967: Azure AD B2Cの結果をCacheManagerにキャッシュするよう修正](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2967) - キャッシュを扱うRedisServiceを追加 - AdB2cServiceでRedisServiceを使って結果をキャッシュする実装を追加 - ADB2Cの呼び出しと、キャッシュからの取得が行われた時にログを出す実装を追加 - Azure Monitorで呼び出しコストでアラート出したくなった時のための予防的追加 - 開発環境でローカルのredisを操作する用途のredis-cliをインストールする設定を追加&スクリプトを追加 - `getUser` と `getUsers` の返り値の方を統一 & 使用されなくなった方の型を削除 - AdB2Cの`ttl` に設定する用の値を環境変数に追加 - 今後実装予定のトークンのキャッシュとはTTLを別にしたかったため - 複数ユーザー削除処理内でのindex処理が不適切と思われる箇所があったので修正 ## レビューポイント - **Redisへのget/set/delが失敗した際に、エラーログだけ出して成功 or 取得対象なしと同様の動作をするように作成したが、問題なさそうか** - これは速度向上用のキャッシュが死んでいても業務は動くべきではないか、という考えによるもの - 通信できない=障害中であると想定されるので、失敗しても良いような気もするので相談 - **AdB2cService内でキャッシュを扱う箇所のコードの可読性に問題はないか** - 更にWrapしてキャッシュの具体的な動きを隠蔽することも考えたが、詳細なエラーの制御をしづらくなりそうだったので具体的な引数の変換等以上のことはしない形で実装 - AdB2cServiceが十分に末端の処理なので詳細な処理を生で書いていても認知負荷はそう変わらない可能性がある - **キャッシュする値の性質によってTTLを変えられる仕組みを前提に設計・実装したが、懸念点はないか** - **TTLに設定する値は妥当そうか** - **`Aadb2cUser` を削除したが問題ないか** - **`deleteUsers` 内のログ処理の変更は適切か** - to 岩田さん ## 動作確認状況 - ローカルで確認 - npm run testが通過することを確認
231 lines
7.5 KiB
YAML
231 lines
7.5 KiB
YAML
# Pipeline側でKeyVaultやDocker、AppService等に対する操作権限を持ったServiceConenctionを作成しておくこと
|
|
# また、環境変数 STATIC_DICTATION_DEPLOYMENT_TOKEN の値として静的WebAppsのデプロイトークンを設定しておくこと
|
|
trigger:
|
|
branches:
|
|
include:
|
|
- main
|
|
tags:
|
|
include:
|
|
- stage-*
|
|
|
|
jobs:
|
|
- job: initialize
|
|
displayName: Initialize
|
|
pool:
|
|
vmImage: ubuntu-latest
|
|
steps:
|
|
- checkout: self
|
|
clean: true
|
|
fetchDepth: 1
|
|
persistCredentials: true
|
|
- script: |
|
|
git fetch origin main:main
|
|
if git merge-base --is-ancestor $(Build.SourceVersion) main; then
|
|
echo "This commit is in the main branch."
|
|
else
|
|
echo "This commit is not in the main branch."
|
|
exit 1
|
|
fi
|
|
displayName: 'タグが付けられたCommitがmainブランチに存在するか確認'
|
|
- job: backend_build
|
|
dependsOn: initialize
|
|
condition: succeeded('initialize')
|
|
displayName: Build And Push Backend Image
|
|
pool:
|
|
name: odms-deploy-pipeline
|
|
steps:
|
|
- checkout: self
|
|
clean: true
|
|
fetchDepth: 1
|
|
- task: Npm@1
|
|
displayName: npm ci
|
|
inputs:
|
|
command: ci
|
|
workingDir: dictation_server
|
|
verbose: false
|
|
- task: AzureKeyVault@2
|
|
displayName: 'Azure Key Vault: kv-odms-secret-stg'
|
|
inputs:
|
|
ConnectedServiceName: 'omds-service-connection-stg'
|
|
KeyVaultName: kv-odms-secret-stg
|
|
SecretsFilter: '*'
|
|
- task: Bash@3
|
|
displayName: Bash Script (Test)
|
|
inputs:
|
|
targetType: inline
|
|
script: |
|
|
cd dictation_server
|
|
npm run test
|
|
env:
|
|
JWT_PUBLIC_KEY: $(token-public-key)
|
|
JWT_PRIVATE_KEY: $(token-private-key)
|
|
SENDGRID_API_KEY: $(sendgrid-api-key)
|
|
NOTIFICATION_HUB_NAME: $(notification-hub-name)
|
|
NOTIFICATION_HUB_CONNECT_STRING: $(notification-hub-connect-string)
|
|
STORAGE_ACCOUNT_NAME_US: $(storage-account-name-us)
|
|
STORAGE_ACCOUNT_NAME_AU: $(storage-account-name-au)
|
|
STORAGE_ACCOUNT_NAME_EU: $(storage-account-name-eu)
|
|
STORAGE_ACCOUNT_KEY_US: $(storage-account-key-us)
|
|
STORAGE_ACCOUNT_KEY_AU: $(storage-account-key-au)
|
|
STORAGE_ACCOUNT_KEY_EU: $(storage-account-key-eu)
|
|
STORAGE_ACCOUNT_ENDPOINT_US: $(storage-account-endpoint-us)
|
|
STORAGE_ACCOUNT_ENDPOINT_AU: $(storage-account-endpoint-au)
|
|
STORAGE_ACCOUNT_ENDPOINT_EU: $(storage-account-endpoint-eu)
|
|
ADB2C_TENANT_ID: $(adb2c-tenant-id)
|
|
ADB2C_CLIENT_ID: $(adb2c-client-id)
|
|
ADB2C_CLIENT_SECRET: $(adb2c-client-secret)
|
|
MAIL_FROM: xxxxxx
|
|
APP_DOMAIN: xxxxxxxxx
|
|
EMAIL_CONFIRM_LIFETIME: 0
|
|
TENANT_NAME: xxxxxxxxxxxx
|
|
SIGNIN_FLOW_NAME: xxxxxxxxxxxx
|
|
STORAGE_TOKEN_EXPIRE_TIME: 0
|
|
REFRESH_TOKEN_LIFETIME_WEB: 0
|
|
REFRESH_TOKEN_LIFETIME_DEFAULT: 0
|
|
ACCESS_TOKEN_LIFETIME_WEB: 0
|
|
REDIS_HOST: xxxxxxxxxxxx
|
|
REDIS_PORT: 0
|
|
REDIS_PASSWORD: xxxxxxxxxxxx
|
|
ADB2C_CACHE_TTL: 0
|
|
- task: Docker@0
|
|
displayName: build
|
|
inputs:
|
|
azureSubscriptionEndpoint: 'omds-service-connection-stg'
|
|
azureContainerRegistry: '{"loginServer":"crodmsregistrymaintenance.azurecr.io", "id" : "/subscriptions/108fb131-cdca-4729-a2be-e5bd8c0b3ba7/resourceGroups/maintenance-rg/providers/Microsoft.ContainerRegistry/registries/crOdmsRegistryMaintenance"}'
|
|
dockerFile: DockerfileServerDictation.dockerfile
|
|
imageName: odmscloud/staging/dictation:$(Build.SourceVersion)
|
|
buildArguments: |
|
|
BUILD_VERSION=$(Build.SourceVersion)
|
|
- task: Docker@0
|
|
displayName: push
|
|
inputs:
|
|
azureSubscriptionEndpoint: 'omds-service-connection-stg'
|
|
azureContainerRegistry: '{"loginServer":"crodmsregistrymaintenance.azurecr.io", "id" : "/subscriptions/108fb131-cdca-4729-a2be-e5bd8c0b3ba7/resourceGroups/maintenance-rg/providers/Microsoft.ContainerRegistry/registries/crOdmsRegistryMaintenance"}'
|
|
action: Push an image
|
|
imageName: odmscloud/staging/dictation:$(Build.SourceVersion)
|
|
- job: frontend_build_staging
|
|
dependsOn: backend_build
|
|
condition: succeeded('backend_build')
|
|
displayName: Build Frontend Files(staging)
|
|
variables:
|
|
storageAccountName: saomdspipeline
|
|
environment: staging
|
|
pool:
|
|
name: odms-deploy-pipeline
|
|
steps:
|
|
- checkout: self
|
|
clean: true
|
|
fetchDepth: 1
|
|
- task: Npm@1
|
|
displayName: npm ci
|
|
inputs:
|
|
command: ci
|
|
workingDir: dictation_client
|
|
verbose: false
|
|
- task: Bash@3
|
|
displayName: Bash Script
|
|
inputs:
|
|
targetType: inline
|
|
script: cd dictation_client && npm run build:stg
|
|
- task: ArchiveFiles@2
|
|
inputs:
|
|
rootFolderOrFile: dictation_client/build
|
|
includeRootFolder: false
|
|
archiveType: 'zip'
|
|
archiveFile: '$(Build.ArtifactStagingDirectory)/$(Build.SourceVersion).zip'
|
|
replaceExistingArchive: true
|
|
- task: AzureCLI@2
|
|
inputs:
|
|
azureSubscription: 'omds-service-connection-stg'
|
|
scriptType: 'bash'
|
|
scriptLocation: 'inlineScript'
|
|
inlineScript: |
|
|
az storage blob upload \
|
|
--auth-mode login \
|
|
--account-name $(storageAccountName) \
|
|
--container-name $(environment) \
|
|
--name $(Build.SourceVersion).zip \
|
|
--type block \
|
|
--overwrite \
|
|
--file $(Build.ArtifactStagingDirectory)/$(Build.SourceVersion).zip
|
|
- job: frontend_build_production
|
|
dependsOn: frontend_build_staging
|
|
condition: succeeded('frontend_build_staging')
|
|
displayName: Build Frontend Files(production)
|
|
variables:
|
|
storageAccountName: saomdspipeline
|
|
environment: production
|
|
pool:
|
|
name: odms-deploy-pipeline
|
|
steps:
|
|
- checkout: self
|
|
clean: true
|
|
fetchDepth: 1
|
|
- task: Npm@1
|
|
displayName: npm ci
|
|
inputs:
|
|
command: ci
|
|
workingDir: dictation_client
|
|
verbose: false
|
|
- task: Bash@3
|
|
displayName: Bash Script
|
|
inputs:
|
|
targetType: inline
|
|
script: cd dictation_client && npm run build:prod
|
|
- task: ArchiveFiles@2
|
|
inputs:
|
|
rootFolderOrFile: dictation_client/build
|
|
includeRootFolder: false
|
|
archiveType: 'zip'
|
|
archiveFile: '$(Build.ArtifactStagingDirectory)/$(Build.SourceVersion).zip'
|
|
replaceExistingArchive: true
|
|
- task: AzureCLI@2
|
|
inputs:
|
|
azureSubscription: 'omds-service-connection-stg'
|
|
scriptType: 'bash'
|
|
scriptLocation: 'inlineScript'
|
|
inlineScript: |
|
|
az storage blob upload \
|
|
--auth-mode login \
|
|
--account-name $(storageAccountName) \
|
|
--container-name $(environment) \
|
|
--name $(Build.SourceVersion).zip \
|
|
--type block \
|
|
--overwrite \
|
|
--file $(Build.ArtifactStagingDirectory)/$(Build.SourceVersion).zip
|
|
- job: backend_deploy
|
|
dependsOn: frontend_build_production
|
|
condition: succeeded('frontend_build_production')
|
|
displayName: Backend Deploy
|
|
pool:
|
|
name: odms-deploy-pipeline
|
|
steps:
|
|
- checkout: self
|
|
clean: true
|
|
fetchDepth: 1
|
|
# TODO: Productionと同様にデプロイを行う
|
|
- job: frontend_deploy
|
|
dependsOn: backend_deploy
|
|
condition: succeeded('backend_deploy')
|
|
displayName: Deploy Frontend Files
|
|
variables:
|
|
storageAccountName: saomdspipeline
|
|
containerName: staging
|
|
pool:
|
|
name: odms-deploy-pipeline
|
|
steps:
|
|
- checkout: self
|
|
clean: true
|
|
fetchDepth: 1
|
|
# TODO: Productionと同様にデプロイを行う
|
|
- job: migration
|
|
dependsOn: frontend_deploy
|
|
condition: succeeded('frontend_deploy')
|
|
displayName: DB migration
|
|
pool:
|
|
name: odms-deploy-pipeline
|
|
steps:
|
|
- checkout: self
|
|
clean: true
|
|
fetchDepth: 1
|
|
# TODO: Productionと同様にマイグレーションを行う |