[bot] Merge 26.6 to develop#187
Merged
Merged
Conversation
* Migrate credentials to LabKey native SSM integration (26.6+) Replace ECS-injected credential secrets (POSTGRES_USER, POSTGRES_PASSWORD, LABKEY_EK, SMTP_USER, SMTP_PASSWORD) with LabKey's native SSM integration via AwsParameterStoreEnvironmentPostProcessor: - application.properties: add context.awsParameterStore.prefix and ssm: references for the 5 credentials; old @@Placeholder@@ lines kept as comments for non-AWS reference - entrypoint.sh: add SSM prefix normalization and non-AWS fallback (replaces ssm: references with direct env var values when LABKEY_SSM_PREFIX is unset); remove AWS credential unset so JVM can reach SSM; remove credential sed/unset - docker-compose.yml: add LABKEY_SSM_PREFIX, LABKEY_VPC_SSM_PREFIX, AWS credential forwarding, and direct credential fallbacks for non-AWS local use - README.md, CLAUDE.md: document SSM integration, updated env var tables, updated runtime flow description⚠️ HOLD until LabKey/server#1388 merges. Targets develop / LabKey 26.6+. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Fix non-AWS default credentials to match postgres service defaults POSTGRES_PASSWORD and POSTGRES_USER in LabKey services now default to localdevpassword/postgres, matching the postgres service defaults, so make up works without setting any env vars. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Seed postgres with SSM DB credentials for local dev with SSM mode When LABKEY_SSM_PREFIX is set, fetch database_user and database_password from SSM at make time and export them as POSTGRES_USER/POSTGRES_PASSWORD so the postgres container initializes with the same credentials that LabKey will fetch from SSM at runtime. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
labkey-tchad
approved these changes
Jun 22, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Generated automatically.
Merging changes from: c3b4dbb
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=fb_bot_merge_26.6