Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/docker/dev-tools/develop/amazo…
Browse files Browse the repository at this point in the history
…n/aws-cli-2.23.5
  • Loading branch information
brostk authored Jan 24, 2025
2 parents 9e5cee0 + 649a278 commit 0928439
Show file tree
Hide file tree
Showing 18 changed files with 157 additions and 124 deletions.
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* @department-of-veterans-affairs/benefits-vro-engineers

# Employee Experience Team
/domain-ee/ @department-of-veterans-affairs/benefits-employee-exp-engineers
/shared/lib-hoppy/ @department-of-veterans-affairs/benefits-employee-exp-engineers
# /domain-ee/ @department-of-veterans-affairs/benefits-employee-exp-engineers
# /shared/lib-hoppy/ @department-of-veterans-affairs/benefits-employee-exp-engineers

# Contention Classification Team
/domain-cc/ @department-of-veterans-affairs/benefits-contention-classification-engineers
# /domain-cc/ @department-of-veterans-affairs/benefits-contention-classification-engineers
15 changes: 9 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,15 @@ updates:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "docker"
directory: "/svc-bgs-api"
target-branch: "develop"
schedule:
interval: "daily"
open-pull-requests-limit: 10
# NOTE: svc-bgs-api workflows are tied to inactive services and commented out to prevent unnecessary execution and updates.
# Documentation:
# - Disabling issue: https://github.com/department-of-veterans-affairs/abd-vro/issues/3893
# - package-ecosystem: "docker"
# directory: "/svc-bgs-api"
# target-branch: "develop"
# schedule:
# interval: "daily"
# open-pull-requests-limit: 10

# NOTE: svc-bie-kafka workflows are tied to inactive services and commented out to prevent unnecessary execution and updates.
# Documentation:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ jobs:
uses: ./.github/workflows/container-healthchecks.yml
secrets: inherit

# NOTE: svc-bgs-api workflows are tied to inactive services and commented out to prevent unnecessary execution and updates.
# Documentation:
# - Disabling issue: https://github.com/department-of-veterans-affairs/abd-vro/issues/3893
svc-bgs-api:
if: github.repository == 'department-of-veterans-affairs/abd-vro'
needs: nondraft-pr
Expand All @@ -67,6 +70,9 @@ jobs:
# uses: ./.github/workflows/bie-kafka-end2end-test.yml
# secrets: inherit

# NOTE: EP Merge workflows are tied to inactive services and commented out to prevent unnecessary execution and updates.
# Documentation:
# - Disabling issue: https://github.com/department-of-veterans-affairs/abd-vro/issues/3800
ee-ep-merge-end-to-end:
if: github.repository == 'department-of-veterans-affairs/abd-vro'
needs: nondraft-pr
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delete-published-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- abd-vro-internal
package:
- vro-db-init
- vro-svc-bgs-api
# - vro-svc-bgs-api # See: https://github.com/department-of-veterans-affairs/abd-vro/issues/3893
# - vro-svc-bie-kafka # See: https://github.com/department-of-veterans-affairs/abd-vro/issues/3802
- vro-cc-app
- vro-ee-max-cfi-app
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ee-ep-merge-end-to-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ env:

