Skip to content

Commit dc89d19

Browse files
1. ignore DS_Store\n 2. go fmt the files
1 parent 04111f7 commit dc89d19

File tree

9 files changed

+53
-52
lines changed

9 files changed

+53
-52
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ build-output
55
*~
66
ocf-scheduler-cf-plugin
77
builds
8+
.DS_Store

client/call.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"sort"
77

88
models "code.cloudfoundry.org/cli/plugin/models"
9-
"github.com/ess/hype"
109
"github.com/cloudfoundry-community/ocf-scheduler-cf-plugin/core"
1110
scheduler "github.com/cloudfoundry-community/ocf-scheduler/core"
11+
"github.com/ess/hype"
1212
)
1313

1414
func ListCalls(driver *core.Driver, space models.SpaceFields) ([]*scheduler.Call, error) {

client/job.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"sort"
77

88
models "code.cloudfoundry.org/cli/plugin/models"
9-
"github.com/ess/hype"
109
"github.com/cloudfoundry-community/ocf-scheduler-cf-plugin/core"
1110
scheduler "github.com/cloudfoundry-community/ocf-scheduler/core"
11+
"github.com/ess/hype"
1212
)
1313

1414
func ListJobs(driver *core.Driver, space models.SpaceFields) ([]*scheduler.Job, error) {

commands/delete-call-schedule.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ import (
1111

1212
// cf delete-call-schedule CALL-NAME SCHEDULE-GUID
1313
func DeleteCallSchedule(services *core.Services, args []string) {
14-
var forceFlag bool
15-
var promptFlag bool
14+
var forceFlag bool
15+
var promptFlag bool
1616

1717
flags := pflag.NewFlagSet("delete-call-schedule", pflag.ExitOnError)
18-
flags.BoolVarP(&forceFlag, "force", "f", false, "Force call schedule deletion without confirmation")
19-
flags.BoolVarP(&promptFlag, "prompt", "p", false, "Allow call schedule deletion with confirmation")
20-
flags.MarkHidden("prompt")
18+
flags.BoolVarP(&forceFlag, "force", "f", false, "Force call schedule deletion without confirmation")
19+
flags.BoolVarP(&promptFlag, "prompt", "p", false, "Allow call schedule deletion with confirmation")
20+
flags.MarkHidden("prompt")
2121
flags.Parse(args)
2222
args = flags.Args()
23-
23+
2424
if len(args) != 3 {
2525
fmt.Println("cf delete-call-schedule CALL-NAME SCHEDULE-GUID [OPTIONS]")
2626
return
@@ -41,9 +41,9 @@ func DeleteCallSchedule(services *core.Services, args []string) {
4141
return
4242
}
4343

44-
if promptFlag && !forceFlag && !services.UI.ConfirmDelete("call schedule", name + " " + scheduleGUID) {
45-
return;
46-
}
44+
if promptFlag && !forceFlag && !services.UI.ConfirmDelete("call schedule", name+" "+scheduleGUID) {
45+
return
46+
}
4747

4848
err = client.DeleteCallSchedule(services.Client, call, scheduleGUID)
4949
if err != nil {

commands/delete-call.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import (
1111

1212
// cf delete-call CALL-NAME
1313
func DeleteCall(services *core.Services, args []string) {
14-
var forceFlag bool
15-
var promptFlag bool
14+
var forceFlag bool
15+
var promptFlag bool
1616

1717
flags := pflag.NewFlagSet("delete-call", pflag.ExitOnError)
18-
flags.BoolVarP(&forceFlag, "force", "f", false, "Force call deletion without confirmation")
19-
flags.BoolVarP(&promptFlag, "prompt", "p", false, "Allow call deletion with confirmation")
20-
flags.MarkHidden("prompt")
18+
flags.BoolVarP(&forceFlag, "force", "f", false, "Force call deletion without confirmation")
19+
flags.BoolVarP(&promptFlag, "prompt", "p", false, "Allow call deletion with confirmation")
20+
flags.MarkHidden("prompt")
2121
flags.Parse(args)
2222
args = flags.Args()
2323

@@ -40,9 +40,9 @@ func DeleteCall(services *core.Services, args []string) {
4040
return
4141
}
4242

43-
if promptFlag && !forceFlag && !services.UI.ConfirmDeleteWithAssociations("call", name) {
44-
return;
45-
}
43+
if promptFlag && !forceFlag && !services.UI.ConfirmDeleteWithAssociations("call", name) {
44+
return
45+
}
4646

4747
err = client.DeleteCall(services.Client, call)
4848
if err != nil {

commands/delete-job-schedule.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import (
1111

1212
// cf delete-job-schedule JOB-NAME SCHEDULE-GUID
1313
func DeleteJobSchedule(services *core.Services, args []string) {
14-
var forceFlag bool
15-
var promptFlag bool
14+
var forceFlag bool
15+
var promptFlag bool
1616

1717
flags := pflag.NewFlagSet("delete-job-schedule", pflag.ExitOnError)
18-
flags.BoolVarP(&forceFlag, "force", "f", false, "Force job schedule deletion without confirmation")
19-
flags.BoolVarP(&promptFlag, "prompt", "p", false, "Allow job schedule deletion with confirmation")
20-
flags.MarkHidden("prompt")
18+
flags.BoolVarP(&forceFlag, "force", "f", false, "Force job schedule deletion without confirmation")
19+
flags.BoolVarP(&promptFlag, "prompt", "p", false, "Allow job schedule deletion with confirmation")
20+
flags.MarkHidden("prompt")
2121
flags.Parse(args)
2222

2323
args = flags.Args()
@@ -41,9 +41,9 @@ func DeleteJobSchedule(services *core.Services, args []string) {
4141
return
4242
}
4343

44-
if promptFlag && !forceFlag && !services.UI.ConfirmDelete("job schedule", name + " " + scheduleGUID) {
45-
return;
46-
}
44+
if promptFlag && !forceFlag && !services.UI.ConfirmDelete("job schedule", name+" "+scheduleGUID) {
45+
return
46+
}
4747

4848
err = client.DeleteJobSchedule(services.Client, job, scheduleGUID)
4949
if err != nil {

commands/delete-job.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import (
1111

1212
// cf delete-job JOB-NAME
1313
func DeleteJob(services *core.Services, args []string) {
14-
var forceFlag bool
15-
var promptFlag bool
14+
var forceFlag bool
15+
var promptFlag bool
1616

1717
flags := pflag.NewFlagSet("delete-job", pflag.ExitOnError)
18-
flags.BoolVarP(&forceFlag, "force", "f", false, "Force job deletion without confirmation")
19-
flags.BoolVarP(&promptFlag, "prompt", "p", false, "Allow job deletion with confirmation")
20-
flags.MarkHidden("prompt")
18+
flags.BoolVarP(&forceFlag, "force", "f", false, "Force job deletion without confirmation")
19+
flags.BoolVarP(&promptFlag, "prompt", "p", false, "Allow job deletion with confirmation")
20+
flags.MarkHidden("prompt")
2121
flags.Parse(args)
2222
args = flags.Args()
2323

@@ -40,9 +40,9 @@ func DeleteJob(services *core.Services, args []string) {
4040
return
4141
}
4242

43-
if promptFlag && !forceFlag && !services.UI.ConfirmDeleteWithAssociations("job", name) {
44-
return;
45-
}
43+
if promptFlag && !forceFlag && !services.UI.ConfirmDeleteWithAssociations("job", name) {
44+
return
45+
}
4646

4747
err = client.DeleteJob(services.Client, job)
4848
if err != nil {

core/services.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ import "code.cloudfoundry.org/cli/cf/terminal"
66
type Services struct {
77
CLI plugin.CliConnection
88
Client *Driver
9-
UI terminal.UI
9+
UI terminal.UI
1010
}

main.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package main
22

33
import (
4-
"bytes"
4+
"bytes"
55
"fmt"
6-
"os"
7-
"io"
8-
"runtime"
6+
"io"
7+
"os"
8+
"runtime"
99
"strconv"
1010
"strings"
11-
"text/template"
11+
"text/template"
1212

13-
"code.cloudfoundry.org/cli/plugin"
14-
"code.cloudfoundry.org/cli/cf/i18n"
13+
"code.cloudfoundry.org/cli/cf/i18n"
1514
"code.cloudfoundry.org/cli/cf/terminal"
1615
"code.cloudfoundry.org/cli/cf/trace"
16+
"code.cloudfoundry.org/cli/plugin"
1717

1818
"github.com/cloudfoundry-community/ocf-scheduler-cf-plugin/commands"
1919
"github.com/cloudfoundry-community/ocf-scheduler-cf-plugin/core"
@@ -155,29 +155,29 @@ func (c *OCFScheduler) GetMetadata() plugin.PluginMetadata {
155155

156156
func (c *OCFScheduler) Run(cliConnection plugin.CliConnection, args []string) {
157157

158-
i18n.T = func(translationID string, args ...interface{}) string {
159-
var buffer bytes.Buffer
158+
i18n.T = func(translationID string, args ...interface{}) string {
159+
var buffer bytes.Buffer
160160

161-
var keys interface{}
161+
var keys interface{}
162162
if len(args) > 0 {
163163
keys = args[0]
164164
}
165165

166166
formattedTemplate := template.Must(template.New("Display Text").Parse(translationID))
167167
err := formattedTemplate.Execute(&buffer, keys)
168168
if err != nil {
169-
return translationID + "\ntemplate processing failed " + err.Error() + "\n"
169+
return translationID + "\ntemplate processing failed " + err.Error() + "\n"
170170
}
171171

172172
return buffer.String()
173173
}
174174

175-
if runtime.GOOS == "windows" {
175+
if runtime.GOOS == "windows" {
176176
terminal.UserAskedForColors = "false"
177177
}
178-
terminal.InitColorSupport()
179-
teePrinter = terminal.NewTeePrinter(os.Stdout)
180-
// Should we really be using NewPluginUI instead TODO
178+
terminal.InitColorSupport()
179+
teePrinter = terminal.NewTeePrinter(os.Stdout)
180+
// Should we really be using NewPluginUI instead TODO
181181
ui = terminal.NewUI(os.Stdin, os.Stdout, teePrinter, trace.NewWriterPrinter(io.Discard, false))
182182

183183
scheduler, err := core.GetScheduler(cliConnection)
@@ -198,7 +198,7 @@ func (c *OCFScheduler) Run(cliConnection plugin.CliConnection, args []string) {
198198
return
199199
}
200200

201-
services := &core.Services{CLI: cliConnection, Client: client, UI: ui}
201+
services := &core.Services{CLI: cliConnection, Client: client, UI: ui}
202202

203203
switch args[0] {
204204
case "create-job":

0 commit comments

Comments
 (0)