-
Notifications
You must be signed in to change notification settings - Fork 23
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Port 8082 has been assigned to this service, updated ports for all microservices, and modified database connection in the environment configuration. #67
base: develop
Are you sure you want to change the base?
Conversation
… properties are edited(need a review)
WalkthroughThe pull request introduces configuration changes across multiple environment-specific properties files and the main application properties. The primary modifications involve adding a new Changes
Poem
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
logging.file.name=@env.ADMIN_API_LOGGING_FILE_NAME@ | ||
|
||
common-url=http://localhost:8083/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For Ci, please use the placeholder with @@ here.
Check how common API Base URL is mentioned in other CI files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Asp-irin this is pending
@@ -82,6 +80,7 @@ swymed-edituser-url=swymed-base-url/SwymedWebApi/api/Contact | |||
|
|||
calibrationPageSize=5 | |||
|
|||
#check this |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove comment.
Quality Gate passedIssues Measures |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 3
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (6)
src/main/environment/admin_ci.properties
(1 hunks)src/main/environment/admin_dev.properties
(1 hunks)src/main/environment/admin_example.properties
(1 hunks)src/main/environment/admin_test.properties
(1 hunks)src/main/environment/admin_uat.properties
(1 hunks)src/main/resources/application.properties
(2 hunks)
✅ Files skipped from review due to trivial changes (1)
- src/main/environment/admin_test.properties
🔇 Additional comments (5)
src/main/environment/admin_example.properties (2)
1-1
: LGTM! Port configuration aligns with PR objectives.The server port configuration matches the intended port 8082 as specified in the PR objectives.
18-18
: Verify the common-url configuration.The common-url is set to localhost:8083, which needs verification to ensure it matches the intended service.
Run this script to check common-url usage across the codebase:
✅ Verification successful
The common-url configuration is correctly set for the development environment
The value
http://localhost:8083/
is consistent across development environments (dev/test/uat) and is used as a base URL for internal service communication (password encryption, CTI, and campaign management). The CI environment properly uses environment variable injection via@env.COMMON_URL@
for production deployment.🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Search for references to common-url in the codebase echo "Searching for common-url usage in code..." rg -l "common-url|common\.url" --type java echo "Searching for localhost:8083 references..." rg "localhost:8083" --type propertiesLength of output: 750
Script:
#!/bin/bash # Check common-url values across environment files echo "=== Environment Files Content ===" for file in src/main/environment/admin_*.properties; do echo "=== $file ===" grep "common-url" "$file" || true done echo -e "\n=== localhost:8083 References ===" rg "localhost:8083" echo -e "\n=== Java Usage Patterns ===" rg -A 3 "common.url|common-url" --type javaLength of output: 6986
src/main/environment/admin_ci.properties (1)
23-23
: LGTM! Correct usage of environment variable in CI.The common-url configuration correctly uses the environment variable placeholder, which is the appropriate approach for CI environments.
src/main/resources/application.properties (2)
15-15
: Verify the impact of force logout path change.The change from a full URL to a relative path needs verification to ensure all services can handle this change.
Run this script to check usage:
✅ Verification successful
Force logout path change is properly handled ✅
The relative path change is safe as the code in
EmployeeMasterServiceImpl
properly combines it with the base URL before use.🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Search for force logout URL usage echo "Searching for force logout implementations..." ast-grep --pattern 'common-forcelogout' --lang javaLength of output: 152
Script:
#!/bin/bash # Search for force logout related configurations and implementations echo "Searching for force logout property references..." rg -i "common-forcelogout|forcelogout" -g "*.{java,properties,yml,yaml,xml}" -A 2 -B 2 echo -e "\nSearching for userForceLogout endpoint implementations..." rg -i "userForceLogout" -g "*.{java,properties,yml,yaml,xml}" -A 2 -B 2Length of output: 2111
80-80
: Verify biological screening device port change.The port change from 8085 to 8096 needs verification to ensure it's coordinated with the device service deployment.
Run this script to check port usage:
spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr | ||
spring.datasource.username=root | ||
spring.datasource.password=1234 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Security: Replace database credentials with placeholders.
Even in example properties files, it's not recommended to commit actual database credentials. Replace them with placeholders to prevent potential security risks.
Apply this diff:
-spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
-spring.datasource.username=root
-spring.datasource.password=1234
+spring.datasource.url=<Enter your DB URL here>
+spring.datasource.username=<Enter your DB username>
+spring.datasource.password=<Enter your DB password>
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr | |
spring.datasource.username=root | |
spring.datasource.password=1234 | |
spring.datasource.url=<Enter your DB URL here> | |
spring.datasource.username=<Enter your DB username> | |
spring.datasource.password=<Enter your DB password> |
spring.redis.host=localhost | ||
spring.main.allow-bean-definition-overriding=true | ||
|
||
common-url=http://localhost:8083/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Critical: Remove hardcoded localhost URL in UAT environment.
Using localhost in the UAT environment configuration is incorrect and will cause connectivity issues. UAT should use actual service URLs.
Apply this diff:
-common-url=http://localhost:8083/
+common-url=<Enter UAT common service URL>
Committable suggestion skipped: line range outside the PR's diff.
callcentre-server-ip=10.208.122.99 | ||
|
||
videoConsultation-apikey=<Enter Swymed API key> | ||
videoConsultation-base-url=https://psmri.swymed.com:92744 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix incorrect port in video consultation URL.
The port number 92744 appears to have an extra digit compared to other environment files (9274).
Apply this diff:
-videoConsultation-base-url=https://psmri.swymed.com:92744
+videoConsultation-base-url=https://psmri.swymed.com:9274
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
videoConsultation-base-url=https://psmri.swymed.com:92744 | |
videoConsultation-base-url=https://psmri.swymed.com:9274 |
@@ -82,7 +77,7 @@ swymed-edituser-url=swymed-base-url/SwymedWebApi/api/Contact | |||
|
|||
calibrationPageSize=5 | |||
|
|||
biological-screening-device-url=http://localhost:8085/ezdx-hub-connect-srv | |||
biological-screening-device-url=http://localhost:8096/ezdx-hub-connect-srv |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this change about?
@ravishanigarapu do you know what this URL is?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
8085 is assigned to someother API, so i shifted it to 8096, which is vacant
📋 Description
The service is now configured to run on port 8082. Additionally, the ports for all microservices have been updated to ensure consistent and conflict-free communication. The database connection settings in the environment configuration have also been modified to align with the latest setup, ensuring seamless integration and connectivity across services.
✅ Type of Change
Summary by CodeRabbit
Configuration Updates
common-url
configuration across multiple environment property filesEnvironment Configurations
common-url
in CI, dev, test, and UAT environment properties