Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/samples/azure-ad-b2c…
Browse files Browse the repository at this point in the history
…-sample/auth-frontend/vitest-2.1.8
  • Loading branch information
KentaHizume authored Jan 9, 2025
2 parents 8d8160f + c3947b1 commit 77ada9b
Show file tree
Hide file tree
Showing 483 changed files with 20,399 additions and 3,866 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Issue や Discussions に対して追加の説明や質問がある場合は、

これらでは解決できない場合、 Discussions の [Q&A](https://github.com/AlesInfiny/maia/discussions/categories/05-q-a) より質問をお寄せください。
質問を投稿する場合、直面していることについてできる限り多くの情報を提供してください。
可能な限りスピーディーに対応いたします
可能な限り迅速に対応いたします
ただし、質問に対する回答が常に得られることを期待しないでください。

## 本プロジェクトに対するコントリビュート
Expand Down
76 changes: 2 additions & 74 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,67 +51,7 @@ updates:
interval: "daily"
open-pull-requests-limit: 20
commit-message:
prefix: "gradle-root"
labels:
- "target: Dressca"
- "gradle"
- "dependencies"

- package-ecosystem: "gradle"
directory: "/samples/web-csr/dressca-backend/application-core"
schedule:
interval: "daily"
open-pull-requests-limit: 20
commit-message:
prefix: "gradle-application-core"
labels:
- "target: Dressca"
- "gradle"
- "dependencies"

- package-ecosystem: "gradle"
directory: "/samples/web-csr/dressca-backend/batch"
schedule:
interval: "daily"
open-pull-requests-limit: 20
commit-message:
prefix: "gradle-batch"
labels:
- "target: Dressca"
- "gradle"
- "dependencies"

- package-ecosystem: "gradle"
directory: "/samples/web-csr/dressca-backend/infrastructure"
schedule:
interval: "daily"
open-pull-requests-limit: 20
commit-message:
prefix: "gradle-infrastructure"
labels:
- "target: Dressca"
- "gradle"
- "dependencies"

- package-ecosystem: "gradle"
directory: "/samples/web-csr/dressca-backend/system-common"
schedule:
interval: "daily"
open-pull-requests-limit: 20
commit-message:
prefix: "gradle-system-common"
labels:
- "target: Dressca"
- "gradle"
- "dependencies"

- package-ecosystem: "gradle"
directory: "/samples/web-csr/dressca-backend/web"
schedule:
interval: "daily"
open-pull-requests-limit: 20
commit-message:
prefix: "gradle-web"
prefix: "gradle-dressca-backend"
labels:
- "target: Dressca"
- "gradle"
Expand All @@ -136,19 +76,7 @@ updates:
interval: "daily"
open-pull-requests-limit: 20
commit-message:
prefix: "gradle-auth-root"
labels:
- "target: Azure AD B2C Auth"
- "gradle"
- "dependencies"

- package-ecosystem: "gradle"
directory: "/samples/azure-ad-b2c-sample/auth-backend/web"
schedule:
interval: "daily"
open-pull-requests-limit: 20
commit-message:
prefix: "gradle-auth-web"
prefix: "gradle-auth-backend"
labels:
- "target: Azure AD B2C Auth"
- "gradle"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/back-sample-pull-request-ut.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ jobs:
echo ':x: ビルドまたはテストに失敗しました。' >> $GITHUB_STEP_SUMMARY
- name: JUnitレポート
uses: mikepenz/action-junit-report@v4
uses: mikepenz/action-junit-report@62516aa379bff6370c95fd5894d5a27fb6619d9b # v5.2.0
with:
report_paths: '**/build/test-results/test/TEST-*.xml'

- name: Report
uses: dorny/test-reporter@v1
uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5 # v1.9.1
if: always()
with:
name: Maven Tests
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-and-release-documents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
name: documents

- name: Githubのリリース
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
with:
files: ${{ env.DOCUMENT_ARTIFACTS_FILENAME }}
generate_release_notes: true
Expand All @@ -99,21 +99,21 @@ jobs:
name: documents

- name: Azure に OIDC Login
uses: azure/login@v2
uses: azure/login@a65d910e8af852a8061c627c456678983e180302 # v2.2.0
with:
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

- name: ステージング環境へのデプロイ
uses: azure/webapps-deploy@v3
uses: azure/webapps-deploy@de617f46172a906d0617bb0e50d81e9e3aec24c8 # v3.0.1
with:
app-name: ${{ env.APP_ALESINFINY_MAIA_WEBAPP_NAME }}
slot-name: staging
package: "${{ env.DOCUMENT_ARTIFACTS_FILENAME }}"

- name: Teams への通知
uses: fjogeleit/http-request-action@v1
uses: fjogeleit/http-request-action@23ad54bcd1178fcff6a0d17538fa09de3a7f0a4d # v1.16.4
with:
url: ${{ secrets.ALESINFINY_POST_MESSAGE_TO_TEAMS_URL }}
method: POST
Expand All @@ -128,7 +128,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 本番環境への反映承認
uses: fjogeleit/http-request-action@v1
uses: fjogeleit/http-request-action@23ad54bcd1178fcff6a0d17538fa09de3a7f0a4d # v1.16.4
with:
url: ${{ secrets.ALESINFINY_APPROVE_REQUEST_TO_TEAMS_URL }}
method: POST
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/build-documents-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
---
# cspell:ignore endgroup fjogeleit markdownlint softprops textlintignore textlintrc webapps
# cspell:ignore endgroup fjogeleit markdownlint softprops textlintignore textlintrc webapps yamlignore
name: ドキュメントのビルド (CI用)

permissions:
contents: read

on:
pull_request:
branches: [main]
Expand All @@ -20,6 +23,7 @@ on:
- ".textlintignore"
- ".textlintrc"
- ".yaml-lint.yml"
- ".yamlignore"
- "package-lock.json"
- "package.json"
- "requirements.txt"
Expand Down
131 changes: 112 additions & 19 deletions .github/workflows/check-openapi-generator-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- name: GitHub API経由でリポジトリの情報を取得
id: get-repo-info-via-github-api
uses: fjogeleit/http-request-action@v1
uses: fjogeleit/http-request-action@23ad54bcd1178fcff6a0d17538fa09de3a7f0a4d # v1.16.4
with:
url: 'https://api.github.com/repos/OpenAPITools/openapi-generator/releases/latest'
method: 'GET'
Expand All @@ -38,30 +38,49 @@ jobs:
- name: 現在のOpenAPI Generatorのバージョン取得
id: get-current-openapi-generator-version
run: |
echo "current-version=$(jq -r '.["generator-cli"].version' ./samples/web-csr/dressca-frontend/consumer/openapitools.json)" >> $GITHUB_OUTPUT
echo "current-version-consumer=$(jq -r '.["generator-cli"].version' ./samples/web-csr/dressca-frontend/consumer/openapitools.json)" >> $GITHUB_OUTPUT
echo "current-version-admin=$(jq -r '.["generator-cli"].version' ./samples/web-csr/dressca-frontend/admin/openapitools.json)" >> $GITHUB_OUTPUT
echo "current-version-azure-ad-b2c=$(jq -r '.["generator-cli"].version' ./samples/azure-ad-b2c-sample/auth-frontend/app/openapitools.json)" >> $GITHUB_OUTPUT
- name: アップデート要否を判定
id: check-version-update
run: |
if [[ ${{ steps.get-latest-openapi-generator-version.outputs.latest-version }} == ${{ steps.get-current-openapi-generator-version.outputs.current-version }} ]]; then
echo "update-required=false" >> $GITHUB_OUTPUT
if [[ ${{ steps.get-latest-openapi-generator-version.outputs.latest-version }} == ${{ steps.get-current-openapi-generator-version.outputs.current-version-consumer }} ]]; then
echo "update-required-consumer=false" >> $GITHUB_OUTPUT
else
echo "update-required=true" >> $GITHUB_OUTPUT
echo "update-required-consumer=true" >> $GITHUB_OUTPUT
fi
if [[ ${{ steps.get-latest-openapi-generator-version.outputs.latest-version }} == ${{ steps.get-current-openapi-generator-version.outputs.current-version-admin }} ]]; then
echo "update-required-admin=false" >> $GITHUB_OUTPUT
else
echo "update-required-admin=true" >> $GITHUB_OUTPUT
fi
if [[ ${{ steps.get-latest-openapi-generator-version.outputs.latest-version }} == ${{ steps.get-current-openapi-generator-version.outputs.current-version-azure-ad-b2c }} ]]; then
echo "update-required-azure-ad-b2c=false" >> $GITHUB_OUTPUT
else
echo "update-required-azure-ad-b2c=true" >> $GITHUB_OUTPUT
fi
- name: サマリに出力
run: |
echo "# 確認結果" >> $GITHUB_STEP_SUMMARY
echo "openapi-generator のバージョンは ${{ steps.get-latest-openapi-generator-version.outputs.latest-version }} です。" >> $GITHUB_STEP_SUMMARY
echo "openapitools.json の openapi-generator のバージョンは ${{ steps.get-current-openapi-generator-version.outputs.current-version }} です。" >> $GITHUB_STEP_SUMMARY
echo "アップデート要否の判定結果は ${{ steps.check-version-update.outputs.update-required }} です。">> $GITHUB_STEP_SUMMARY
echo "## Dressca-Consumer" >> $GITHUB_STEP_SUMMARY
echo "openapitools.json の openapi-generator のバージョンは ${{ steps.get-current-openapi-generator-version.outputs.current-version-consumer }} です。" >> $GITHUB_STEP_SUMMARY
echo "アップデート要否の判定結果は ${{ steps.check-version-update.outputs.update-required-consumer }} です。">> $GITHUB_STEP_SUMMARY
echo "## Dressca-Admin" >> $GITHUB_STEP_SUMMARY
echo "openapitools.json の openapi-generator のバージョンは ${{ steps.get-current-openapi-generator-version.outputs.current-version-admin }} です。" >> $GITHUB_STEP_SUMMARY
echo "アップデート要否の判定結果は ${{ steps.check-version-update.outputs.update-required-admin }} です。">> $GITHUB_STEP_SUMMARY
echo "## "AzureADB2CAuth"" >> $GITHUB_STEP_SUMMARY
echo "openapitools.json の openapi-generator のバージョンは ${{ steps.get-current-openapi-generator-version.outputs.current-version-azure-ad-b2c }} です。" >> $GITHUB_STEP_SUMMARY
echo "アップデート要否の判定結果は ${{ steps.check-version-update.outputs.update-required-azure-ad-b2c }} です。">> $GITHUB_STEP_SUMMARY
- name: issue を作成
id: create-issue
if: ${{ steps.check-version-update.outputs.update-required == 'true' }}
uses: Wandalen/wretry.action@master
- name: issue を作成(Dressca-Consumer)
id: create-issue-consumer
if: ${{ steps.check-version-update.outputs.update-required-consumer == 'true' }}
uses: Wandalen/wretry.action@ffdd254f4eaf1562b8a2c66aeaa37f1ff2231179 # v3.7.3
with:
action: dblock/create-a-github-issue@v3
action: dblock/create-a-github-issue@c5e54b8762a0c4c2cd9330750e30b81bcc369c38 # v3.2.0
with: |
filename: ./.github/ISSUE_TEMPLATE/99-openapi-generator-update-issue.md
update_existing: true
Expand All @@ -72,17 +91,17 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TARGET_APP_NAME: "Dressca-Consumer"
LATEST_VERSION: ${{ steps.get-latest-openapi-generator-version.outputs.latest-version }}
CURRENT_VERSION: ${{ steps.get-current-openapi-generator-version.outputs.current-version }}
CURRENT_VERSION: ${{ steps.get-current-openapi-generator-version.outputs.current-version-consumer }}


- name: issue の情報を出力
if: ${{ steps.check-version-update.outputs.update-required == 'true' }}
- name: issue の情報を出力(Dressca-Consumer)
if: ${{ steps.check-version-update.outputs.update-required-consumer == 'true' }}
env:
STATUS: ${{ steps.create-issue.outputs.outputs && fromJson(steps.create-issue.outputs.outputs).status }}
ISSUE_NUMBER: ${{ steps.create-issue.outputs.outputs && fromJson(steps.create-issue.outputs.outputs).number }}
ISSUE_URL: ${{ steps.create-issue.outputs.outputs && fromJson(steps.create-issue.outputs.outputs).url }}
STATUS: ${{ steps.create-issue-consumer.outputs.outputs && fromJson(steps.create-issue-consumer.outputs.outputs).status }}
ISSUE_NUMBER: ${{ steps.create-issue-consumer.outputs.outputs && fromJson(steps.create-issue-consumer.outputs.outputs).number }}
ISSUE_URL: ${{ steps.create-issue-consumer.outputs.outputs && fromJson(steps.create-issue-consumer.outputs.outputs).url }}
run: |
echo "# issue の作成結果" >> $GITHUB_STEP_SUMMARY
echo "# issue の作成結果(Dressca-Consumer)" >> $GITHUB_STEP_SUMMARY
if [ $STATUS = 'created' ]; then
echo "issue を新規作成しました。" >> $GITHUB_STEP_SUMMARY
elif [ $STATUS = 'updated' ]; then
Expand All @@ -93,3 +112,77 @@ jobs:
echo issue number: $ISSUE_NUMBER >> $GITHUB_STEP_SUMMARY
echo status: $STATUS >> $GITHUB_STEP_SUMMARY
echo - $ISSUE_URL >> $GITHUB_STEP_SUMMARY
- name: issue を作成(Dressca-Admin)
id: create-issue-admin
if: ${{ steps.check-version-update.outputs.update-required-admin == 'true' }}
uses: Wandalen/wretry.action@ffdd254f4eaf1562b8a2c66aeaa37f1ff2231179 # v3.7.3
with:
action: dblock/create-a-github-issue@c5e54b8762a0c4c2cd9330750e30b81bcc369c38 # v3.2.0
with: |
filename: ./.github/ISSUE_TEMPLATE/99-openapi-generator-update-issue.md
update_existing: true
search_existing: open
attempt_limit: 3
attempt_delay: 300000
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TARGET_APP_NAME: "Dressca-Admin"
LATEST_VERSION: ${{ steps.get-latest-openapi-generator-version.outputs.latest-version }}
CURRENT_VERSION: ${{ steps.get-current-openapi-generator-version.outputs.current-version-admin }}

- name: issue の情報を出力(Dressca-Admin)
if: ${{ steps.check-version-update.outputs.update-required-admin == 'true' }}
env:
STATUS: ${{ steps.create-issue-admin.outputs.outputs && fromJson(steps.create-issue-admin.outputs.outputs).status }}
ISSUE_NUMBER: ${{ steps.create-issue-admin.outputs.outputs && fromJson(steps.create-issue-admin.outputs.outputs).number }}
ISSUE_URL: ${{ steps.create-issue-admin.outputs.outputs && fromJson(steps.create-issue-admin.outputs.outputs).url }}
run: |
echo "# issue の作成結果(Dressca-Admin)" >> $GITHUB_STEP_SUMMARY
if [ $STATUS = 'created' ]; then
echo "issue を新規作成しました。" >> $GITHUB_STEP_SUMMARY
elif [ $STATUS = 'updated' ]; then
echo "同名の issue が存在するため、更新のみ行いました。" >> $GITHUB_STEP_SUMMARY
else
echo "ステータスの値が不正です。" >> $GITHUB_STEP_SUMMARY
fi
echo issue number: $ISSUE_NUMBER >> $GITHUB_STEP_SUMMARY
echo status: $STATUS >> $GITHUB_STEP_SUMMARY
echo - $ISSUE_URL >> $GITHUB_STEP_SUMMARY
- name: issue を作成(AzureADB2CAuth)
id: create-issue-azure-ad-b2c-auth
if: ${{ steps.check-version-update.outputs.update-required-admin == 'true' }}
uses: Wandalen/wretry.action@ffdd254f4eaf1562b8a2c66aeaa37f1ff2231179 # v3.7.3
with:
action: dblock/create-a-github-issue@c5e54b8762a0c4c2cd9330750e30b81bcc369c38 # v3.2.0
with: |
filename: ./.github/ISSUE_TEMPLATE/99-openapi-generator-update-issue.md
update_existing: true
search_existing: open
attempt_limit: 3
attempt_delay: 300000
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TARGET_APP_NAME: "AzureADB2CAuth"
LATEST_VERSION: ${{ steps.get-latest-openapi-generator-version.outputs.latest-version }}
CURRENT_VERSION: ${{ steps.get-current-openapi-generator-version.outputs.current-version-azure-ad-b2c }}

- name: issue の情報を出力(AzureADB2CAuth)
if: ${{ steps.check-version-update.outputs.update-required-azure-ad-b2c == 'true' }}
env:
STATUS: ${{ steps.create-issue-azure-ad-b2c-auth.outputs.outputs && fromJson(steps.create-issue-azure-ad-b2c-auth.outputs.outputs).status }}
ISSUE_NUMBER: ${{ steps.create-issue-azure-ad-b2c-auth.outputs.outputs && fromJson(steps.create-issue-azure-ad-b2c-auth.outputs.outputs).number }}
ISSUE_URL: ${{ steps.create-issue-azure-ad-b2c-auth.outputs.outputs && fromJson(steps.create-issue-azure-ad-b2c-auth.outputs.outputs).url }}
run: |
echo "# issue の作成結果(AzureADB2CAuth)" >> $GITHUB_STEP_SUMMARY
if [ $STATUS = 'created' ]; then
echo "issue を新規作成しました。" >> $GITHUB_STEP_SUMMARY
elif [ $STATUS = 'updated' ]; then
echo "同名の issue が存在するため、更新のみ行いました。" >> $GITHUB_STEP_SUMMARY
else
echo "ステータスの値が不正です。" >> $GITHUB_STEP_SUMMARY
fi
echo issue number: $ISSUE_NUMBER >> $GITHUB_STEP_SUMMARY
echo status: $STATUS >> $GITHUB_STEP_SUMMARY
echo - $ISSUE_URL >> $GITHUB_STEP_SUMMARY
6 changes: 5 additions & 1 deletion .github/workflows/remove-old-artifacts.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
---
name: 古いアーティファクトの削除

permissions:
actions: write
contents: read

on:
workflow_dispatch:
inputs:
Expand All @@ -22,7 +26,7 @@ jobs:

steps:
- name: 古いアーティファクトの削除
uses: c-hive/gha-remove-artifacts@v1
uses: c-hive/gha-remove-artifacts@44fc7acaf1b3d0987da0e8d4707a989d80e9554b # v1.4.0
with:
age: '{{ github.event.inputs.target }} days'
skip-tags: true
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/samples-azure-ad-b2c-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
build-frontend:
name: 'フロントエンドアプリケーションのビルド'
runs-on: ubuntu-latest
permissions:
contents: read
env:
NO_COLOR: "1" # 文字化け防止のためカラーコードを出力しない
strategy:
Expand Down Expand Up @@ -138,12 +140,12 @@ jobs:
echo ':x: コンパイルまたは静的テストに失敗しました。' >> $GITHUB_STEP_SUMMARY
- name: JUnitレポート
uses: mikepenz/action-junit-report@v4
uses: mikepenz/action-junit-report@62516aa379bff6370c95fd5894d5a27fb6619d9b # v5.2.0
with:
report_paths: '**/build/test-results/test/TEST-*.xml'

- name: Report
uses: dorny/test-reporter@v1
uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5 # v1.9.1
if: always()
with:
name: Maven Tests
Expand Down
Loading

0 comments on commit 77ada9b

Please sign in to comment.