add org id to capability request metadata (#1953)

Author: prashantkumar1982

pkg/capabilities/capabilities.go

@@ -171,6 +171,7 @@ type SpendLimit struct {
 type RequestMetadata struct {
 	WorkflowID               string
 	WorkflowOwner            string
+	OrgID                    string
 	WorkflowExecutionID      string
 	WorkflowName             string
 	WorkflowDonID            uint32
@@ -192,7 +193,9 @@ type RequestMetadata struct {
 
 func (m *RequestMetadata) ContextWithCRE(ctx context.Context) context.Context {
 	val := contexts.CREValue(ctx)
-	// preserve org, if set
+	if m.OrgID != "" {
+		val.Org = m.OrgID
+	}
 	val.Owner = m.WorkflowOwner
 	val.Workflow = m.WorkflowID
 	return contexts.WithCRE(ctx, val)

pkg/capabilities/pb/capabilities.pb.go

@@ -42,6 +42,7 @@ message RequestMetadata {
   string workflow_id = 1;
   string workflow_execution_id = 2;
   string workflow_owner = 3;
+  string org_id = 16;
   string workflow_name = 4;
   uint32 workflow_don_id = 6;
   uint32 workflow_don_config_version = 7;
@@ -210,4 +211,4 @@ service Settings {
 message SettingsUpdate {
   string settings = 1; // default format TOML
   string hash = 2; // default sha256
-}
+}

pkg/capabilities/pb/capabilities.proto

@@ -66,6 +66,7 @@ func CapabilityRequestToProto(req capabilities.CapabilityRequest) *CapabilityReq
 			WorkflowId:               req.Metadata.WorkflowID,
 			WorkflowExecutionId:      req.Metadata.WorkflowExecutionID,
 			WorkflowOwner:            req.Metadata.WorkflowOwner,
+			OrgId:                    req.Metadata.OrgID,
 			WorkflowName:             req.Metadata.WorkflowName,
 			WorkflowDonId:            req.Metadata.WorkflowDonID,
 			WorkflowDonConfigVersion: req.Metadata.WorkflowDonConfigVersion,
@@ -147,6 +148,7 @@ func CapabilityRequestFromProto(pr *CapabilityRequest) (capabilities.CapabilityR
 			WorkflowID:               md.WorkflowId,
 			WorkflowExecutionID:      md.WorkflowExecutionId,
 			WorkflowOwner:            md.WorkflowOwner,
+			OrgID:                    md.OrgId,
 			WorkflowName:             md.WorkflowName,
 			WorkflowDonID:            md.WorkflowDonId,
 			WorkflowDonConfigVersion: md.WorkflowDonConfigVersion,
@@ -364,6 +366,7 @@ func TriggerRegistrationRequestToProto(req capabilities.TriggerRegistrationReque
 			WorkflowId:                    md.WorkflowID,
 			WorkflowExecutionId:           md.WorkflowExecutionID,
 			WorkflowOwner:                 md.WorkflowOwner,
+			OrgId:                         md.OrgID,
 			WorkflowName:                  md.WorkflowName,
 			WorkflowDonId:                 md.WorkflowDonID,
 			WorkflowDonConfigVersion:      md.WorkflowDonConfigVersion,
@@ -428,6 +431,7 @@ func TriggerRegistrationRequestFromProto(req *TriggerRegistrationRequest) (capab
 		Metadata: capabilities.RequestMetadata{
 			WorkflowID:                    md.WorkflowId,
 			WorkflowOwner:                 md.WorkflowOwner,
+			OrgID:                         md.OrgId,
 			WorkflowExecutionID:           md.WorkflowExecutionId,
 			WorkflowName:                  md.WorkflowName,
 			WorkflowDonID:                 md.WorkflowDonId,

pkg/capabilities/pb/capabilities_helpers.go

@@ -139,6 +139,7 @@ func TestMarshalUnmarshalRequest(t *testing.T) {
 			WorkflowID:               "test-workflow-id",
 			WorkflowExecutionID:      testWorkflowID,
 			WorkflowOwner:            "0xaa",
+			OrgID:                    "org-123",
 			WorkflowName:             testWorkflowName,
 			WorkflowDonID:            1,
 			WorkflowDonConfigVersion: 1,
@@ -236,6 +237,7 @@ func TestMarshalUnmarshalTriggerRegistrationRequest(t *testing.T) {
 			WorkflowID:               "test-workflow-id",
 			WorkflowExecutionID:      testWorkflowID,
 			WorkflowOwner:            testWorkflowOwner,
+			OrgID:                    "org-456",
 			WorkflowName:             testWorkflowName,
 			WorkflowDonID:            2,
 			WorkflowDonConfigVersion: 3,