Skip to content

Add OrgId to confidential relay and workflow execution types#1975

Merged
jmank88 merged 1 commit intomainfrom
tejaswi/add-orgid-relay-types
Apr 10, 2026
Merged

Add OrgId to confidential relay and workflow execution types#1975
jmank88 merged 1 commit intomainfrom
tejaswi/add-orgid-relay-types

Conversation

@nadahalli
Copy link
Copy Markdown
Contributor

Summary

  • Bumps chainlink-protos to cre-sdk/v1alpha.20 (adds org_id field to WorkflowExecution proto)
  • Regenerates confidentialworkflow codegen (client.pb.go)
  • Adds OrgID to confidentialrelay.SecretsRequestParams

The enclave needs org identity to forward to VaultDON when fetching secrets via the confidential relay path, matching the existing org-based ownership pattern in executor.go.

Waterfall: chainlink-protos#338 (merged) -> this -> chainlink (cw-4) + CC (PR 279)

Bump chainlink-protos to cre-sdk/v1alpha.20 which adds org_id
to the WorkflowExecution proto. Add OrgID to the confidential
relay SecretsRequestParams so the enclave can forward it to
VaultDON for org-based secret ownership.
@nadahalli nadahalli requested a review from a team as a code owner April 10, 2026 14:05
Copilot AI review requested due to automatic review settings April 10, 2026 14:05
@github-actions
Copy link
Copy Markdown

👋 nadahalli, thanks for creating this pull request!

To help reviewers, please consider creating future PRs as drafts first. This allows you to self-review and make any final changes before notifying the team.

Once you're ready, you can mark it as "Ready for review" to request feedback. Thanks!

@github-actions
Copy link
Copy Markdown

✅ API Diff Results - github.com/smartcontractkit/chainlink-common

✅ Compatible Changes (3)

pkg/capabilities/v2/actions/confidentialrelay.SecretsRequestParams (1)
  • OrgID — ➕ Added
pkg/capabilities/v2/actions/confidentialworkflow.(*WorkflowExecution) (1)
  • GetOrgId — ➕ Added
pkg/capabilities/v2/actions/confidentialworkflow.WorkflowExecution (1)
  • OrgId — ➕ Added

📄 View full apidiff report

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Updates confidential workflow and relay request types to carry organization identity through to the enclave/VaultDON secrets path by bumping the relevant protos and regenerating code.

Changes:

  • Bump chainlink-protos/cre/go dependency to a version that includes org_id on WorkflowExecution.
  • Regenerate confidential workflow protobuf Go bindings to add OrgId + accessor on WorkflowExecution.
  • Add OrgID to confidentialrelay.SecretsRequestParams for JSON-RPC calls.

Reviewed changes

Copilot reviewed 3 out of 4 changed files in this pull request and generated 1 comment.

File Description
pkg/capabilities/v2/actions/confidentialworkflow/client.pb.go Regenerated protobuf bindings adding org_id to WorkflowExecution.
pkg/capabilities/v2/actions/confidentialrelay/types.go Extends secrets JSON-RPC params with optional org_id.
go.mod Bumps chainlink-protos/cre/go to a newer pseudo-version containing the updated proto.
go.sum Updates sums for the bumped chainlink-protos/cre/go version.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

ExecutionId string `protobuf:"bytes,6,opt,name=execution_id,json=executionId,proto3" json:"execution_id,omitempty"`
// org_id is the organization identifier for the workflow owner.
// Used by the enclave when fetching secrets from VaultDON with org-based ownership.
OrgId string `protobuf:"bytes,7,opt,name=org_id,json=orgId,proto3" json:"org_id,omitempty"`
Copy link

Copilot AI Apr 10, 2026

Choose a reason for hiding this comment

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

The newly added OrgId field line appears to have non-gofmt spacing (OrgId string ...) compared to the rest of the struct. If CI enforces gofmt/gofumpt, this will fail lint. Re-run the proto/codegen step and/or gofmt on this file to normalize whitespace.

Suggested change
OrgId string `protobuf:"bytes,7,opt,name=org_id,json=orgId,proto3" json:"org_id,omitempty"`
OrgId string `protobuf:"bytes,7,opt,name=org_id,json=orgId,proto3" json:"org_id,omitempty"`

Copilot uses AI. Check for mistakes.
@jmank88 jmank88 added this pull request to the merge queue Apr 10, 2026
Merged via the queue into main with commit 7371d7b Apr 10, 2026
36 checks passed
@jmank88 jmank88 deleted the tejaswi/add-orgid-relay-types branch April 10, 2026 16:08
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.

5 participants