Skip to content

feat: toggle the enabled state of workers #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
NickJosevski wants to merge 2 commits into
base: nj/issue-311
Choose a base branch
from
Draft

feat: toggle the enabled state of workers #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
328af8c
refactor: generalise the enable/disable helper over targets and workers
NickJosevski Sep 15, 2026
bf83e07
feat: toggle the enabled state of workers
NickJosevski Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/cmd/target/azure-web-app/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func NewCmdCreate(f factory.Factory) *cobra.Command {
shared.RegisterCreateTargetRoleFlags(cmd, createFlags.CreateTargetRoleFlags)
shared.RegisterCreateTargetTenantFlags(cmd, createFlags.CreateTargetTenantFlags)
shared.RegisterCreateTargetWorkerPoolFlags(cmd, createFlags.WorkerPoolFlags)
machinescommon.RegisterCreateTargetDisabledFlags(cmd, createFlags.CreateTargetDisabledFlags)
machinescommon.RegisterCreateTargetDisabledFlags(cmd, createFlags.CreateTargetDisabledFlags, "deployment target")
machinescommon.RegisterWebFlag(cmd, createFlags.WebFlags)
return cmd
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/target/cloud-region/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func NewCmdCreate(f factory.Factory) *cobra.Command {
shared.RegisterCreateTargetRoleFlags(cmd, createFlags.CreateTargetRoleFlags)
shared.RegisterCreateTargetWorkerPoolFlags(cmd, createFlags.WorkerPoolFlags)
shared.RegisterCreateTargetTenantFlags(cmd, createFlags.CreateTargetTenantFlags)
machinescommon.RegisterCreateTargetDisabledFlags(cmd, createFlags.CreateTargetDisabledFlags)
machinescommon.RegisterCreateTargetDisabledFlags(cmd, createFlags.CreateTargetDisabledFlags, "deployment target")
machinescommon.RegisterWebFlag(cmd, createFlags.WebFlags)

return cmd
Expand Down
7 changes: 4 additions & 3 deletions pkg/cmd/target/disable/disable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package disable
import (
"github.com/MakeNowJust/heredoc/v2"
"github.com/OctopusDeploy/cli/pkg/cmd"
"github.com/OctopusDeploy/cli/pkg/cmd/target/shared"
"github.com/OctopusDeploy/cli/pkg/constants"
"github.com/OctopusDeploy/cli/pkg/factory"
"github.com/OctopusDeploy/cli/pkg/machinescommon"
"github.com/OctopusDeploy/cli/pkg/usage"
"github.com/spf13/cobra"
)
Expand All @@ -21,8 +21,9 @@ func NewCmdDisable(f factory.Factory) *cobra.Command {
%[1]s deployment-target disable 'web-server'
`, constants.ExecutableName),
RunE: func(c *cobra.Command, args []string) error {
opts := shared.NewSetDisabledStateOptions(args, cmd.NewDependencies(f, c), true)
return shared.SetDisabledState(opts)
dependencies := cmd.NewDependencies(f, c)
opts := machinescommon.NewSetDisabledStateOptions(args, dependencies, machinescommon.NewDeploymentTargetKind(dependencies), true)
return machinescommon.SetDisabledState(opts)
},
}
}
7 changes: 4 additions & 3 deletions pkg/cmd/target/enable/enable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package enable
import (
"github.com/MakeNowJust/heredoc/v2"
"github.com/OctopusDeploy/cli/pkg/cmd"
"github.com/OctopusDeploy/cli/pkg/cmd/target/shared"
"github.com/OctopusDeploy/cli/pkg/constants"
"github.com/OctopusDeploy/cli/pkg/factory"
"github.com/OctopusDeploy/cli/pkg/machinescommon"
"github.com/OctopusDeploy/cli/pkg/usage"
"github.com/spf13/cobra"
)
Expand All @@ -21,8 +21,9 @@ func NewCmdEnable(f factory.Factory) *cobra.Command {
%[1]s deployment-target enable 'web-server'
`, constants.ExecutableName),
RunE: func(c *cobra.Command, args []string) error {
opts := shared.NewSetDisabledStateOptions(args, cmd.NewDependencies(f, c), false)
return shared.SetDisabledState(opts)
dependencies := cmd.NewDependencies(f, c)
opts := machinescommon.NewSetDisabledStateOptions(args, dependencies, machinescommon.NewDeploymentTargetKind(dependencies), false)
return machinescommon.SetDisabledState(opts)
},
}
}
2 changes: 1 addition & 1 deletion pkg/cmd/target/kubernetes/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ func NewCmdCreate(f factory.Factory) *cobra.Command {
shared.RegisterCreateTargetWorkerPoolFlags(cmd, createFlags.WorkerPoolFlags)
shared.RegisterCreateTargetTenantFlags(cmd, createFlags.CreateTargetTenantFlags)
shared.RegisterCreateTargetRoleFlags(cmd, createFlags.CreateTargetRoleFlags)
machinescommon.RegisterCreateTargetDisabledFlags(cmd, createFlags.CreateTargetDisabledFlags)
machinescommon.RegisterCreateTargetDisabledFlags(cmd, createFlags.CreateTargetDisabledFlags, "deployment target")
machinescommon.RegisterWebFlag(cmd, createFlags.WebFlags)

return cmd
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/target/listening-tentacle/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func NewCmdCreate(f factory.Factory) *cobra.Command {
machinescommon.RegisterCreateTargetProxyFlags(cmd, createFlags.CreateTargetProxyFlags, "Listening Tentacle")
machinescommon.RegisterCreateTargetMachinePolicyFlags(cmd, createFlags.CreateTargetMachinePolicyFlags)
shared.RegisterCreateTargetTenantFlags(cmd, createFlags.CreateTargetTenantFlags)
machinescommon.RegisterCreateTargetDisabledFlags(cmd, createFlags.CreateTargetDisabledFlags)
machinescommon.RegisterCreateTargetDisabledFlags(cmd, createFlags.CreateTargetDisabledFlags, "deployment target")
machinescommon.RegisterWebFlag(cmd, createFlags.WebFlags)

return cmd
Expand Down
130 changes: 0 additions & 130 deletions pkg/cmd/target/shared/disabledstate.go
View file
Open in desktop

This file was deleted.

100 changes: 0 additions & 100 deletions pkg/cmd/target/shared/disabledstate_test.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/cmd/target/ssh/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func NewCmdCreate(f factory.Factory) *cobra.Command {
machinescommon.RegisterCreateTargetProxyFlags(cmd, createFlags.CreateTargetProxyFlags, "SSH target")
machinescommon.RegisterCreateTargetMachinePolicyFlags(cmd, createFlags.CreateTargetMachinePolicyFlags)
shared.RegisterCreateTargetTenantFlags(cmd, createFlags.CreateTargetTenantFlags)
machinescommon.RegisterCreateTargetDisabledFlags(cmd, createFlags.CreateTargetDisabledFlags)
machinescommon.RegisterCreateTargetDisabledFlags(cmd, createFlags.CreateTargetDisabledFlags, "deployment target")
machinescommon.RegisterWebFlag(cmd, createFlags.WebFlags)

return cmd
Expand Down
29 changes: 29 additions & 0 deletions pkg/cmd/worker/disable/disable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package disable

import (
"github.com/MakeNowJust/heredoc/v2"
"github.com/OctopusDeploy/cli/pkg/cmd"
"github.com/OctopusDeploy/cli/pkg/constants"
"github.com/OctopusDeploy/cli/pkg/factory"
"github.com/OctopusDeploy/cli/pkg/machinescommon"
"github.com/OctopusDeploy/cli/pkg/usage"
"github.com/spf13/cobra"
)

func NewCmdDisable(f factory.Factory) *cobra.Command {
return &cobra.Command{
Args: usage.MaximumNArgs(1),
Use: "disable [<name> | <id>]",
Short: "Disable a worker",
Long: "Disable a worker in Octopus Deploy",
Example: heredoc.Docf(`
%[1]s worker disable Workers-100
%[1]s worker disable 'build-worker'
`, constants.ExecutableName),
RunE: func(c *cobra.Command, args []string) error {
dependencies := cmd.NewDependencies(f, c)
opts := machinescommon.NewSetDisabledStateOptions(args, dependencies, machinescommon.NewWorkerKind(dependencies), true)
return machinescommon.SetDisabledState(opts)
},
}
}
Loading