🌐 US-Proxy
class="logged-out env-production page-responsive" style="word-wrap: break-word;" >
Skip to content

fix(coderd): scope provisioner module file downloads to the daemon's org (#26635) - #27883

Merged
jdomeracki-coder merged 2 commits into
release/2.34from
backport/26635-to-2.34
Aug 6, 2026
Merged

fix(coderd): scope provisioner module file downloads to the daemon's org (#26635)#27883
jdomeracki-coder merged 2 commits into
release/2.34from
backport/26635-to-2.34

Conversation

@jdomeracki-coder

Copy link
Copy Markdown
Contributor

Backport of #26635

Original PR: #26635 — fix(coderd): scope provisioner module file downloads to the daemon's org
Merge commit: 1961908
Requested by: @jdomeracki-coder

Conflict resolution notes

The cherry-pick conflicted in generated database files because the new
HasTemplateVersionsUsingCachedModuleFileInOrg query sits adjacent to chatd
methods (HydrateAgentChatsContext, IncrementChatGenerationAttempt) that do
not exist on release/2.34. Resolved by keeping only the new query and its
generated bindings in querier.go, dbmetrics/querymetrics.go,
dbmock/dbmock.go, and dbauthz/dbauthz.go, then running gofmt. Affected
packages (./coderd/database/..., ./coderd/provisionerdserver/...) build
successfully.


Opened by Coder Agents on behalf of @jdomeracki-coder.

@jdomeracki-coder jdomeracki-coder added the backport/v2.34 Backport PR targeting release/2.34 label Aug 5, 2026

@mtojek mtojek left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fmt needs fixing

@jdomeracki-coder

Copy link
Copy Markdown
Contributor Author

Fixed in 290a06a. gofumpt requires a blank line between the new HasTemplateVersionsUsingCachedModuleFileInOrg method and InsertAIBridgeInterception in dbauthz.go and querymetrics.go; my manual conflict resolution had left them adjacent. This matches exactly the diff the fmt job reported.

Posted by Coder Agents on behalf of @jdomeracki-coder.

@jdomeracki-coder
jdomeracki-coder requested a review from mtojek August 5, 2026 12:12
@jdomeracki-coder
jdomeracki-coder merged commit d6ea2bd into release/2.34 Aug 6, 2026
27 checks passed
@jdomeracki-coder
jdomeracki-coder deleted the backport/26635-to-2.34 branch August 6, 2026 12:45
@github-actions github-actions Bot locked and limited conversation to collaborators Aug 6, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport/v2.34 Backport PR targeting release/2.34

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants