[FlyteCTL] enable kubectl-like configuration from multiple files

flytectl/cmd/config/subcommand/clusterresourceattribute/file_config.go

@@ -14,6 +14,8 @@ type AttrFileConfig struct {
 	*admin.ClusterResourceAttributes
 }
 
+var DefaultAttrFileConfig = &AttrFileConfig{}
+
 // Decorate decorator over ClusterResourceAttributes.
 func (c AttrFileConfig) Decorate() *admin.MatchingAttributes {
 	return &admin.MatchingAttributes{

flytectl/cmd/config/subcommand/executionclusterlabel/file_config.go

@@ -14,6 +14,8 @@ type FileConfig struct {
 	*admin.ExecutionClusterLabel
 }
 
+var DefaultFileConfig = &FileConfig{}
+
 // Decorate decorator over ExecutionClusterLabel.
 func (t FileConfig) Decorate() *admin.MatchingAttributes {
 	return &admin.MatchingAttributes{

flytectl/cmd/config/subcommand/executionqueueattribute/file_config.go

@@ -14,6 +14,8 @@ type AttrFileConfig struct {
 	*admin.ExecutionQueueAttributes
 }
 
+var DefaultAttrFileConfig = &AttrFileConfig{}
+
 // Decorate decorator over ExecutionQueueAttributes.
 func (a AttrFileConfig) Decorate() *admin.MatchingAttributes {
 	return &admin.MatchingAttributes{

flytectl/cmd/config/subcommand/plugin_override/file_config.go

@@ -14,6 +14,8 @@ type FileConfig struct {
 	*admin.PluginOverrides
 }
 
+var DefaultFileConfig = &FileConfig{}
+
 // Decorate decorator over PluginOverrides.
 func (t FileConfig) Decorate() *admin.MatchingAttributes {
 	return &admin.MatchingAttributes{

flytectl/cmd/config/subcommand/taskresourceattribute/file_config.go

@@ -14,6 +14,8 @@ type TaskResourceAttrFileConfig struct {
 	*admin.TaskResourceAttributes
 }
 
+var DefaultTaskResourceAttrFileConfig = &TaskResourceAttrFileConfig{}
+
 // Decorate decorator over TaskResourceAttributes.
 func (t TaskResourceAttrFileConfig) Decorate() *admin.MatchingAttributes {
 	return &admin.MatchingAttributes{

flytectl/cmd/config/subcommand/workflowexecutionconfig/file_config.go

@@ -14,6 +14,8 @@ type FileConfig struct {
 	*admin.WorkflowExecutionConfig
 }
 
+var DefaultFileConfig = &FileConfig{}
+
 // Decorate decorator over WorkflowExecutionConfig.
 func (t FileConfig) Decorate() *admin.MatchingAttributes {
 	return &admin.MatchingAttributes{

flytectl/cmd/config/update_config.go

@@ -0,0 +1,12 @@
+package config
+
+//go:generate pflags AttrUpdateConfig --default-var DefaultUpdateConfig --bind-default-var
+
+// AttrUpdateConfig Matchable resource attributes configuration passed from command line
+type AttrUpdateConfig struct {
+	AttrFile []string `json:"attrFile" pflag:",attribute file names to be used for updating attribute for the resource type."`
+	DryRun   bool     `json:"dryRun" pflag:",execute command without making any modifications."`
+	Force    bool     `json:"force" pflag:",do not ask for an acknowledgement during updates."`
+}
+
+var DefaultUpdateConfig = &AttrUpdateConfig{}

flytectl/cmd/testutils/test_utils.go

@@ -102,6 +102,22 @@ func (s *TestStruct) TearDownAndVerifyContains(t *testing.T, expectedLog string)
 	assert.Contains(t, sanitizeString(buf.String()), sanitizeString(expectedLog))
 }
 
+func (s *TestStruct) TearDownAndVerifyContainsSpecificCount(t *testing.T, expectedLog string, expectedCount int) {
+	if err := s.Writer.Close(); err != nil {
+		panic(fmt.Errorf("could not close test context writer: %w", err))
+	}
+
+	var buf bytes.Buffer
+	if _, err := io.Copy(&buf, s.Reader); err != nil {
+		panic(fmt.Errorf("could not read from test context reader: %w", err))
+	}
+
+	assert.Contains(t, sanitizeString(buf.String()), sanitizeString(expectedLog))
+
+	count := strings.Count(sanitizeString(buf.String()), sanitizeString(expectedLog))
+	assert.Equal(t, expectedCount, count)
+}
+
 // RandomName returns a string composed of random lowercase English letters of specified length.
 func RandomName(length int) string {
 	if length < 0 {

flytectl/cmd/update/matchable_cluster_resource_attribute.go

@@ -58,13 +58,16 @@ Usage
 
 func updateClusterResourceAttributesFunc(ctx context.Context, args []string, cmdCtx cmdCore.CommandContext) error {
 	updateConfig := clusterresourceattribute.DefaultUpdateConfig
-	if len(updateConfig.AttrFile) == 0 {
-		return fmt.Errorf("attrFile is mandatory while calling update for cluster resource attribute")
-	}
 
 	clustrResourceAttrFileConfig := clusterresourceattribute.AttrFileConfig{}
-	if err := sconfig.ReadConfigFromFile(&clustrResourceAttrFileConfig, updateConfig.AttrFile); err != nil {
-		return err
+	if updateConfig.AttrFile != "" {
+		if err := sconfig.ReadConfigFromFile(&clustrResourceAttrFileConfig, updateConfig.AttrFile); err != nil {
+			return err
+		}
+	} else if *clusterresourceattribute.DefaultAttrFileConfig == clustrResourceAttrFileConfig {
+		return fmt.Errorf("attrFile is mandatory while calling update for cluster resource attribute")
+	} else {
+		clustrResourceAttrFileConfig = *clusterresourceattribute.DefaultAttrFileConfig
 	}
 
 	// Get project domain workflow name from the read file.

flytectl/cmd/update/matchable_execution_cluster_label.go

@@ -51,13 +51,16 @@ Usage
 
 func updateExecutionClusterLabelFunc(ctx context.Context, args []string, cmdCtx cmdCore.CommandContext) error {
 	updateConfig := executionclusterlabel.DefaultUpdateConfig
-	if len(updateConfig.AttrFile) == 0 {
-		return fmt.Errorf("attrFile is mandatory while calling update for execution cluster label")
-	}
 
 	executionClusterLabelFileConfig := executionclusterlabel.FileConfig{}
-	if err := sconfig.ReadConfigFromFile(&executionClusterLabelFileConfig, updateConfig.AttrFile); err != nil {
-		return err
+	if updateConfig.AttrFile != "" {
+		if err := sconfig.ReadConfigFromFile(&executionClusterLabelFileConfig, updateConfig.AttrFile); err != nil {
+			return err
+		}
+	} else if *executionclusterlabel.DefaultFileConfig == executionClusterLabelFileConfig {
+		return fmt.Errorf("attrFile is mandatory while calling update for execution cluster label")
+	} else {
+		executionClusterLabelFileConfig = *executionclusterlabel.DefaultFileConfig
 	}
 
 	// Get project domain workflow name from the read file.

flytectl/cmd/update/matchable_execution_queue_attribute.go

@@ -62,13 +62,16 @@ Usage
 
 func updateExecutionQueueAttributesFunc(ctx context.Context, args []string, cmdCtx cmdCore.CommandContext) error {
 	updateConfig := executionqueueattribute.DefaultUpdateConfig
-	if len(updateConfig.AttrFile) == 0 {
-		return fmt.Errorf("attrFile is mandatory while calling update for execution queue attribute")
-	}
 
 	executionQueueAttrFileConfig := executionqueueattribute.AttrFileConfig{}
-	if err := sconfig.ReadConfigFromFile(&executionQueueAttrFileConfig, updateConfig.AttrFile); err != nil {
-		return err
+	if updateConfig.AttrFile != "" {
+		if err := sconfig.ReadConfigFromFile(&executionQueueAttrFileConfig, updateConfig.AttrFile); err != nil {
+			return err
+		}
+	} else if *executionqueueattribute.DefaultAttrFileConfig == executionQueueAttrFileConfig {
+		return fmt.Errorf("attrFile is mandatory while calling update for execution queue attribute")
+	} else {
+		executionQueueAttrFileConfig = *executionqueueattribute.DefaultAttrFileConfig
 	}
 
 	// Get project domain workflow name from the read file.

flytectl/cmd/update/matchable_plugin_override.go

@@ -64,13 +64,16 @@ Usage
 
 func updatePluginOverridesFunc(ctx context.Context, args []string, cmdCtx cmdCore.CommandContext) error {
 	updateConfig := pluginoverride.DefaultUpdateConfig
-	if len(updateConfig.AttrFile) == 0 {
-		return fmt.Errorf("attrFile is mandatory while calling update for plugin override")
-	}
 
 	pluginOverrideFileConfig := pluginoverride.FileConfig{}
-	if err := sconfig.ReadConfigFromFile(&pluginOverrideFileConfig, updateConfig.AttrFile); err != nil {
-		return err
+	if updateConfig.AttrFile != "" {
+		if err := sconfig.ReadConfigFromFile(&pluginOverrideFileConfig, updateConfig.AttrFile); err != nil {
+			return err
+		}
+	} else if *pluginoverride.DefaultFileConfig == pluginOverrideFileConfig {
+		return fmt.Errorf("attrFile is mandatory while calling update for plugin override")
+	} else {
+		pluginOverrideFileConfig = *pluginoverride.DefaultFileConfig
 	}
 
 	// Get project domain workflow name from the read file.