Fix sorting of audit log (#91)

* Format all the things

Signed-off-by: Jan Steffen <[email protected]>

* Adjust sorting

Signed-off-by: Jan Steffen <[email protected]>

* Update dependency

Signed-off-by: Jan Steffen <[email protected]>

Author: jastBytes

cmd/monoctl/auth/status.go

@@ -17,9 +17,9 @@ package auth
 import (
 	"fmt"
 
-	"github.com/spf13/cobra"
 	"github.com/finleap-connect/monoctl/cmd/monoctl/flags"
 	"github.com/finleap-connect/monoctl/internal/config"
+	"github.com/spf13/cobra"
 )
 
 func NewAuthStatusCmd() *cobra.Command {

cmd/monoctl/create/cluster.go

@@ -21,12 +21,12 @@ import (
 	"io/ioutil"
 	"net/url"
 
-	"github.com/spf13/cobra"
 	"github.com/finleap-connect/monoctl/cmd/monoctl/flags"
 	"github.com/finleap-connect/monoctl/internal/config"
 	"github.com/finleap-connect/monoctl/internal/usecases"
 	auth_util "github.com/finleap-connect/monoctl/internal/util/auth"
 	"github.com/finleap-connect/monoskope/pkg/k8s"
+	"github.com/spf13/cobra"
 )
 
 func NewCreateClusterCmd() *cobra.Command {

cmd/monoctl/get/audit_log.go

@@ -17,9 +17,10 @@ package get
 import (
 	"context"
 	"fmt"
-	"github.com/finleap-connect/monoctl/internal/output"
 	"time"
 
+	"github.com/finleap-connect/monoctl/internal/output"
+
 	"github.com/finleap-connect/monoctl/cmd/monoctl/flags"
 	"github.com/finleap-connect/monoctl/internal/config"
 	"github.com/finleap-connect/monoctl/internal/usecases"
@@ -35,7 +36,9 @@ var (
 	now          = time.Now().UTC()
 	firstOfMonth = time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, time.UTC)
 	lastOfMonth  = firstOfMonth.AddDate(0, 1, -1)
-	dateInputErr = func(input string) error { return fmt.Errorf("%s is invalid.\nPlease make sure to use the correct date layout. Example: %s", input, now.Format(dateLayoutISO8601)) }
+	dateInputErr = func(input string) error {
+		return fmt.Errorf("%s is invalid.\nPlease make sure to use the correct date layout. Example: %s", input, now.Format(dateLayoutISO8601))
+	}
 )
 
 func getAuditLogOptions() (*output.AuditLogOptions, error) {
@@ -52,7 +55,7 @@ func NewGetAuditLogCmd() *cobra.Command {
 		Use:     "audit-log",
 		Aliases: []string{"audit"},
 		Short:   "Get audit log",
-		Long:    `Get audit log based on a date range. If no date range is specified the audit log of the current month will be returned. Please note that both input and output time is in UTC and should be considered when e.g. specifying the date range`,
+		Long:    `Get audit log within specified date range. If no date range is specified the audit log of the current month will be returned.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			auditLogOptions, err := getAuditLogOptions()
 			if err != nil {
@@ -72,9 +75,9 @@ func NewGetAuditLogCmd() *cobra.Command {
 
 	persistentFlags := cmd.PersistentFlags()
 	persistentFlags.StringVarP(&from, "from", "f", firstOfMonth.Format(dateLayoutISO8601),
-		fmt.Sprintf("Specifys the starting point of the date range. If not specified the first day of the current month is used. Accepted layout: %s", now.Format(dateLayoutISO8601)))
+		fmt.Sprintf("Specifies the starting point of the date range (UTC). If not specified the first day of the current month is used. Accepted layout: %s", now.Format(dateLayoutISO8601)))
 	persistentFlags.StringVarP(&to, "to", "t", lastOfMonth.Format(dateLayoutISO8601),
-		fmt.Sprintf("Specifys the ending point of the date range. If not specified the last day of the current month is used. Accepted layout: %s", now.Format(dateLayoutISO8601)))
+		fmt.Sprintf("Specifies the ending point of the date range (UTC). If not specified the last day of the current month is used. Accepted layout: %s", now.Format(dateLayoutISO8601)))
 
 	return cmd
 }

cmd/monoctl/get/audit_log_by_user.go

@@ -29,8 +29,8 @@ import (
 func NewGetAuditLogByUserCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "user [EMAIL]",
-		Short: "Get audit log by a user.",
-		Long:  `Get audit log by a user including information like who created the user, gave him/her roles and when`,
+		Short: "Get audit log about a user.",
+		Long:  `Get audit log about a user returns every information tied to the lifecycle of the given user`,
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if !strings.Contains(args[0], "@") {

cmd/monoctl/get/audit_log_user_actions.go

@@ -28,10 +28,10 @@ import (
 
 func NewGetAuditLogUserActionsCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "user-actions [EMAIL]",
-		Short:   "Get audit log of user actions.",
-		Long:    `Get audit log of everything a user has done. Please note that the date range is for now limited to one year max.`,
-		Args:    cobra.ExactArgs(1),
+		Use:   "user-actions [EMAIL]",
+		Short: "Get audit log of user actions.",
+		Long:  `Get audit log of everything a user has done. Please note that the date range is for now limited to one year max.`,
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if !strings.Contains(args[0], "@") {
 				return fmt.Errorf("'%s' is not a valid email", args[0])

cmd/monoctl/get/audit_log_users_overview.go

@@ -17,20 +17,21 @@ package get
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/finleap-connect/monoctl/cmd/monoctl/flags"
 	"github.com/finleap-connect/monoctl/internal/config"
 	"github.com/finleap-connect/monoctl/internal/usecases"
 	auth_util "github.com/finleap-connect/monoctl/internal/util/auth"
 	"github.com/spf13/cobra"
-	"time"
 )
 
 func NewGetAuditLogUsersOverviewCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "users-overview [TIMESTAMP]",
-		Short:   "Get audit log overview of all users at a timestamp.",
-		Long:    fmt.Sprintf(`Get audit log overview of all users at a timestamp, tenants/clusters they belong to, and their roles within the system or tenant/cluster. Accepted layout: %s`, now.Format(time.RFC3339)),
-		Args:    cobra.ExactArgs(1),
+		Use:   "users-overview [TIMESTAMP]",
+		Short: "Get audit log overview of all users at a given point in time.",
+		Long:  fmt.Sprintf(`Get audit log overview of all users at a given point in time, tenants/clusters they belong to, and their roles within the system or tenant/cluster. Accepted layout: %s`, now.Format(time.RFC3339)),
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			timestamp, err := time.Parse(time.RFC3339, args[0])
 			if err != nil {

cmd/monoctl/update/cluster.go

@@ -21,11 +21,11 @@ import (
 	"io/ioutil"
 	"net/url"
 
-	"github.com/spf13/cobra"
 	"github.com/finleap-connect/monoctl/cmd/monoctl/flags"
 	"github.com/finleap-connect/monoctl/internal/config"
 	"github.com/finleap-connect/monoctl/internal/usecases"
 	auth_util "github.com/finleap-connect/monoctl/internal/util/auth"
+	"github.com/spf13/cobra"
 )
 
 func NewUpdateClusterCmd() *cobra.Command {

cmd/monoctl/version.go

@@ -17,12 +17,12 @@ package main
 import (
 	"context"
 
-	"github.com/spf13/cobra"
 	"github.com/finleap-connect/monoctl/cmd/monoctl/flags"
 	"github.com/finleap-connect/monoctl/internal/config"
 	"github.com/finleap-connect/monoctl/internal/usecases"
 	auth_util "github.com/finleap-connect/monoctl/internal/util/auth"
 	"github.com/finleap-connect/monoctl/internal/version"
+	"github.com/spf13/cobra"
 )
 
 func NewVersionCmd() *cobra.Command {

go.mk

@@ -41,10 +41,13 @@ mod: ## Do go mod tidy, download, verify
 	$(GO) mod download
 	$(GO) mod verify
 
-vet: ## Do go ver
+fmt: ## Do go vet
+	$(GO) fmt ./...
+
+vet: ## Do go vet
 	$(GO) vet ./...
 
-go: mod vet lint test ## Do go mod / vet / lint /test
+go: mod fmt vet lint test ## Do go mod / fmt / vet / lint /test
 
 run: ## run monoctl, use `ARGS="get user"` to pass arguments
 	$(GO) run -ldflags "$(LDFLAGS)" cmd/monoctl/*.go $(ARGS)
@@ -72,7 +75,7 @@ gomock-get: ## download gomock
 	$(shell $(TOOLS_DIR)/goget-wrapper github.com/golang/mock/mockgen@$(GOMOCK_VERSION))
 
 lint: $(LINTER) ## go lint
-	$(LINTER) run -v -E goconst -E misspell
+	$(LINTER) run -v -E goconst -E misspell -E gofmt
 
 tools: golangci-lint-get ginkgo-get gomock-get  ## Target to install all required tools into TOOLS_DIR
 

go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/briandowns/spinner v1.18.1
-	github.com/finleap-connect/monoskope v0.4.0
+	github.com/finleap-connect/monoskope v0.4.4
 	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.2
 	github.com/google/uuid v1.3.0
@@ -51,7 +51,7 @@ require (
 	github.com/go-logr/zapr v1.2.3 // indirect
 	github.com/godbus/dbus/v5 v5.0.6 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/go-cmp v0.5.7 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/googleapis/gnostic v0.5.5 // indirect