Skip to content

Include Default Worker Pool for Azure Web App targets #603

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

Open
benPearce1 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Include Default Worker Pool for Azure Web App targets #603

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
9729c98
fix: added azure default worker pool to deployment-target view command
benPearce1 May 15, 2026
bb5d7c5
fix: added default worker pool to deployment-target azure-web-app vie…
benPearce1 May 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
22 changes: 22 additions & 0 deletions pkg/cmd/target/shared/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package shared

import (
"fmt"

"github.com/OctopusDeploy/cli/pkg/cmd"
"github.com/OctopusDeploy/cli/pkg/machinescommon"
"github.com/OctopusDeploy/cli/pkg/output"
Expand Down Expand Up @@ -87,6 +88,15 @@ func ViewRun(opts *ViewOptions, contributeEndpoint ContributeEndpointCallback, d
data = append(data, output.NewDataRow("Tenant Tags", "None"))
}

if endpoint, ok := target.Endpoint.(*machines.AzureWebAppEndpoint); ok {
workerPoolName := "None"
if endpoint.DefaultWorkerPoolID != "" {
workerPoolMap, _ := GetWorkerPoolMap(opts)
workerPoolName = resolveValues([]string{endpoint.DefaultWorkerPoolID}, workerPoolMap)[0]
}
data = append(data, output.NewDataRow("Default Worker Pool", workerPoolName))
}

t := output.NewTable(opts.Out)
for _, row := range data {
t.AddRow(row.Name, row.Value)
Expand Down Expand Up @@ -142,6 +152,18 @@ func GetEnvironmentMap(opts *ViewOptions) (map[string]string, error) {
return environmentMap, nil
}

func GetWorkerPoolMap(opts *ViewOptions) (map[string]string, error) {
workerPoolMap := make(map[string]string)
allWorkerPools, err := opts.Client.WorkerPools.GetAll()
if err != nil {
return nil, err
}
for _, wp := range allWorkerPools {
workerPoolMap[wp.ID] = wp.Name
}
return workerPoolMap, nil
}

func GetTenantMap(opts *ViewOptions) (map[string]string, error) {
tenantMap := make(map[string]string)
allEnvs, err := opts.Client.Tenants.GetAll()
Expand Down
54 changes: 49 additions & 5 deletions pkg/cmd/target/view/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,13 @@ func ViewRun(opts *shared.ViewOptions) error {

return output.PrintResource(target, opts.Command, output.Mappers[*machines.DeploymentTarget]{
Json: func(t *machines.DeploymentTarget) any {
if target.Endpoint.GetCommunicationStyle() == "AzureWebApp" {
return getAzureDeploymentTargetAsJson(opts, t)
}
return getDeploymentTargetAsJson(opts, t)
},
Table: output.TableDefinition[*machines.DeploymentTarget]{
Header: []string{"NAME", "TYPE", "HEALTH", "ENVIRONMENTS", "ROLES", "TENANTS", "TENANT TAGS", "ENDPOINT DETAILS"},
Header: []string{"NAME", "TYPE", "HEALTH", "ENVIRONMENTS", "ROLES", "TENANTS", "TENANT TAGS", "ENDPOINT DETAILS", "DEFAULT WORKER POOL"},
Row: func(t *machines.DeploymentTarget) []string {
return getDeploymentTargetAsTableRow(opts, t)
},
Expand All @@ -74,14 +77,19 @@ type DeploymentTargetAsJson struct {
WebUrl string `json:"WebUrl"`
}

type AzureDeploymentTargetAsJson struct {
DeploymentTargetAsJson
DefaultWorkerPool string `json:"DefaultWorkerPool"`
}

func getDeploymentTargetAsJson(opts *shared.ViewOptions, target *machines.DeploymentTarget) DeploymentTargetAsJson {
environmentMap, _ := shared.GetEnvironmentMap(opts)
tenantMap, _ := shared.GetTenantMap(opts)

environments := resolveValues(target.EnvironmentIDs, environmentMap)
tenants := resolveValues(target.TenantIDs, tenantMap)

endpointDetails := getEndpointDetails(target)
endpointDetails := getEndpointDetails(target, opts)

return DeploymentTargetAsJson{
Id: target.GetID(),
Expand All @@ -98,6 +106,17 @@ func getDeploymentTargetAsJson(opts *shared.ViewOptions, target *machines.Deploy
}
}

func getAzureDeploymentTargetAsJson(opts *shared.ViewOptions, target *machines.DeploymentTarget) AzureDeploymentTargetAsJson {
deploymentTargetAsJson := getDeploymentTargetAsJson(opts, target)
workerPool := resolveDefaultWorkerPool(target, opts)
var azureTargetAsJson = AzureDeploymentTargetAsJson{
DeploymentTargetAsJson: deploymentTargetAsJson,
DefaultWorkerPool: workerPool,
}
return azureTargetAsJson

}

func getDeploymentTargetAsTableRow(opts *shared.ViewOptions, target *machines.DeploymentTarget) []string {
environmentMap, _ := shared.GetEnvironmentMap(opts)
environments := resolveValues(target.EnvironmentIDs, environmentMap)
Expand All @@ -120,7 +139,7 @@ func getDeploymentTargetAsTableRow(opts *shared.ViewOptions, target *machines.De
}

// Handle endpoint details
endpointDetails := getEndpointDetails(target)
endpointDetails := getEndpointDetails(target, opts)
var endpointDetailsStr strings.Builder
first := true
for key, value := range endpointDetails {
Expand All @@ -135,6 +154,8 @@ func getDeploymentTargetAsTableRow(opts *shared.ViewOptions, target *machines.De
endpointDetailsString = "-"
}

workerPool := resolveDefaultWorkerPool(target, opts)

return []string{
output.Bold(target.Name),
targetType,
Expand All @@ -144,6 +165,7 @@ func getDeploymentTargetAsTableRow(opts *shared.ViewOptions, target *machines.De
tenants,
tenantTags,
endpointDetailsString,
workerPool,
}
}

Expand Down Expand Up @@ -203,7 +225,7 @@ func getDeploymentTargetAsBasic(opts *shared.ViewOptions, target *machines.Deplo
result.WriteString(fmt.Sprintf("Type: %s\n", output.Cyan(targetType)))

// Add endpoint-specific details
endpointDetails := getEndpointDetails(target)
endpointDetails := getEndpointDetails(target, opts)
for key, value := range endpointDetails {
result.WriteString(fmt.Sprintf("%s: %s\n", key, value))
}
Expand Down Expand Up @@ -232,6 +254,15 @@ func getDeploymentTargetAsBasic(opts *shared.ViewOptions, target *machines.Deplo
result.WriteString("Tenant Tags: None\n")
}

// default worker pool
if target.Endpoint.GetCommunicationStyle() == "AzureWebApp" {
workerPool := resolveDefaultWorkerPool(target, opts)
if workerPool == "" {
workerPool = "None"
}
result.WriteString(fmt.Sprintf("Default Worker Pool: %s\n", workerPool))
}

// Web URL
url := util.GenerateWebURL(opts.Host, target.SpaceID, fmt.Sprintf("infrastructure/machines/%s/settings", target.GetID()))
result.WriteString(fmt.Sprintf("\nView this deployment target in Octopus Deploy: %s\n", output.Blue(url)))
Expand All @@ -256,7 +287,7 @@ func resolveValues(keys []string, lookup map[string]string) []string {
return values
}

func getEndpointDetails(target *machines.DeploymentTarget) map[string]string {
func getEndpointDetails(target *machines.DeploymentTarget, opts *shared.ViewOptions) map[string]string {
Copy link
Copy Markdown
Contributor

@mik-ky mik-ky May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like opts isn't used

details := make(map[string]string)

switch target.Endpoint.GetCommunicationStyle() {
Expand Down Expand Up @@ -299,3 +330,16 @@ func getEndpointDetails(target *machines.DeploymentTarget) map[string]string {

return details
}

func resolveDefaultWorkerPool(target *machines.DeploymentTarget, opts *shared.ViewOptions) string {
if endpoint, ok := target.Endpoint.(*machines.AzureWebAppEndpoint); ok {
if endpoint.DefaultWorkerPoolID != "" {
workerPoolMap, _ := shared.GetWorkerPoolMap(opts)
return resolveValues([]string{endpoint.DefaultWorkerPoolID}, workerPoolMap)[0]
} else {
return ""
Copy link
Copy Markdown
Contributor

@mik-ky mik-ky May 15, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: else is redundant and we can just return empty string without it

}
}

return "N/A"
Copy link
Copy Markdown
Contributor

@mik-ky mik-ky May 15, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this would return "N/A" for non azure web app targets - what about other targets that have worker pool?

}
Loading