Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions service/integration/obligation_triggers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,7 @@ func (s *ObligationTriggersSuite) validateTrigger(actual *policy.ObligationTrigg

// Validate attribute value
s.Require().Equal(expectedAttributeValue.GetId(), actual.GetAttributeValue().GetId())
s.Require().NotEmpty(expectedAttributeValue.GetFqn())
s.Require().Equal(expectedAttributeValue.GetFqn(), actual.GetAttributeValue().GetFqn())
s.Require().Equal(expectedAttributeValue.GetValue(), actual.GetAttributeValue().GetValue())

Expand Down
11 changes: 11 additions & 0 deletions service/policy/db/obligations.go
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,12 @@ func (c PolicyDBClient) CreateObligationTrigger(ctx context.Context, r *obligati
return nil, err
}

returnedOblVal := trigger.GetObligationValue()
if returnedOblVal != nil {
returnedOblVal.Fqn = oblVal.GetFqn()
trigger.ObligationValue = returnedOblVal
}

trigger.Metadata = metadata

return trigger, nil
Expand Down Expand Up @@ -694,6 +700,11 @@ func (c PolicyDBClient) ListObligationTriggers(ctx context.Context, r *obligatio
return nil, nil, err
}

returnedOblVal := obligationTrigger.GetObligationValue()
if returnedOblVal != nil {
returnedOblVal.Fqn = identifier.BuildOblValFQN(returnedOblVal.GetObligation().GetNamespace().GetFqn(), returnedOblVal.GetObligation().GetName(), returnedOblVal.GetValue())
obligationTrigger.ObligationValue = returnedOblVal
}
obligationTrigger.Metadata = metadata
result = append(result, obligationTrigger)
}
Expand Down
Loading