From f9d817da3d030abc7d3f96274456cbd067d2c353 Mon Sep 17 00:00:00 2001 From: Harinder Singh Date: Tue, 4 Jul 2023 16:48:57 +0530 Subject: [PATCH] INFRA-1896 | Harinder | Bug fix: Fetching env vars from paths causing issues in OKTA_GROUP_MAPPING --- deployment_manifest.json | 4 ++++ .../infra/portal/configuration/TeamConfiguration.java | 8 ++++---- src/main/resources/application-dev.properties | 4 ++-- src/main/resources/application.properties | 4 ++-- .../infra/portal/configuration/TeamConfigurationTest.java | 2 +- src/test/resources/application.properties | 4 ++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/deployment_manifest.json b/deployment_manifest.json index 9a747fd2..cb39f113 100644 --- a/deployment_manifest.json +++ b/deployment_manifest.json @@ -97,6 +97,10 @@ { "name": "JWT_SECRET_KEY", "value": "$JWT_SECRET_KEY" + }, + { + "name": "TEAMS_LIST_VAULT", + "value": "$TEAMS_LIST_VAULT" } ], "namespace": "$NAMESPACE", diff --git a/src/main/java/com/navi/infra/portal/configuration/TeamConfiguration.java b/src/main/java/com/navi/infra/portal/configuration/TeamConfiguration.java index 863cbed8..72c1f3b7 100644 --- a/src/main/java/com/navi/infra/portal/configuration/TeamConfiguration.java +++ b/src/main/java/com/navi/infra/portal/configuration/TeamConfiguration.java @@ -19,8 +19,8 @@ public class TeamConfiguration { private final TeamRepository teamRepository; - @Value("${slack.teams.mapping}") - private String[] slackTeamMappings; + @Value("${teams.list.vault}") + private String[] teamsListVault; @Bean public boolean consolidateTeamListInDBFromVault() { @@ -42,8 +42,8 @@ public class TeamConfiguration { // Find diff of team list from Vault and DB List newTeamList = new ArrayList<>(); - log.info("Teams list from Vault: {}", (Object) slackTeamMappings); - for (String team: slackTeamMappings){ + log.info("Teams list from Vault: {}", (Object) teamsListVault); + for (String team: teamsListVault){ if(!teamDbMap.containsKey(team)){ newTeamList.add(team); if (!newTeamsSynced){ diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index fceb83c0..45a08ff4 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -23,5 +23,5 @@ spring.main.allow-bean-definition-overriding=true #JWT token generation jwt.secret.key=${JWT_SECRET_KEY} -#Slack teams mapping - Single source of truth for teams -slack.teams.mapping=${SLACK_TEAMS_MAPPING_ARRAY:InsurancePlatform,Co-Lending,IT} +#Teams List from Vault - Single source of truth for teams in vault +teams.list.vault=${TEAMS_LIST_VAULT:InsurancePlatform,Co-Lending,IT} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3f83ff89..380f2cf0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -60,5 +60,5 @@ manifest.limit.config.path=classpath:changerequest #JWT token generation jwt.secret.key=${JWT_SECRET_KEY:'something'} -#Slack teams mapping - Single source of truth for teams -slack.teams.mapping=${SLACK_TEAMS_MAPPING_ARRAY:InsurancePlatform,Co-Lending,IT} +#Teams List from Vault - Single source of truth for teams in vault +teams.list.vault=${TEAMS_LIST_VAULT:InsurancePlatform,Co-Lending,IT} diff --git a/src/test/java/com/navi/infra/portal/configuration/TeamConfigurationTest.java b/src/test/java/com/navi/infra/portal/configuration/TeamConfigurationTest.java index 5a9cb9af..734045e5 100644 --- a/src/test/java/com/navi/infra/portal/configuration/TeamConfigurationTest.java +++ b/src/test/java/com/navi/infra/portal/configuration/TeamConfigurationTest.java @@ -38,7 +38,7 @@ class TeamConfigurationTest { teamList[0] = "IP"; teamList[1] = "Hifi"; ReflectionTestUtils.setField(teamConfiguration, - "slackTeamMappings", + "teamsListVault", teamList); } diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 7db2a383..b0df4018 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -46,5 +46,5 @@ spring.main.allow-bean-definition-overriding=true manifest.limit.config.path=classpath:changerequest jwt.secret.key=${JWT_SECRET_KEY:test-secret-key} -#Slack teams mapping - Single source of truth for teams -slack.teams.mapping=${SLACK_TEAMS_MAPPING_ARRAY:InsurancePlatform,Co-Lending,IT} +#Teams List from Vault - Single source of truth for teams in vault +teams.list.vault=${TEAMS_LIST_VAULT:InsurancePlatform,Co-Lending,IT}