Skip to content

[bot] Fast-forward for 26.6.0#186

Merged
github-actions[bot] merged 1 commit into
release26.6from
26.6_ff_bot_26.6.0
Jun 22, 2026
Merged

[bot] Fast-forward for 26.6.0#186
github-actions[bot] merged 1 commit into
release26.6from
26.6_ff_bot_26.6.0

Conversation

@github-actions

Copy link
Copy Markdown

Generated automatically.
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
View all PRs: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.6_ff_bot_26.6.0

* 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>
@github-actions github-actions Bot merged commit c3b4dbb into release26.6 Jun 22, 2026
5 checks passed
@github-actions github-actions Bot deleted the 26.6_ff_bot_26.6.0 branch June 22, 2026 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants