rename publisher config (#4569)

rename from 
```
jobdefaults.batch.task.publisher.config.params
jobdefaults.batch.task.publisher.config.type
jobdefaults.ops.task.publisher.config.params
jobdefaults.ops.task.publisher.config.type
```

to 
```
jobdefaults.batch.task.publisher.params
jobdefaults.batch.task.publisher.type
jobdefaults.ops.task.publisher.params
jobdefaults.ops.task.publisher.type
```

Author: wdbaruni

cmd/util/flags/configflags/publishing.go

@@ -14,8 +14,8 @@ var PublishingFlags = []Definition{
 		DefaultValue: "",
 		Deprecated:   true,
 		DeprecatedMessage: fmt.Sprintf("Use one or more of the following options, all are accepted %s, %s",
-			makeConfigFlagDeprecationCommand(types.JobDefaultsBatchTaskPublisherConfigTypeKey),
-			makeConfigFlagDeprecationCommand(types.JobDefaultsOpsTaskPublisherConfigParamsKey),
+			makeConfigFlagDeprecationCommand(types.JobDefaultsBatchTaskPublisherTypeKey),
+			makeConfigFlagDeprecationCommand(types.JobDefaultsOpsTaskPublisherParamsKey),
 		),
 	},
 }

pkg/config/config.go

@@ -185,8 +185,8 @@ func New(opts ...Option) (*Config, error) {
 					// allow the deprecated --default-publisher flag to bind to related fields in the config.
 					for _, key := range []string{
 						// config keys we wish to bind --default-publisher flag to.
-						types.JobDefaultsBatchTaskPublisherConfigTypeKey,
-						types.JobDefaultsOpsTaskPublisherConfigTypeKey,
+						types.JobDefaultsBatchTaskPublisherTypeKey,
+						types.JobDefaultsOpsTaskPublisherTypeKey,
 					} {
 						if err := c.base.BindPFlag(key, flag); err != nil {
 							return nil, fmt.Errorf("binding flag %q to config: %w", name, err)

pkg/config/types/generated_constants.go

@@ -89,17 +89,17 @@ const JobDefaultsBatchTaskResourcesCPUKey = "jobdefaults.batch.task.resources.cp
 const JobDefaultsBatchTaskResourcesMemoryKey = "jobdefaults.batch.task.resources.memory"
 const JobDefaultsBatchTaskResourcesDiskKey = "jobdefaults.batch.task.resources.disk"
 const JobDefaultsBatchTaskResourcesGPUKey = "jobdefaults.batch.task.resources.gpu"
-const JobDefaultsBatchTaskPublisherConfigTypeKey = "jobdefaults.batch.task.publisher.config.type"
-const JobDefaultsBatchTaskPublisherConfigParamsKey = "jobdefaults.batch.task.publisher.config.params"
+const JobDefaultsBatchTaskPublisherTypeKey = "jobdefaults.batch.task.publisher.type"
+const JobDefaultsBatchTaskPublisherParamsKey = "jobdefaults.batch.task.publisher.params"
 const JobDefaultsBatchTaskTimeoutsTotalTimeoutKey = "jobdefaults.batch.task.timeouts.totaltimeout"
 const JobDefaultsBatchTaskTimeoutsExecutionTimeoutKey = "jobdefaults.batch.task.timeouts.executiontimeout"
 const JobDefaultsOpsPriorityKey = "jobdefaults.ops.priority"
 const JobDefaultsOpsTaskResourcesCPUKey = "jobdefaults.ops.task.resources.cpu"
 const JobDefaultsOpsTaskResourcesMemoryKey = "jobdefaults.ops.task.resources.memory"
 const JobDefaultsOpsTaskResourcesDiskKey = "jobdefaults.ops.task.resources.disk"
 const JobDefaultsOpsTaskResourcesGPUKey = "jobdefaults.ops.task.resources.gpu"
-const JobDefaultsOpsTaskPublisherConfigTypeKey = "jobdefaults.ops.task.publisher.config.type"
-const JobDefaultsOpsTaskPublisherConfigParamsKey = "jobdefaults.ops.task.publisher.config.params"
+const JobDefaultsOpsTaskPublisherTypeKey = "jobdefaults.ops.task.publisher.type"
+const JobDefaultsOpsTaskPublisherParamsKey = "jobdefaults.ops.task.publisher.params"
 const JobDefaultsOpsTaskTimeoutsTotalTimeoutKey = "jobdefaults.ops.task.timeouts.totaltimeout"
 const JobDefaultsOpsTaskTimeoutsExecutionTimeoutKey = "jobdefaults.ops.task.timeouts.executiontimeout"
 const JobDefaultsDaemonPriorityKey = "jobdefaults.daemon.priority"

pkg/config/types/generated_descriptions.go

@@ -19,9 +19,9 @@ type BatchJobDefaultsConfig struct {
 }
 
 type BatchTaskDefaultConfig struct {
-	Resources ResourcesConfig        `yaml:"Resources,omitempty"`
-	Publisher DefaultPublisherConfig `yaml:"Publisher,omitempty"`
-	Timeouts  TaskTimeoutConfig      `yaml:"Timeouts,omitempty"`
+	Resources ResourcesConfig   `yaml:"Resources,omitempty"`
+	Publisher models.SpecConfig `yaml:"Publisher,omitempty"`
+	Timeouts  TaskTimeoutConfig `yaml:"Timeouts,omitempty"`
 }
 
 type ResourcesConfig struct {
@@ -46,10 +46,6 @@ type ResourcesConfig struct {
 	GPU string `yaml:"GPU,omitempty"`
 }
 
-type DefaultPublisherConfig struct {
-	Config models.SpecConfig `yaml:"Config,omitempty"`
-}
-
 type TaskTimeoutConfig struct {
 	// TotalTimeout is the maximum total time allowed for a task
 	TotalTimeout Duration `yaml:"TotalTimeout,omitempty"`

pkg/config/types/jobdefaults.go

@@ -69,8 +69,8 @@ func applyBatchTaskDefaults(defaults types.BatchTaskDefaultConfig, task *models.
 		task.ResourcesConfig.GPU = defaults.Resources.GPU
 	}
 	// if the user didn't provide a publisher, and a default transformer is set - use it.
-	if task.Publisher.IsEmpty() && !defaults.Publisher.Config.IsEmpty() {
-		task.Publisher = &defaults.Publisher.Config
+	if task.Publisher.IsEmpty() && !defaults.Publisher.IsEmpty() {
+		task.Publisher = &defaults.Publisher
 	}
 	if task.Timeouts.ExecutionTimeout <= 0 {
 		task.Timeouts.ExecutionTimeout = int64(time.Duration(defaults.Timeouts.ExecutionTimeout).Seconds())

pkg/orchestrator/transformer/job.go

@@ -55,7 +55,7 @@ func (s *DefaultPublisherSuite) TestNoDefaultPublisher() {
 
 func (s *DefaultPublisherSuite) TestDefaultPublisher() {
 	stack := &scenario.StackConfig{}
-	stack.JobDefaults.Batch.Task.Publisher.Config = *local.NewSpecConfig()
+	stack.JobDefaults.Batch.Task.Publisher = *local.NewSpecConfig()
 	testcase := scenario.Scenario{
 		Job: &models.Job{
 			Name:  s.T().Name(),