actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-23 16:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Change permission grant error print conditons

Browse source 
Based on observations in
https://github.com/fluxcd/flux2/runs/2410633975:

1. Print error correctly by switching from `%w` to `%s`
2. Only print the change messsage if there has not been an error.

Signed-off-by: Hidde Beydals <hello@hidde.co>
This commit is contained in:
Hidde Beydals 2021-04-22 15:51:21 +02:00
parent 3b482529ff
commit 67997437db
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
internal/bootstrap/bootstrap_provider.go
View file

@ -321,9 +321,8 @@ func (b *GitProviderBootstrapper) reconcileOrgRepository(ctx context.Context) (g
_, changed, err = repo.TeamAccess().Reconcile(ctx, i) _, changed, err = repo.TeamAccess().Reconcile(ctx, i)
if err != nil { if err != nil {
warning = fmt.Errorf("failed to grant permissions to team: %w", ErrReconciledWithWarning) warning = fmt.Errorf("failed to grant permissions to team: %w", ErrReconciledWithWarning)
b.logger.Failuref("failed to grant %q permissions to %q: %w", *i.Permission, i.Name, err) b.logger.Failuref("failed to grant %q permissions to %q: %s", *i.Permission, i.Name, err.Error())
} } else if changed {
if changed {
b.logger.Successf("granted %q permissions to %q", *i.Permission, i.Name) b.logger.Successf("granted %q permissions to %q", *i.Permission, i.Name)
} }
} }