Revert "Update ci file" #41
Conversation
WalkthroughUpdated CI environment variable bindings for identity data sources, removed multiple spring.datasource entries from application.properties, and made a whitespace-only tweak in a SQL migration file. No functional code changes or new features added. Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Possibly related PRs
Suggested reviewers
Pre-merge checks (3 passed)✅ Passed checks (3 passed)
Poem
Tip 👮 Agentic pre-merge checks are now available in preview!Pro plan users can now enable pre-merge checks in their settings to enforce checklists before merging PRs.
Please see the documentation for more information. Example: reviews:
pre_merge_checks:
custom_checks:
- name: "Undocumented Breaking Changes"
mode: "warning"
instructions: |
Pass/fail criteria: All breaking changes to public APIs, CLI flags, environment variables, configuration keys, database schemas, or HTTP/GraphQL endpoints must be documented in the "Breaking Change" section of the PR description and in CHANGELOG.md. Exclude purely internal or private changes (e.g., code not exported from package entry points or explicitly marked as internal).Please share your feedback with us on this Discord post. ✨ Finishing touches🧪 Generate unit tests
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 3
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (3)
src/main/environment/common_ci.properties(2 hunks)src/main/resources/application.properties(0 hunks)src/main/resources/db/migration/dbiemr/V3__DB_IEMR.sql(1 hunks)
💤 Files with no reviewable changes (1)
- src/main/resources/application.properties
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
- GitHub Check: Analyze (java)
| spring.datasource.dbidentity.jdbc-url=@env.IDENTITY_DATABASE_URL@ | ||
| spring.datasource.dbidentity.username=@env.IDENTITY_DATABASE_USERNAME@ | ||
| spring.datasource.dbidentity.password=@env.IDENTITY_DATABASE_PASSWORD@ |
There was a problem hiding this comment.
💡 Verification agent
🧩 Analysis chain
This does not look like a true “revert”; revert env placeholders for dbidentity.
Revert to the previous placeholders to match the PR intent and avoid breaking CI secrets mapping.
-spring.datasource.dbidentity.jdbc-url=@env.IDENTITY_DATABASE_URL@
-spring.datasource.dbidentity.username=@env.IDENTITY_DATABASE_USERNAME@
-spring.datasource.dbidentity.password=@env.IDENTITY_DATABASE_PASSWORD@
+spring.datasource.dbidentity.jdbc-url=@env.DATABASE_IDENTITY_URL@
+spring.datasource.dbidentity.username=@env.DATABASE_IDENTITY_USERNAME@
+spring.datasource.dbidentity.password=@env.DATABASE_IDENTITY_PASSWORD@To verify current usage and avoid regressions, run:
🏁 Script executed:
#!/bin/bash
# List all env placeholders referenced in env/ and resources/ to check consistency.
fd -t f . | rg -nP '@env\.[A-Z0-9_\.]+@' -C1
# Sanity check for placeholders starting with a digit (often invalid in CI/OS envs).
rg -nP '@env\.[0-9][A-Z0-9_]*@' src || trueLength of output: 369
Remove accidental "1097" prefix and restore non-numeric env placeholders
src/main/environment/common_ci.properties:20-22 contain an accidental "1097" insertion in both the property names and env placeholders (e.g. spring.datasource.db1097identity.jdbc-url=@env.1097_IDENTITY_DATABASE_URL@). Leading-digit env placeholders will break CI/OS env mapping and the property keys are malformed — restore to spring.datasource.dbidentity.* and use non-numeric env placeholders (no leading digit) to match CI secrets.
🤖 Prompt for AI Agents
In src/main/environment/common_ci.properties around lines 8 to 10, remove the
accidental "1097" insertion from both the property keys and the env placeholders
so the properties read spring.datasource.dbidentity.jdbc-url,
spring.datasource.dbidentity.username, and
spring.datasource.dbidentity.password, and update the placeholders to
non-numeric forms @env.IDENTITY_DATABASE_URL@, @env.IDENTITY_DATABASE_USERNAME@,
and @env.IDENTITY_DATABASE_PASSWORD@ so CI/OS env mapping and property keys are
valid.
| spring.datasource.db1097identity.jdbc-url=@env.1097_IDENTITY_DATABASE_URL@ | ||
| spring.datasource.db1097identity.username=@env.1097_IDENTITY_DATABASE_USERNAME@ | ||
| spring.datasource.db1097identity.password=@env.1097_IDENTITY_DATABASE_PASSWORD@ |
There was a problem hiding this comment.
🛠️ Refactor suggestion
Env var names start with a digit; likely invalid across shells/CI. Revert 1097 identity placeholders.
Most environments disallow variable names beginning with a digit. The previous form (DATABASE_1097_…) is safer and aligns with the stated “revert”.
-spring.datasource.db1097identity.jdbc-url=@env.1097_IDENTITY_DATABASE_URL@
-spring.datasource.db1097identity.username=@env.1097_IDENTITY_DATABASE_USERNAME@
-spring.datasource.db1097identity.password=@env.1097_IDENTITY_DATABASE_PASSWORD@
+spring.datasource.db1097identity.jdbc-url=@env.DATABASE_1097_IDENTITY_URL@
+spring.datasource.db1097identity.username=@env.DATABASE_IDENTITY_USERNAME@
+spring.datasource.db1097identity.password=@env.DATABASE_IDENTITY_PASSWORD@Committable suggestion skipped: line range outside the PR's diff.
🤖 Prompt for AI Agents
In src/main/environment/common_ci.properties lines 20-22, the env placeholder
names start with a digit (1097) which is invalid in many shells/CI; revert them
to the previous safe form that begins with "DATABASE_1097_". Replace the three
placeholders so they start with DATABASE_1097_ (for example:
@env.DATABASE_1097_IDENTITY_DATABASE_URL@,
@env.DATABASE_1097_IDENTITY_DATABASE_USERNAME@,
@env.DATABASE_1097_IDENTITY_DATABASE_PASSWORD@) so CI/shell env vars do not
begin with a digit.
| -- Table structure for table `asha_profile` | ||
| -- | ||
|
|
||
|
|
There was a problem hiding this comment.
Do not modify applied Flyway versioned migrations; revert the whitespace change.
Even a blank line alters the checksum of a versioned migration (V3__), causing Flyway validation failures in any environment where V3 was previously applied. Restore the exact original bytes.
Apply this diff:
- 📝 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.
🤖 Prompt for AI Agents
In src/main/resources/db/migration/dbiemr/V3__DB_IEMR.sql around line 11, a
whitespace/blank-line change was introduced that alters the file checksum and
breaks Flyway validation; revert that change by restoring the file to its exact
original bytes (remove the added blank line or whitespace at line 11), or
restore the file from the previous commit/original V3 migration source so the
checksum matches the applied migration.
|
@SauravBizbRolly is this PR still valid? |
Reverts #40
Summary by CodeRabbit
Chores
Style