Remove --no-read-only flag and make it closer to human nature

Author: guessi

cmd/flags.go

@@ -73,11 +73,6 @@ var Flags = []cli.Flag{
 		Usage:    "Filter events with ReadOnly=true",
 		Required: false,
 	},
-	&cli.BoolFlag{
-		Name:     "no-read-only",
-		Usage:    "Filter events with ReadOnly=false",
-		Required: false,
-	},
 	&cli.StringFlag{
 		Name:     "max-results",
 		Aliases:  []string{"n"},

cmd/wrapper.go

@@ -6,6 +6,11 @@ import (
 )
 
 func Wrapper(c *cli.Context) {
+	var isReadOnlyFlagSet bool
+	if c.IsSet("read-only") {
+		isReadOnlyFlagSet = true
+	}
+
 	utils.EventsHandler(
 		c.String("profile"),
 		c.String("region"),
@@ -18,8 +23,8 @@ func Wrapper(c *cli.Context) {
 		c.String("resource-type"),
 		c.String("event-source"),
 		c.String("access-key-id"),
+		isReadOnlyFlagSet,
 		c.Bool("read-only"),
-		c.Bool("no-read-only"),
 		c.Int("max-results"),
 		c.Bool("error-only"),
 		c.Bool("truncate-user-name"),

pkg/utils/handlers.go

@@ -14,17 +14,12 @@ import (
 	"github.com/jedib0t/go-pretty/v6/text"
 )
 
-func EventsHandler(profile, region string, startTime, endTime *time.Time, eventId, eventName, userName, resourceName, resourceType, eventSource, accessKeyId string, readOnly, noReadOnly bool, maxResults int, errorOnly, truncateUserName, truncateUserAgent bool) {
+func EventsHandler(profile, region string, startTime, endTime *time.Time, eventId, eventName, userName, resourceName, resourceType, eventSource, accessKeyId string, isReadOnlyFlagSet, readOnly bool, maxResults int, errorOnly, truncateUserName, truncateUserAgent bool) {
 	// do nothing if maxResults is invalid input
 	if maxResults <= 0 {
 		log.Fatalf("Can not pass --max-results with a value lower or equal to 0.\n")
 	}
 
-	// --read-only and --no-read-only should be mutually exclusive
-	if readOnly && noReadOnly {
-		log.Fatalf("Can not pass --read-only and --no-read-only at the same time.\n")
-	}
-
 	cfg, err := config.LoadDefaultConfig(
 		context.TODO(),
 		config.WithRegion(region),
@@ -42,8 +37,8 @@ func EventsHandler(profile, region string, startTime, endTime *time.Time, eventI
 		LookupAttributes: composeLookupAttributesInput(
 			eventId,
 			eventName,
+			isReadOnlyFlagSet,
 			readOnly,
-			noReadOnly,
 			userName,
 			resourceName,
 			resourceType,

pkg/utils/utils.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"context"
+	"strconv"
 	"strings"
 	"unicode/utf8"
 
@@ -79,7 +80,7 @@ func LookupEvents(ctx context.Context, svc *cloudtrail.Client, input *cloudtrail
 	return events[:returnSize], nil
 }
 
-func composeLookupAttributesInput(eventId, eventName string, readOnly, noReadOnly bool, userName, resourceName, resourceType, eventSource, accessKeyId string) []ctypes.LookupAttribute {
+func composeLookupAttributesInput(eventId, eventName string, isReadOnlyFlagSet, readOnly bool, userName, resourceName, resourceType, eventSource, accessKeyId string) []ctypes.LookupAttribute {
 	lookupAttributesInput := []ctypes.LookupAttribute{}
 
 	// LookupAttributeKeyEventId
@@ -101,23 +102,14 @@ func composeLookupAttributesInput(eventId, eventName string, readOnly, noReadOnl
 	}
 
 	// LookupAttributeKeyReadOnly
-	var shouldPassReadonly bool
-	var lookupAttributeKeyReadOnlyValue *string
-	if readOnly != noReadOnly {
-		shouldPassReadonly = true
-		if readOnly {
-			lookupAttributeKeyReadOnlyValue = aws.String("true")
-		}
-		if noReadOnly {
-			lookupAttributeKeyReadOnlyValue = aws.String("false")
-		}
-	}
-	if shouldPassReadonly {
-		attrReadOnly := ctypes.LookupAttribute{
-			AttributeKey:   ctypes.LookupAttributeKeyReadOnly,
-			AttributeValue: lookupAttributeKeyReadOnlyValue,
-		}
-		lookupAttributesInput = append(lookupAttributesInput, attrReadOnly)
+	if isReadOnlyFlagSet {
+		lookupAttributesInput = append(
+			lookupAttributesInput,
+			ctypes.LookupAttribute{
+				AttributeKey:   ctypes.LookupAttributeKeyReadOnly,
+				AttributeValue: aws.String(strconv.FormatBool(readOnly)),
+			},
+		)
 	}
 
 	// LookupAttributeKeyUsername