Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
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 go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/AlecAivazis/survey/v2 v2.3.7
github.com/MakeNowJust/heredoc/v2 v2.0.1
github.com/OctopusDeploy/go-octodiff v1.0.0
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.65.4
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.70.1
github.com/bmatcuk/doublestar/v4 v4.4.0
github.com/briandowns/spinner v1.19.0
github.com/google/uuid v1.3.0
Expand Down
6 changes: 2 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,8 @@ github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63n
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
github.com/OctopusDeploy/go-octodiff v1.0.0 h1:U+ORg6azniwwYo+O44giOw6TiD5USk8S4VDhOQ0Ven0=
github.com/OctopusDeploy/go-octodiff v1.0.0/go.mod h1:Mze0+EkOWTgTmi8++fyUc6r0aLZT7qD9gX+31t8MmIU=
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.65.3 h1:qZfyylXCIXPKRwUwG3fsyhubQblKZBfxphQDJg5Uf/k=
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.65.3/go.mod h1:ZCOnCz9ae/uuOk7AIQ9NzjnzFbuN8Q7H3oj2Eq4QSgQ=
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.65.4 h1:2y0wbmPT5D1MD2Xvyme0GZXkGF41Y9J84HP5PKkUEQI=
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.65.4/go.mod h1:ZCOnCz9ae/uuOk7AIQ9NzjnzFbuN8Q7H3oj2Eq4QSgQ=
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.70.1 h1:aW1K0utvdDPSRElTnvp40Xs9oPmJR6IyPAT6PBvPSJs=
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.70.1/go.mod h1:ZCOnCz9ae/uuOk7AIQ9NzjnzFbuN8Q7H3oj2Eq4QSgQ=
github.com/bmatcuk/doublestar/v4 v4.4.0 h1:LmAwNwhjEbYtyVLzjcP/XeVw4nhuScHGkF/XWXnvIic=
github.com/bmatcuk/doublestar/v4 v4.4.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
github.com/briandowns/spinner v1.19.0 h1:s8aq38H+Qju89yhp89b4iIiMzMm8YN3p6vGpwyh/a8E=
Expand Down
8 changes: 1 addition & 7 deletions pkg/cmd/runbook/delete/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,7 @@ func DeleteRun(opts *DeleteOptions) error {
return err
}

runbooksAreInGit := false

if project.PersistenceSettings.Type() == projects.PersistenceSettingsTypeVersionControlled {
runbooksAreInGit = project.PersistenceSettings.(projects.GitPersistenceSettings).RunbooksAreInGit()
}

if runbooksAreInGit {
if shared.AreRunbooksInGit(project) {
gitReference, err := getGitReference(opts, project)
if err != nil {
return err
Expand Down
9 changes: 2 additions & 7 deletions pkg/cmd/runbook/list/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package list

import (
"errors"
"github.com/OctopusDeploy/cli/pkg/cmd/runbook/shared"
"math"

"github.com/OctopusDeploy/cli/pkg/apiclient"
Expand Down Expand Up @@ -120,17 +121,11 @@ func listRun(cmd *cobra.Command, f factory.Factory, flags *ListFlags) error {
}

var foundRunbooks *resources.Resources[*runbooks.Runbook]
runbooksAreInGit := false

if selectedProject.PersistenceSettings.Type() == projects.PersistenceSettingsTypeVersionControlled {
runbooksAreInGit = selectedProject.PersistenceSettings.(projects.GitPersistenceSettings).RunbooksAreInGit()
}

if limit <= 0 {
limit = math.MaxInt32
}

if runbooksAreInGit {
if shared.AreRunbooksInGit(selectedProject) {
if f.IsPromptEnabled() {
if gitReference == "" { // we need a git ref; ask for one
gitRef, err := selectors.GitReference("Select the Git reference to list runbooks for", octopus, f.Ask, selectedProject)
Expand Down
11 changes: 3 additions & 8 deletions pkg/cmd/runbook/run/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/OctopusDeploy/cli/pkg/cmd/runbook/shared"
"github.com/OctopusDeploy/cli/pkg/packages"
"golang.org/x/exp/maps"
"io"
Expand Down Expand Up @@ -141,7 +142,7 @@ func NewCmdRun(f factory.Factory) *cobra.Command {
Long: "Run runbooks in Octopus Deploy",
Example: heredoc.Docf(`
$ %[1]s runbook run # fully interactive
$ %[1]s runbook run --project MyProject ... TODO
$ %[1]s runbook run --project MyProject --runbook "Rebuild DB indexes"
`, constants.ExecutableName),
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) > 0 && runFlags.Project.Value == "" {
Expand Down Expand Up @@ -216,13 +217,7 @@ func runbookRun(cmd *cobra.Command, f factory.Factory, flags *RunFlags) error {
}

flags.Project.Value = project.Name
runbooksAreInGit := false

if project.PersistenceSettings.Type() == projects.PersistenceSettingsTypeVersionControlled {
runbooksAreInGit = project.PersistenceSettings.(projects.GitPersistenceSettings).RunbooksAreInGit()
}

if runbooksAreInGit {
if shared.AreRunbooksInGit(project) {
return runGitRunbook(cmd, f, flags, octopus, project, parsedVariables, outputFormat)
} else {
return runDbRunbook(cmd, f, flags, octopus, project, parsedVariables, outputFormat)
Expand Down
10 changes: 10 additions & 0 deletions pkg/cmd/runbook/shared/shared.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,13 @@ func GetProject(octopus *client.Client, projectIdentifier string) (*projects.Pro

return project, nil
}

func AreRunbooksInGit(project *projects.Project) bool {
inGit := false

if project.PersistenceSettings.Type() == projects.PersistenceSettingsTypeVersionControlled {
inGit = project.PersistenceSettings.(projects.GitPersistenceSettings).RunbooksAreInGit()
}

return inGit
}
Loading