[RM-5835] Support for always enabled flag (#38)

* generated swagger

* always enabled in families

* Fixed list with always enabled

* Added release version

Makefile

@@ -67,6 +67,8 @@ gen: $(SWAGGER)
 	sed -i "" "s/float64/int64/g" $(INVITE_SRC)
 	sed -i "" "s/Recommended bool/Recommended *bool/g" $(UPDATE_FAMILY_SRC)
 	sed -i "" "s/Recommended bool/Recommended *bool/g" $(CREATE_FAMILY_SRC)
+	sed -i "" "s/AlwaysEnabled bool/AlwaysEnabled *bool/g" $(UPDATE_FAMILY_SRC)
+	sed -i "" "s/AlwaysEnabled bool/AlwaysEnabled *bool/g" $(CREATE_FAMILY_SRC)
 
 .PHONY: test
 test:

VERSION

@@ -1 +1 @@
-0.15.0
+0.16.0

cmd/createFamily.go

@@ -11,10 +11,11 @@ import (
 )
 
 type createFamilyOptions struct {
-	Name        string
-	Description string
-	Recommended bool
-	RuleIDs     []string
+	Name          string
+	Description   string
+	Recommended   bool
+	AlwaysEnabled bool
+	RuleIDs       []string
 }
 
 // NewCreateFamilyCommand returns a command that creates a family
@@ -31,10 +32,11 @@ func NewCreateFamilyCommand() *cobra.Command {
 
 			params := families.NewCreateFamilyParams()
 			params.Family = &models.CreateFamilyInput{
-				Name:        opts.Name,
-				Description: opts.Description,
-				Recommended: &opts.Recommended,
-				RuleIds:     opts.RuleIDs,
+				Name:          opts.Name,
+				Description:   opts.Description,
+				Recommended:   &opts.Recommended,
+				AlwaysEnabled: &opts.AlwaysEnabled,
+				RuleIds:       opts.RuleIDs,
 			}
 
 			resp, err := client.Families.CreateFamily(params, auth)
@@ -68,6 +70,7 @@ func NewCreateFamilyCommand() *cobra.Command {
 				Item{"DESCRIPTION", family.Description},
 				itemProviders,
 				Item{"RECOMMENDED", family.Recommended},
+				Item{"ALWAYS_ENABLED", family.AlwaysEnabled},
 				itemRules,
 				Item{"CREATED_AT", format.Unix(family.CreatedAt)},
 				Item{"CREATED_BY", family.CreatedBy},
@@ -94,6 +97,7 @@ func NewCreateFamilyCommand() *cobra.Command {
 	cmd.Flags().StringVar(&opts.Name, "name", "", "Family name")
 	cmd.Flags().StringVar(&opts.Description, "description", "", "Description")
 	cmd.Flags().BoolVar(&opts.Recommended, "recommended", true, "If the family is recommended for all new environments")
+	cmd.Flags().BoolVar(&opts.AlwaysEnabled, "always-enabled", false, "If the family will automatically be enabled on all environments within the tenant")
 	cmd.Flags().StringSliceVar(&opts.RuleIDs, "rule-ids", []string{}, "List of rule IDs to associate with the family (e.g. FG_R00217,<UUID Custom Rule ID>)")
 
 	cmd.MarkFlagRequired("name")

cmd/getFamily.go

@@ -47,6 +47,7 @@ func NewGetFamilyCommand() *cobra.Command {
 				Item{"SOURCE", family.Source},
 				itemProviders,
 				Item{"RECOMMENDED", family.Recommended},
+				Item{"ALWAYS_ENABLED", family.AlwaysEnabled},
 				itemRules,
 				Item{"CREATED_AT", format.Unix(family.CreatedAt)},
 				Item{"CREATED_BY", family.CreatedBy},

cmd/listFamilies.go

@@ -12,32 +12,34 @@ import (
 )
 
 type listFamiliesOptions struct {
-	Columns           []string
-	IDFilter          string
-	NameFilter        string
-	DescriptionFilter string
-	SourceFilter      string
-	ProvidersFilter   string
-	RecommendedFilter string
-	SearchQuery       string
-	Offset            int64
-	MaxItems          int64
-	OrderBy           string
-	OrderDirection    string
-	FetchAll          bool
+	Columns             []string
+	IDFilter            string
+	NameFilter          string
+	DescriptionFilter   string
+	SourceFilter        string
+	ProvidersFilter     string
+	RecommendedFilter   string
+	AlwaysEnabledFilter string
+	SearchQuery         string
+	Offset              int64
+	MaxItems            int64
+	OrderBy             string
+	OrderDirection      string
+	FetchAll            bool
 }
 
 type listFamiliesViewItem struct {
-	ID          string
-	Name        string
-	Source      string
-	Description string
-	Providers   string
-	Recommended bool
-	CreatedAt   string
-	CreatedBy   string
-	UpdatedAt   string
-	UpdatedBy   string
+	ID            string
+	Name          string
+	Source        string
+	Description   string
+	Providers     string
+	Recommended   bool
+	AlwaysEnabled bool
+	CreatedAt     string
+	CreatedBy     string
+	UpdatedAt     string
+	UpdatedBy     string
 }
 
 // NewListFamiliesCommand returns a command that lists families in Fugue
@@ -88,6 +90,9 @@ func NewListFamiliesCommand() *cobra.Command {
 			if opts.RecommendedFilter != "" {
 				searchParams = append(searchParams, fmt.Sprintf("recommended:%s", opts.RecommendedFilter))
 			}
+			if opts.AlwaysEnabledFilter != "" {
+				searchParams = append(searchParams, fmt.Sprintf("always_enabled:%s", opts.AlwaysEnabledFilter))
+			}
 
 			var familiesList []*models.Family
 			offset := opts.Offset
@@ -134,16 +139,17 @@ func NewListFamiliesCommand() *cobra.Command {
 
 				rows = append(rows, listFamiliesViewItem{
 
-					ID:          family.ID,
-					Name:        family.Name,
-					Source:      family.Source,
-					Description: description,
-					Providers:   providers,
-					Recommended: family.Recommended,
-					CreatedAt:   format.Unix(family.CreatedAt),
-					CreatedBy:   family.CreatedBy,
-					UpdatedAt:   format.Unix(family.UpdatedAt),
-					UpdatedBy:   family.UpdatedBy,
+					ID:            family.ID,
+					Name:          family.Name,
+					Source:        family.Source,
+					Description:   description,
+					Providers:     providers,
+					Recommended:   family.Recommended,
+					AlwaysEnabled: family.AlwaysEnabled,
+					CreatedAt:     format.Unix(family.CreatedAt),
+					CreatedBy:     family.CreatedBy,
+					UpdatedAt:     format.Unix(family.UpdatedAt),
+					UpdatedBy:     family.UpdatedBy,
 				})
 
 			}
@@ -168,15 +174,17 @@ func NewListFamiliesCommand() *cobra.Command {
 		"Description",
 		"Providers",
 		"Recommended",
+		"AlwaysEnabled",
 	}
 
-	cmd.Flags().StringVar(&opts.SearchQuery, "search", "", "Combined filter for Id, Name, Description, Provider, Source and Recommended")
+	cmd.Flags().StringVar(&opts.SearchQuery, "search", "", "Combined filter for Id, Name, Description, Provider, Source, Recommended and AlwaysEnabled")
 	cmd.Flags().StringVar(&opts.IDFilter, "id", "", "ID filter (substring match, case sensitive)")
 	cmd.Flags().StringVar(&opts.NameFilter, "name", "", "Name filter (substring match, case insensitive)")
 	cmd.Flags().StringVar(&opts.DescriptionFilter, "description", "", "Description filter (substring match, case insensitive)")
 	cmd.Flags().StringVar(&opts.SourceFilter, "source", "", "Source filter (substring match, case insensitive)")
 	cmd.Flags().StringVar(&opts.ProvidersFilter, "providers", "", "Providers filter (substring match, case insensitive)")
 	cmd.Flags().StringVar(&opts.RecommendedFilter, "recommended", "", "Recommended filter (substring match, case insensitive)")
+	cmd.Flags().StringVar(&opts.AlwaysEnabledFilter, "always-enabled", "", "AlwaysEnabled filter (substring match, case insensitive)")
 
 	cmd.Flags().StringSliceVar(&opts.Columns, "columns", defaultCols, "Columns to show")
 	cmd.Flags().Int64Var(&opts.Offset, "offset", 0, "Offset into results")

cmd/updateFamily.go

@@ -14,10 +14,11 @@ import (
 )
 
 type updateFamilyOptions struct {
-	Name        string
-	Description string
-	Recommended bool
-	RuleIDs     []string
+	Name          string
+	Description   string
+	Recommended   bool
+	AlwaysEnabled bool
+	RuleIDs       []string
 }
 
 // NewUpdateFamilyCommand returns a command that updates a custom family
@@ -49,6 +50,8 @@ func NewUpdateFamilyCommand() *cobra.Command {
 					params.Family.Description = opts.Description
 				case "recommended":
 					params.Family.Recommended = &opts.Recommended
+				case "always-enabled":
+					params.Family.AlwaysEnabled = &opts.AlwaysEnabled
 				case "rule-ids":
 					params.Family.RuleIds = opts.RuleIDs
 				}
@@ -81,6 +84,7 @@ func NewUpdateFamilyCommand() *cobra.Command {
 				Item{"DESCRIPTION", family.Description},
 				itemProviders,
 				Item{"RECOMMENDED", family.Recommended},
+				Item{"ALWAYS_ENABLED", family.AlwaysEnabled},
 				itemRules,
 				Item{"CREATED_AT", format.Unix(family.CreatedAt)},
 				Item{"CREATED_BY", family.CreatedBy},
@@ -107,6 +111,7 @@ func NewUpdateFamilyCommand() *cobra.Command {
 	cmd.Flags().StringVar(&opts.Name, "name", "", "Family name")
 	cmd.Flags().StringVar(&opts.Description, "description", "", "Description")
 	cmd.Flags().BoolVar(&opts.Recommended, "recommended", true, "If the family is recommended for all new environments")
+	cmd.Flags().BoolVar(&opts.AlwaysEnabled, "always-enabled", false, "If the family will automatically be enabled on all environments within the tenant")
 	cmd.Flags().StringSliceVar(&opts.RuleIDs, "rule-ids", []string{}, "List of rule IDs to associate with the family (e.g. FG_R00217,<UUID Custom Rule ID>)")
 
 	return cmd