From 67997437db96fe120b4519abd7c2d0df78ba43d3 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Thu, 22 Apr 2021 15:51:21 +0200
Subject: [PATCH] Change permission grant error print conditons
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>
---
internal/bootstrap/bootstrap_provider.go | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/internal/bootstrap/bootstrap_provider.go b/internal/bootstrap/bootstrap_provider.go
index 6df1d2db..acdf4862 100644
--- a/internal/bootstrap/bootstrap_provider.go
+++ b/internal/bootstrap/bootstrap_provider.go
@@ -321,9 +321,8 @@ func (b *GitProviderBootstrapper) reconcileOrgRepository(ctx context.Context) (g
_, changed, err = repo.TeamAccess().Reconcile(ctx, i)
if err != nil {
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)
- }
- if changed {
+ b.logger.Failuref("failed to grant %q permissions to %q: %s", *i.Permission, i.Name, err.Error())
+ } else if changed {
b.logger.Successf("granted %q permissions to %q", *i.Permission, i.Name)
}
}
--
GitLab