remove ff, organize flags

Author: david049

app/account.go

@@ -28,6 +28,18 @@ const (
 )
 
 var (
+	// Kinesis audit log sink flags
+	roleNameFlag = &cli.StringFlag{
+		Name:     roleNameFlagName,
+		Usage:    "The role name to use to write to the sink",
+		Aliases:  []string{"rn"},
+		Required: true,
+	}
+	roleNameFlagOptional = &cli.StringFlag{
+		Name:    roleNameFlagName,
+		Usage:   "The role name to use to write to the sink",
+		Aliases: []string{"rn"},
+	}
 	destinationUriFlag = &cli.StringFlag{
 		Name:     destinationUriFlagName,
 		Usage:    "The destination URI of the audit log sink",
@@ -39,6 +51,19 @@ var (
 		Usage:   "The destination URI of the audit log sink",
 		Aliases: []string{"du"},
 	}
+	sinkRegionFlagRequired = &cli.StringFlag{
+		Name:     sinkRegionFlagName,
+		Usage:    "The region to use for the request",
+		Aliases:  []string{"re"},
+		Required: true,
+	}
+	sinkRegionFlagOptional = &cli.StringFlag{
+		Name:    sinkRegionFlagName,
+		Usage:   "The region to use for the request",
+		Aliases: []string{"re"},
+	}
+
+	// PubSub audit log sink flags
 	sinkServiceAccountEmailFlag = &cli.StringFlag{
 		Name:     sinkServiceAccountEmailFlagName,
 		Usage:    "The service account email to impersonate to write to the sink",
@@ -50,17 +75,6 @@ var (
 		Usage:   "The service account email to impersonate to write to the sink",
 		Aliases: []string{"sae"},
 	}
-	roleNameFlag = &cli.StringFlag{
-		Name:     roleNameFlagName,
-		Usage:    "The role name to use to write to the sink",
-		Aliases:  []string{"rn"},
-		Required: true,
-	}
-	roleNameFlagOptional = &cli.StringFlag{
-		Name:    roleNameFlagName,
-		Usage:   "The role name to use to write to the sink",
-		Aliases: []string{"rn"},
-	}
 	topicNameFlag = &cli.StringFlag{
 		Name:     topicNameFlagName,
 		Usage:    "The topic name to write to the sink",
@@ -72,17 +86,6 @@ var (
 		Usage:   "The topic name to write to the sink",
 		Aliases: []string{"tn"},
 	}
-	sinkRegionFlagRequired = &cli.StringFlag{
-		Name:     sinkRegionFlagName,
-		Usage:    "The region to use for the request",
-		Aliases:  []string{"re"},
-		Required: true,
-	}
-	sinkRegionFlagOptional = &cli.StringFlag{
-		Name:    sinkRegionFlagName,
-		Usage:   "The region to use for the request",
-		Aliases: []string{"re"},
-	}
 )
 
 type AccountClient struct {
@@ -867,8 +870,6 @@ func NewAccountCommand(getAccountClientFn GetAccountClientFn) (CommandOut, error
 		kinesisAuditLogCommands,
 		pubsubAuditLogCommands,
 	}
-	if IsFeatureEnabled(AuditLogSinkNewAPIFeatureFlag) {
-		commandOut.Command.Subcommands = append(commandOut.Command.Subcommands, auditLogCommands)
-	}
+	commandOut.Command.Subcommands = append(commandOut.Command.Subcommands, auditLogCommands)
 	return commandOut, nil
 }

app/account_test.go

@@ -38,11 +38,6 @@ type AccountTestSuite struct {
 }
 
 func (s *AccountTestSuite) SetupTest() {
-	if !IsFeatureEnabled(AuditLogSinkNewAPIFeatureFlag) {
-		err := toggleFeature(AuditLogSinkNewAPIFeatureFlag)
-		s.Require().NoError(err)
-	}
-
 	s.mockCtrl = gomock.NewController(s.T())
 	s.mockService = accountservicemock.NewMockAccountServiceClient(s.mockCtrl)
 	s.mockCloudApiClient = apimock.NewMockCloudServiceClient(s.mockCtrl)

app/feature.go

@@ -11,12 +11,11 @@ import (
 )
 
 var (
-	GCPSinkFeatureFlag            = "enable-gcp-sink"
-	AuditLogSinkNewAPIFeatureFlag = "enable-audit-log-sink-new-api"
-	featureflagFileName           = "feature.json"
+	GCPSinkFeatureFlag  = "enable-gcp-sink"
+	featureflagFileName = "feature.json"
 )
 
-var supportFeatureFlags = []string{GCPSinkFeatureFlag, AuditLogSinkNewAPIFeatureFlag}
+var supportFeatureFlags = []string{GCPSinkFeatureFlag}
 
 type FeatureFlag struct {
 	Name  string `json:"Name"`
@@ -155,14 +154,6 @@ func NewFeatureCommand() (CommandOut, error) {
 						return nil
 					},
 				},
-				{
-					Name:    "toggle-audit-log-sink-new-api",
-					Aliases: []string{"tal"},
-					Usage:   "switch audit log sink new api on/off",
-					Action: func(c *cli.Context) error {
-						return toggleFeature(AuditLogSinkNewAPIFeatureFlag)
-					},
-				},
 			},
 		},
 	}, nil