Skip to content
This repository was archived by the owner on Nov 8, 2019. It is now read-only.

Commit 5b5e704

Browse files
authored
Merge pull request #36 from ingrammicro/release/0.6.0
Release/0.6.0
2 parents 0e9fa12 + e886f96 commit 5b5e704

28 files changed

Lines changed: 662 additions & 595 deletions

.goreleaser.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ builds:
1010
archive:
1111
name_template: "{{ .ProjectName }}.{{ .Arch }}.{{ .Os }}"
1212
format: binary
13-
13+
release:
14+
prerelease: true
15+
name_template: "{{.ProjectName}}-v{{.Version}}"

Kubernetes Guestbook example in Flexiant Concerto.md

Lines changed: 0 additions & 101 deletions
This file was deleted.

Kubernetes Spark example in Flexiant Concerto.md

Lines changed: 0 additions & 74 deletions
This file was deleted.

api/types/workspaces.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ type Workspace struct {
44
Id string `json:"id" header:"ID"`
55
Name string `json:"name" header:"NAME"`
66
Default bool `json:"default" header:"DEFAULT"`
7-
Domain_id string `json:"domain_id" header:"DOMAIN_ID"`
87
Ssh_profile_id string `json:"ssh_profile_id" header:"SSH_PROFILE_ID"`
98
Firewall_profile_id string `json:"firewall_profile_id" header:"FIREWALL_PROFILE_ID"`
109
}

brownfield/brownfield.go

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package brownfield
22

3-
import "github.com/codegangsta/cli"
3+
import (
4+
"runtime"
5+
6+
"github.com/codegangsta/cli"
7+
)
48

59
func SubCommands() []cli.Command {
610
return []cli.Command{
@@ -13,6 +17,19 @@ func SubCommands() []cli.Command {
1317
Name: "configure",
1418
Usage: "Configures an imported brownfield Host's FQDN, SSH access, agent services and firewall",
1519
Action: cmdConfigure,
20+
Flags: configureFlags(),
21+
},
22+
}
23+
}
24+
25+
func configureFlags() []cli.Flag {
26+
if runtime.GOOS != "windows" {
27+
return nil
28+
}
29+
return []cli.Flag{
30+
cli.StringFlag{
31+
Name: "admin-password",
32+
Usage: "The password for your current (administrator) user",
1633
},
1734
}
1835
}

brownfield/configure.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func cmdConfigure(c *cli.Context) error {
2626
f.PrintFatal("Must run as super-user", fmt.Errorf("running as non-administrator user"))
2727
}
2828
}
29-
applyConcertoSettings(cs, f)
29+
applyConcertoSettings(cs, f, config.CurrentUserName, c.String("admin-password"))
3030
configureConcertoFirewall(cs, f)
3131
return nil
3232
}

0 commit comments

Comments
 (0)