From e8370a21bb83ec013f6acb9a170b22a81e5050be Mon Sep 17 00:00:00 2001 From: Ramon de Klein Date: Mon, 25 Nov 2024 12:28:50 +0100 Subject: [PATCH] fix lint issues --- cmd/kes/identity.go | 12 ++++++------ cmd/kes/key.go | 4 ++-- cmd/kes/log.go | 12 ++++++------ cmd/kes/policy.go | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cmd/kes/identity.go b/cmd/kes/identity.go index e2772776..b449d7d9 100644 --- a/cmd/kes/identity.go +++ b/cmd/kes/identity.go @@ -500,7 +500,7 @@ func infoIdentityCmd(args []string) { cli.Fatal(err) } year, month, day := info.CreatedAt.Date() - hour, min, sec := info.CreatedAt.Clock() + hour, minute, sec := info.CreatedAt.Clock() fmt.Println( faint.Render(fmt.Sprintf("%-11s", "Identity")), @@ -508,7 +508,7 @@ func infoIdentityCmd(args []string) { ) fmt.Println( faint.Render(fmt.Sprintf("%-11s", "Created At")), - fmt.Sprintf("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, min, sec), + fmt.Sprintf("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, minute, sec), ) if info.IsAdmin { fmt.Println(faint.Render(fmt.Sprintf("%-11s", "Role")), "Admin") @@ -520,13 +520,13 @@ func infoIdentityCmd(args []string) { } if info.Policy != "" { year, month, day := policy.CreatedAt.Date() - hour, min, sec := policy.CreatedAt.Clock() + hour, minute, sec := policy.CreatedAt.Clock() fmt.Println() fmt.Println(faint.Render(fmt.Sprintf("%-11s", "Policy")), policyStyle.Render(info.Policy)) fmt.Println( faint.Render(fmt.Sprintf("%-11s", "Created At")), - fmt.Sprintf("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, min, sec), + fmt.Sprintf("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, minute, sec), ) if len(policy.Allow) > 0 { fmt.Println(faint.Render(fmt.Sprintf("%-11s", "Allow"))) @@ -547,7 +547,7 @@ func infoIdentityCmd(args []string) { cli.Fatal(err) } year, month, day := info.CreatedAt.Date() - hour, min, sec := info.CreatedAt.Clock() + hour, minute, sec := info.CreatedAt.Clock() fmt.Println( faint.Render(fmt.Sprintf("%-11s", "Identity")), @@ -558,7 +558,7 @@ func infoIdentityCmd(args []string) { } fmt.Println( faint.Render(fmt.Sprintf("%-11s", "Created At")), - fmt.Sprintf("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, min, sec), + fmt.Sprintf("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, minute, sec), ) if info.IsAdmin { fmt.Println(faint.Render(fmt.Sprintf("%-11s", "Role")), "Admin") diff --git a/cmd/kes/key.go b/cmd/kes/key.go index b79915f2..d0a21367 100644 --- a/cmd/kes/key.go +++ b/cmd/kes/key.go @@ -251,12 +251,12 @@ func describeKeyCmd(args []string) { } year, month, day := info.CreatedAt.Date() - hour, min, sec := info.CreatedAt.Clock() + hour, minute, sec := info.CreatedAt.Clock() buf := &strings.Builder{} fmt.Fprintf(buf, "%-11s %s\n", "Name", info.Name) fmt.Fprintf(buf, "%-11s %s\n", "Algorithm", info.Algorithm) - fmt.Fprintf(buf, "%-11s %04d-%02d-%02d %02d:%02d:%02d\n", "Date", year, month, day, hour, min, sec) + fmt.Fprintf(buf, "%-11s %04d-%02d-%02d %02d:%02d:%02d\n", "Date", year, month, day, hour, minute, sec) fmt.Fprintf(buf, "%-11s %s", "Owner", info.CreatedBy) fmt.Print(buf) } diff --git a/cmd/kes/log.go b/cmd/kes/log.go index b170e7a9..ccb91bb1 100644 --- a/cmd/kes/log.go +++ b/cmd/kes/log.go @@ -135,11 +135,11 @@ func printAuditLog(stream *kes.AuditStream) { for stream.Next() { event := stream.Event() var ( - hour, min, sec = event.Timestamp.Clock() - status = strconv.Itoa(event.StatusCode) - identity = identityStyle.Render(event.ClientIdentity.String()) - apiPath = apiStyle.Render(event.APIPath) - latency = event.ResponseTime + hour, minute, sec = event.Timestamp.Clock() + status = strconv.Itoa(event.StatusCode) + identity = identityStyle.Render(event.ClientIdentity.String()) + apiPath = apiStyle.Render(event.APIPath) + latency = event.ResponseTime ) if event.StatusCode == http.StatusOK { @@ -167,7 +167,7 @@ func printAuditLog(stream *kes.AuditStream) { } ipAddr = ipStyle.Render(ipAddr) - fmt.Printf(format, hour, min, sec, status, identity, ipAddr, apiPath, latency) + fmt.Printf(format, hour, minute, sec, status, identity, ipAddr, apiPath, latency) } if err := stream.Close(); err != nil { if errors.Is(err, context.Canceled) { diff --git a/cmd/kes/policy.go b/cmd/kes/policy.go index fbe63703..478c49b9 100644 --- a/cmd/kes/policy.go +++ b/cmd/kes/policy.go @@ -224,10 +224,10 @@ func infoPolicyCmd(args []string) { fmt.Println(faint.Render(fmt.Sprintf("%-11s", "Name")), policyStyle.Render(name)) if !info.CreatedAt.IsZero() { year, month, day := info.CreatedAt.Local().Date() - hour, min, sec := info.CreatedAt.Local().Clock() + hour, minute, sec := info.CreatedAt.Local().Clock() fmt.Println( faint.Render(fmt.Sprintf("%-11s", "Date")), - fmt.Sprintf("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, min, sec), + fmt.Sprintf("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, minute, sec), ) } if !info.CreatedBy.IsUnknown() { @@ -335,8 +335,8 @@ func showPolicyCmd(args []string) { header := tui.NewStyle().Bold(true).Foreground(Cyan) if !policy.CreatedAt.IsZero() { year, month, day := policy.CreatedAt.Local().Date() - hour, min, sec := policy.CreatedAt.Local().Clock() - fmt.Printf("\n%s %04d-%02d-%02d %02d:%02d:%02d\n", header.Render("Created at:"), year, month, day, hour, min, sec) + hour, minute, sec := policy.CreatedAt.Local().Clock() + fmt.Printf("\n%s %04d-%02d-%02d %02d:%02d:%02d\n", header.Render("Created at:"), year, month, day, hour, minute, sec) } if !policy.CreatedBy.IsUnknown() { fmt.Println(header.Render("Created by:"), policy.CreatedBy)