jobs:
integration-test:
if: false
runs-on: ubuntu-latest
steps:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/notify-push-to-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: "Notify Slack"
id: notify-slack
uses: archive/github-actions-slack@v2.9.0
uses: archive/github-actions-slack@v2.10.1
with:
slack-bot-user-oauth-access-token: ${{ secrets.SLACK_BOT_USER_OAUTH_ACCESS_TOKEN }}
slack-channel: ${{ env.SLACK_CHANNEL }}
Expand All @@ -43,7 +43,7 @@ jobs:
- name: "Slack thread: Post git commit message"
if: steps.get-pr-title.outputs.multiline == 'true'
# Post in thread to reduce clutter in Slack
uses: archive/github-actions-slack@v2.9.0
uses: archive/github-actions-slack@v2.10.1
with:
slack-bot-user-oauth-access-token: ${{ secrets.SLACK_BOT_USER_OAUTH_ACCESS_TOKEN }}
slack-channel: ${{ env.SLACK_CHANNEL }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-3rd-party-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
steps:
- name: "Notify Slack"
id: notify-slack
uses: archive/github-actions-slack@v2.9.0
uses: archive/github-actions-slack@v2.10.1
with:
slack-bot-user-oauth-access-token: ${{ secrets.SLACK_BOT_USER_OAUTH_ACCESS_TOKEN }}
slack-channel: ${{ env.SLACK_CHANNEL }}
Expand All @@ -85,7 +85,7 @@ jobs:

- name: "Slack thread: Post follow-on TODO actions"
# Post in thread to reduce clutter in Slack
uses: archive/github-actions-slack@v2.9.0
uses: archive/github-actions-slack@v2.10.1
with:
slack-bot-user-oauth-access-token: ${{ secrets.SLACK_BOT_USER_OAUTH_ACCESS_TOKEN }}
slack-channel: ${{ env.SLACK_CHANNEL }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/secrel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ on:
options:
- all
- cc-app
- svc-bgs-api
# - svc-bgs-api # See: https://github.com/department-of-veterans-affairs/abd-vro/issues/3893
# - svc-bie-kafka # See: https://github.com/department-of-veterans-affairs/abd-vro/issues/3802
- svc-bip-api
# - svc-bip-api # See: https://github.com/department-of-veterans-affairs/abd-vro/issues/3892
- ee-max-cfi-app
- ee-ep-merge-app
- dev-tools
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:

- name: "Slack: workflow triggered"
id: notify-slack
uses: archive/github-actions-slack@v2.9.0
uses: archive/github-actions-slack@v2.10.1
with:
slack-bot-user-oauth-access-token: ${{ secrets.SLACK_BOT_USER_OAUTH_ACCESS_TOKEN }}
slack-channel: ${{ env.SLACK_CHANNEL }}
Expand All @@ -163,7 +163,7 @@ jobs:
run_tests: ${{ steps.image-props.outputs.run_tests }}

- name: "Slack thread: Images published"
uses: archive/github-actions-slack@v2.9.0
uses: archive/github-actions-slack@v2.10.1
with:
slack-bot-user-oauth-access-token: ${{ secrets.SLACK_BOT_USER_OAUTH_ACCESS_TOKEN }}
slack-channel: ${{ env.SLACK_CHANNEL }}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/svc-bgs-api-integration-test.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# NOTE: svc-bgs-api workflows are tied to inactive services and commented out to prevent unnecessary execution and updates.
# Documentation:
# - Disabling issue: https://github.com/department-of-veterans-affairs/abd-vro/issues/3893
name: 'CI: SVC BGS API integration test'

on:
Expand All @@ -12,6 +15,7 @@ env:

jobs:
integration-test:
if: false
runs-on: ubuntu-latest
steps:
- name: 'Setup Ruby'
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/svc-bip-api-integration-test.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# NOTE: svc-bip-api workflows are tied to inactive services and commented out to prevent unnecessary execution and updates.
# Documentation:
# - Disabling issue: https://github.com/department-of-veterans-affairs/abd-vro/issues/3892
name: 'CI: SVC BIP API integration test'

on:
Expand All @@ -13,6 +16,7 @@ env:

jobs:
integration-test:
if: false
runs-on: ubuntu-latest
steps:
- name: 'Checkout source code'
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
- name: "Run tests and checks"
# `check` runs all checks, including spectralLint, hadolint, and shellcheck
# NOTE: ./gradlew :svc-bie-kafka:check & ./gradlew :shared:lib-bie-kafka:check are disabled. See: https://github.com/department-of-veterans-affairs/abd-vro/issues/3802
# NOTE: ./gradlew :svc-bip-api:check are disabled. See: https://github.com/department-of-veterans-affairs/abd-vro/issues/3982
run: |
echo "::group::Gradle check including test"
./gradlew :svc-bip-api:check
./gradlew :domain-xample:xample-shared:check
./gradlew :domain-xample:xample-api-controller:check
./gradlew :domain-xample:svc-xample-j:check
Expand Down Expand Up @@ -90,7 +90,9 @@ jobs:
update-comment: true
title: "JaCoCo Test Coverage"

# NOTE: svc-bgs-api workflows are disabled. See : https://github.com/department-of-veterans-affairs/abd-vro/issues/3893
test-ruby:
if: false
runs-on: ubuntu-latest

steps:
Expand Down
70 changes: 38 additions & 32 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,38 +125,44 @@ services:
FLYWAY_PLACEHOLDERS_ALEMBIC_SCHEMA: domain_cc
FLYWAY_PLACEHOLDERS_ALEMBIC_PASSWORD: ${POSTGRES_DOMAIN_CC_PW}

svc-bip-api:
profiles: ["all", "svc", "bip"]
image: va/abd_vro-svc-bip-api:latest
environment:
<<: [ *rabbitmq-placeholder-vars, *datadog-placeholder-vars ]
BIP_CLAIM_USERID: ${BIP_CLAIM_USERID}
BIP_CLAIM_SECRET: ${BIP_CLAIM_SECRET}
BIP_EVIDENCE_USERID: ${BIP_EVIDENCE_USERID}
BIP_EVIDENCE_SECRET: ${BIP_EVIDENCE_SECRET}
BIP_TRUSTSTORE: ${BIP_TRUSTSTORE}
BIP_PASSWORD: ${BIP_PASSWORD}
BIP_KEYSTORE: ${BIP_KEYSTORE}
BIP_CLAIM_URL: ${BIP_CLAIM_URL}
BIP_EVIDENCE_URL: ${BIP_EVIDENCE_URL}
ports:
- "10401:10401"
networks:
- intranet
depends_on:
<<: [ *svc-depends-on ]

svc-bgs-api:
profiles: ["all","svc","bgs"]
image: va/abd_vro-svc-bgs-api:latest
<<: [*common-sde-security, *common-security-opt]
environment:
<<: [*rabbitmq-placeholder-vars, *common-vars]
DOCKER_LOGS: "1"
networks:
- intranet
depends_on:
<<: [ *svc-depends-on ]
# NOTE: svc-bip-api workflows are tied to inactive services and commented out to prevent unnecessary execution and updates.
# Documentation:
# - Disabling issue: https://github.com/department-of-veterans-affairs/abd-vro/issues/3892
# svc-bip-api:
# profiles: ["all", "svc", "bip"]
# image: va/abd_vro-svc-bip-api:latest
# environment:
# <<: [ *rabbitmq-placeholder-vars, *datadog-placeholder-vars ]
# BIP_CLAIM_USERID: ${BIP_CLAIM_USERID}
# BIP_CLAIM_SECRET: ${BIP_CLAIM_SECRET}
# BIP_EVIDENCE_USERID: ${BIP_EVIDENCE_USERID}
# BIP_EVIDENCE_SECRET: ${BIP_EVIDENCE_SECRET}
# BIP_TRUSTSTORE: ${BIP_TRUSTSTORE}
# BIP_PASSWORD: ${BIP_PASSWORD}
# BIP_KEYSTORE: ${BIP_KEYSTORE}
# BIP_CLAIM_URL: ${BIP_CLAIM_URL}
# BIP_EVIDENCE_URL: ${BIP_EVIDENCE_URL}
# ports:
# - "10401:10401"
# networks:
# - intranet
# depends_on:
# <<: [ *svc-depends-on ]

# NOTE: svc-bgs-api workflows are tied to inactive services and commented out to prevent unnecessary execution and updates.
# Documentation:
# - Disabling issue: https://github.com/department-of-veterans-affairs/abd-vro/issues/3893
# svc-bgs-api:
# profiles: ["all","svc","bgs"]
# image: va/abd_vro-svc-bgs-api:latest
# <<: [*common-sde-security, *common-security-opt]
# environment:
# <<: [*rabbitmq-placeholder-vars, *common-vars]
# DOCKER_LOGS: "1"
# networks:
# - intranet
# depends_on:
# <<: [ *svc-depends-on ]

# NOTE: svc-bie-kafka workflows are tied to inactive services and commented out to prevent unnecessary execution and updates.
# Documentation:
Expand Down
23 changes: 13 additions & 10 deletions domain-ee/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,16 @@ services:
networks:
- vro_intranet

ee-ep-merge-app:
profiles: ["all","bip"]
image: va/abd_vro-ee-ep-merge-app:latest
<<: [*common-sde-security, *common-security-opt]
environment:
<<: [ *rabbitmq-placeholder-vars, *postgres-vars, *datadog-vars, *common-vars ]
ports:
- "8140:8140"
networks:
- vro_intranet
# NOTE: EP Merge workflows are tied to inactive services and commented out to prevent unnecessary execution and updates.
# Documentation:
# - Disabling issue: https://github.com/department-of-veterans-affairs/abd-vro/issues/3800
# ee-ep-merge-app:
# profiles: ["all","bip"]
# image: va/abd_vro-ee-ep-merge-app:latest
# <<: [*common-sde-security, *common-security-opt]
# environment:
# <<: [ *rabbitmq-placeholder-vars, *postgres-vars, *datadog-vars, *common-vars ]
# ports:
# - "8140:8140"
# networks:
# - vro_intranet
90 changes: 48 additions & 42 deletions mocks/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,46 +86,52 @@ services:
# networks:
# - vro_intranet

mock-bip-claims-api:
profiles: ["all","bip"]
image: va/vro_mocks-mock-bip-claims-api:latest
<<: [*common-sde-security, *common-security-opt]
ports:
- "20300:20300"
- "20306:20306"
environment:
<<: *common-vars
BIP_CLAIM_USERID: ${BIP_CLAIM_USERID}
BIP_CLAIM_SECRET: ${BIP_CLAIM_SECRET}
BIP_TRUSTSTORE: ${BIP_TRUSTSTORE}
BIP_KEYSTORE: ${BIP_KEYSTORE}
networks:
- vro_intranet

mock-bip-ce-api:
profiles: ["all"]
image: va/vro_mocks-mock-bip-ce-api:latest
<<: [*common-sde-security, *common-security-opt]
ports:
- "20310:20310"
- "20316:20316"
environment:
<<: *common-vars
BIP_EVIDENCE_USERID: ${BIP_EVIDENCE_USERID}
BIP_EVIDENCE_SECRET: ${BIP_EVIDENCE_SECRET}
# BIP_APPLICATION_ID: ${BIP_APPLICATION_ID}
BIP_TRUSTSTORE: ${BIP_TRUSTSTORE}
BIP_KEYSTORE: ${BIP_KEYSTORE}
networks:
- vro_intranet
# NOTE: svc-bip-api workflows are tied to inactive services and commented out to prevent unnecessary execution and updates.
# Documentation:
# - Disabling issue: https://github.com/department-of-veterans-affairs/abd-vro/issues/3892
# mock-bip-claims-api:
# profiles: ["all","bip"]
# image: va/vro_mocks-mock-bip-claims-api:latest
# <<: [*common-sde-security, *common-security-opt]
# ports:
# - "20300:20300"
# - "20306:20306"
# environment:
# <<: *common-vars
# BIP_CLAIM_USERID: ${BIP_CLAIM_USERID}
# BIP_CLAIM_SECRET: ${BIP_CLAIM_SECRET}
# BIP_TRUSTSTORE: ${BIP_TRUSTSTORE}
# BIP_KEYSTORE: ${BIP_KEYSTORE}
# networks:
# - vro_intranet
#
# mock-bip-ce-api:
# profiles: ["all"]
# image: va/vro_mocks-mock-bip-ce-api:latest
# <<: [*common-sde-security, *common-security-opt]
# ports:
# - "20310:20310"
# - "20316:20316"
# environment:
# <<: *common-vars
# BIP_EVIDENCE_USERID: ${BIP_EVIDENCE_USERID}
# BIP_EVIDENCE_SECRET: ${BIP_EVIDENCE_SECRET}
## BIP_APPLICATION_ID: ${BIP_APPLICATION_ID}
# BIP_TRUSTSTORE: ${BIP_TRUSTSTORE}
# BIP_KEYSTORE: ${BIP_KEYSTORE}
# networks:
# - vro_intranet

mock-bgs-api:
profiles: ["all","bgs"]
image: va/vro_mocks-mock-bgs-api:latest
<<: [*common-sde-security, *common-security-opt]
ports:
- "20500:8080"
environment:
<<: *common-vars
networks:
- vro_intranet
# NOTE: svc-bgs-api workflows are tied to inactive services and commented out to prevent unnecessary execution and updates.
# Documentation:
# - Disabling issue: https://github.com/department-of-veterans-affairs/abd-vro/issues/3893
# mock-bgs-api:
# profiles: ["all","bgs"]
# image: va/vro_mocks-mock-bgs-api:latest
# <<: [*common-sde-security, *common-security-opt]
# ports:
# - "20500:8080"
# environment:
# <<: *common-vars
# networks:
# - vro_intranet
Loading

0 comments on commit 0928439

Please sign in to comment.