Merge branch 'develop' into dependabot/gradle/develop/org.flywaydb.fl…

…yway-10.18.2
department-of-veterans-affairs · Sep 30, 2024 · 2886270 · 2886270
2 parents 674c78d + cf2dec3
commit 2886270
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/db-init/Dockerfile b/db-init/Dockerfile
@@ -15,6 +15,6 @@ COPY flyway.conf /flyway/conf
 
 RUN adduser --no-create-home --disabled-password tron
 USER tron
-CMD ["migrate", "-X" ]
+CMD ["repair", "migrate", "-X" ]
 
 HEALTHCHECK NONE
diff --git a/db-init/docker-entrypoint.sh b/db-init/docker-entrypoint.sh
@@ -7,4 +7,4 @@ until pg_isready -d $POSTGRES_DB -h $POSTGRES_URL -p 5432 -U $POSTGRES_FLYWAY_US
 done
 
 # Perform flyway migrations
-migrate -X
+repair && migrate -X
diff --git a/db-init/src/main/resources/database/migrations/V1.7.1_resolve_migration.sql b/db-init/src/main/resources/database/migrations/V1.7.1_resolve_migration.sql
@@ -0,0 +1,2 @@
+-- dummy migration to satisfy problematic 1.7 removal/2.1 conflict
+SELECT 1;
diff --git a/...nit/src/main/resources/database/migrations/V2.1__BIE_Contention_Event_Add_ActorUserId.sql b/...nit/src/main/resources/database/migrations/V2.1__BIE_Contention_Event_Add_ActorUserId.sql
@@ -1,2 +1,2 @@
 ALTER TABLE "bie_contention_event"
-ADD COLUMN IF NOT EXISTS "actor_user_id" VARCHAR(255) DEFAULT NULL;
+ADD COLUMN "actor_user_id" VARCHAR(255) DEFAULT NULL;
diff --git a/dev-tools/Dockerfile b/dev-tools/Dockerfile
@@ -1,5 +1,5 @@
 # Use the official AWS CLI image for the first stage
-FROM amazon/aws-cli:2.17.58 as awscli
+FROM amazon/aws-cli:2.17.61 as awscli
 
 # Use the bitnami/minideb:bookworm as the base image for the second stage
 FROM bitnami/minideb:bookworm

diff --git a/domain-ee/ee-ep-merge-app/src/python_src/util/metric_logger.py b/domain-ee/ee-ep-merge-app/src/python_src/util/metric_logger.py
@@ -25,9 +25,14 @@
 
 APP_PREFIX = 'ep_merge'
 
-ENV_TAG = f'environment:{ENV}'
+ENV_TAG = f'env:{ENV}'
 SERVICE_TAG = 'service:vro-ee-ep-merge-app'
-STANDARD_TAGS = [ENV_TAG, SERVICE_TAG]
+TEAM_TAG = 'team:benefits'
+IT_PORTFOLIO_TAG = 'itportfolio:benefits-delivery'
+DEPENDENCY_TAGS = ['dependency:svc-bip-api', 'dependency:svc-bgs-api']
+
+STANDARD_TAGS = [ENV_TAG, SERVICE_TAG, TEAM_TAG, IT_PORTFOLIO_TAG]
+STANDARD_TAGS.extend(DEPENDENCY_TAGS)
 
 
 configuration = Configuration(enable_retry=True)

diff --git a/shared/lib-bie-kafka/build.gradle b/shared/lib-bie-kafka/build.gradle
@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation 'net.datafaker:datafaker:2.3.1'
+  implementation 'net.datafaker:datafaker:2.4.0'
   implementation "com.google.guava:guava"
 }
diff --git a/shared/lib-metrics/build.gradle b/shared/lib-metrics/build.gradle
@@ -13,7 +13,7 @@ ext {
 dependencies {
   implementation 'org.springframework.boot:spring-boot-starter-amqp'
   implementation "jakarta.validation:jakarta.validation-api"
-  implementation 'net.datafaker:datafaker:2.3.1'
+  implementation 'net.datafaker:datafaker:2.4.0'
   implementation "com.google.guava:guava"
   implementation 'org.apache.commons:commons-lang3:3.17.0'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- dummy migration to satisfy problematic 1.7 removal/2.1 conflict
		SELECT 1;