Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 2 additions & 0 deletions service/integration/obligation_triggers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,8 @@ func (s *ObligationTriggersSuite) validateTrigger(actual *policy.ObligationTrigg
s.Require().Equal(expectedObligationValue.GetObligation().GetId(), actual.GetObligationValue().GetObligation().GetId())
s.Require().Equal(expectedObligationValue.GetObligation().GetName(), actual.GetObligationValue().GetObligation().GetName())
s.Require().Equal(expectedObligationValue.GetObligation().GetNamespace().GetFqn(), actual.GetObligationValue().GetObligation().GetNamespace().GetFqn())
s.Require().NotEmpty(expectedObligationValue.GetFqn())
s.Require().Equal(expectedObligationValue.GetFqn(), actual.GetObligationValue().GetFqn())
s.Require().Empty(actual.GetObligationValue().GetTriggers())

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

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

trigger.Metadata = metadata

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

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