fix(monitor): correct printf format string (#265)

ci: really enable custom printf functions for govet
favonia · Nov 13, 2022 · 0740d61 · 0740d61
1 parent c54237d
commit 0740d61
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -12,11 +12,14 @@ linters-settings:
     settings:
       printf:
         funcs:
-          - (github.com/favonia/cloudflare-ddns/internal/pp).Infof
-          - (github.com/favonia/cloudflare-ddns/internal/pp).Noticef
-          - (github.com/favonia/cloudflare-ddns/internal/pp).Warningf
-          - (github.com/favonia/cloudflare-ddns/internal/pp).Errorf
-          - (github.com/favonia/cloudflare-ddns/internal/pp).printf
+          - (github.com/favonia/cloudflare-ddns/internal/pp.PP).Infof
+          - (github.com/favonia/cloudflare-ddns/internal/pp.PP).Noticef
+          - (github.com/favonia/cloudflare-ddns/internal/pp.PP).Warningf
+          - (github.com/favonia/cloudflare-ddns/internal/pp.PP).Errorf
+          - (*github.com/favonia/cloudflare-ddns/internal/mocks.MockPPMockRecorder).Infof
+          - (*github.com/favonia/cloudflare-ddns/internal/mocks.MockPPMockRecorder).Noticef
+          - (*github.com/favonia/cloudflare-ddns/internal/mocks.MockPPMockRecorder).Warningf
+          - (*github.com/favonia/cloudflare-ddns/internal/mocks.MockPPMockRecorder).Errorf
 
 issues:
   exclude-rules:

diff --git a/internal/api/cloudflare.go b/internal/api/cloudflare.go
@@ -113,7 +113,7 @@ func (h *CloudflareHandle) ActiveZones(ctx context.Context, ppfmt pp.PP, name st
 			"moved",        // domain registrar not pointing to Cloudflare
 			"pending":      // the setup was not completed
 			ppfmt.Warningf(pp.EmojiWarning, "Zone %q is %q; your Cloudflare setup is incomplete", name, zone.Status)
-			ppfmt.Warningf(pp.EmojiWarning, "Some features might stop working", name, zone.Status)
+			ppfmt.Warningf(pp.EmojiWarning, "Some features might stop working")
 			ids = append(ids, zone.ID)
 		case
 			"deleted": // archived, pending/moved for too long

diff --git a/internal/api/cloudflare_test.go b/internal/api/cloudflare_test.go
@@ -413,7 +413,7 @@ func TestZoneOfDomain(t *testing.T) {
 			func(m *mocks.MockPP) {
 				gomock.InOrder(
 					m.EXPECT().Warningf(pp.EmojiWarning, "Zone %q is %q; your Cloudflare setup is incomplete", "test.org", "pending"), //nolint:lll
-					m.EXPECT().Warningf(pp.EmojiWarning, "Some features might stop working", "test.org", "pending"),
+					m.EXPECT().Warningf(pp.EmojiWarning, "Some features might stop working"),
 				)
 			},
 		},
@@ -424,7 +424,7 @@ func TestZoneOfDomain(t *testing.T) {
 			func(m *mocks.MockPP) {
 				gomock.InOrder(
 					m.EXPECT().Warningf(pp.EmojiWarning, "Zone %q is %q; your Cloudflare setup is incomplete", "test.org", "initializing"), //nolint:lll
-					m.EXPECT().Warningf(pp.EmojiWarning, "Some features might stop working", "test.org", "initializing"),
+					m.EXPECT().Warningf(pp.EmojiWarning, "Some features might stop working"),
 				)
 			},
 		},

diff --git a/internal/config/env.go b/internal/config/env.go
@@ -211,7 +211,7 @@ func ReadProvider(ppfmt pp.PP, key, keyDeprecated string, field *provider.Provid
 			ppfmt.Errorf(
 				pp.EmojiUserError,
 				`Parameter %s does not accept "cloudflare"; use "cloudflare.doh" or "cloudflare.trace"`,
-				key, key,
+				key,
 			)
 			return false
 		case "cloudflare.trace":

diff --git a/internal/config/env_test.go b/internal/config/env_test.go
@@ -556,7 +556,7 @@ func TestReadProvider(t *testing.T) {
 				m.EXPECT().Errorf(
 					pp.EmojiUserError,
 					`Parameter %s does not accept "cloudflare"; use "cloudflare.doh" or "cloudflare.trace"`,
-					key, key,
+					key,
 				)
 			},
 		},

diff --git a/internal/monitor/healthchecks.go b/internal/monitor/healthchecks.go
@@ -159,7 +159,7 @@ func (h *HealthChecks) Failure(ctx context.Context, ppfmt pp.PP) bool {
 
 func (h *HealthChecks) ExitStatus(ctx context.Context, ppfmt pp.PP, code int) bool {
 	if code < 0 || code > 255 {
-		ppfmt.Errorf(pp.EmojiImpossible, "Exit code (%i) not within the range 0-255", code)
+		ppfmt.Errorf(pp.EmojiImpossible, "Exit code (%d) not within the range 0-255", code)
 		return false
 	}
 

diff --git a/internal/monitor/healthchecks_test.go b/internal/monitor/healthchecks_test.go
@@ -241,7 +241,7 @@ func TestEndPoints(t *testing.T) {
 			nil,
 			false, false,
 			func(m *mocks.MockPP) {
-				m.EXPECT().Errorf(pp.EmojiImpossible, "Exit code (%i) not within the range 0-255", -1)
+				m.EXPECT().Errorf(pp.EmojiImpossible, "Exit code (%d) not within the range 0-255", -1)
 			},
 		},
 	} {