add args about hostname and domain (#1)

* add args about hostname and domain

* change args in plug/commnd. made PushArgs structure

Author: mr-oliva

main.go

@@ -60,7 +60,18 @@ func (c *CfPushWithVault) Run(cliConnection plugin.CliConnection, args []string)
 		Variables:     variables,
 	}
 
-	if err := command.Push(fc.String("file"), fc.Args()[1:]); err != nil {
+	appName := ""
+	if len(fc.Args()) == 2 {
+		appName = fc.Args()[1]
+	}
+	pushArgs := plug.PushArgs{
+		AppName:      appName,
+		ManifestFile: fc.String("file"),
+		Hostname:     fc.String("hostname"),
+		Domain:       fc.String("domain"),
+	}
+
+	if err := command.Push(pushArgs); err != nil {
 		fmt.Fprintf(os.Stdout, "failed to push with vault: %v", err)
 		os.Exit(1)
 	}
@@ -82,10 +93,12 @@ func (c *CfPushWithVault) GetMetadata() plugin.PluginMetadata {
 				UsageDetails: plugin.Usage{
 					Usage: "$ cf push-with-vault [APP_NAME]",
 					Options: map[string]string{
-						"-file":        "Path to manifest (default: ./manifest.yml)",
-						"-vault-addr":  "Address of the Vault server expressed as a URL and port, for example: https://127.0.0.1:8200/. (default: \"VAULT_ADDR\" env)",
-						"-vault-token": "Vault authentication token. (default: \"VAULT_TOKEN\" env)",
-						"-path-prefix": "Path under which to namespace credential lookup",
+						"-file, -f":         "Path to manifest (default: ./manifest.yml)",
+						"-vault-addr, -va":  "Address of the Vault server expressed as a URL and port, for example: https://127.0.0.1:8200/. (default: \"VAULT_ADDR\" env)",
+						"-vault-token, -vt": "Vault authentication token. (default: \"VAULT_TOKEN\" env)",
+						"-path-prefix, -pp": "Path under which to namespace credential lookup",
+						"-hostname, -n":     "Hostname (e.g. my-subdomain)",
+						"-domain, -d":       "Specify a custom domain (e.g. private-domain.example.com, apps.internal.com) to use instead of the default domain",
 					},
 				},
 			},
@@ -99,6 +112,8 @@ func (c *CfPushWithVault) parseArgs(args []string) (flags.FlagContext, error) {
 	fc.NewStringFlagWithDefault("vault-addr", "va", "Address of the Vault server expressed as a URL and port", c.VaultAddr)
 	fc.NewStringFlagWithDefault("vault-token", "vt", "Vault authentication token", c.VaultToken)
 	fc.NewStringFlagWithDefault("path-prefix", "pp", "Path under which to namespace credential lookup", "")
+	fc.NewStringFlagWithDefault("hostname", "n", "Hostname", "")
+	fc.NewStringFlagWithDefault("domain", "d", "Specify a custom domain", "")
 	err := fc.Parse(args...)
 	return fc, err
 }

plug/command.go

@@ -17,10 +17,32 @@ type Command struct {
 	Variables     vault.Variables
 }
 
+// PushArgs is information for "cf push"
+type PushArgs struct {
+	AppName      string
+	ManifestFile string
+	Hostname     string
+	Domain       string
+}
+
+func (p *PushArgs) toStringArray() []string {
+	args := []string{"push"}
+	if p.AppName != "" {
+		args = append(args, p.AppName)
+	}
+	if p.Hostname != "" {
+		args = append(args, "-n", p.Hostname)
+	}
+	if p.Domain != "" {
+		args = append(args, "-d", p.Domain)
+	}
+	return append(args, "-f", p.ManifestFile)
+}
+
 // Push pushes cf app based on manifest
-func (c *Command) Push(file string, args []string) error {
+func (c *Command) Push(args PushArgs) error {
 	// read file
-	absFile, err := filepath.Abs(file)
+	absFile, err := filepath.Abs(args.ManifestFile)
 	if err != nil {
 		return err
 	}
@@ -41,10 +63,10 @@ func (c *Command) Push(file string, args []string) error {
 	if err != nil {
 		return err
 	}
+	args.ManifestFile = tmpFile.Name()
 
-	args = append([]string{"push", "-f", tmpFile.Name()}, args...)
 	// cf push
-	if _, err := c.CliConnection.CliCommand(args...); err != nil {
+	if _, err := c.CliConnection.CliCommand(args.toStringArray()...); err != nil {
 		return err
 	}
 

plug/command_test.go

@@ -5,6 +5,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
+	"github.com/cappyzawa/cf-push-with-vault/plug"
 	. "github.com/cappyzawa/cf-push-with-vault/plug"
 	"github.com/cappyzawa/cf-push-with-vault/vault/vaultfakes"
 )
@@ -27,14 +28,22 @@ var _ = Describe("Command", func() {
 
 	Describe("Push()", func() {
 		Context("manifest file is missing", func() {
+			pArgs := plug.PushArgs{
+				AppName:      "testApp",
+				ManifestFile: "../testdata/missing.yml",
+			}
 			It("an error is occurred", func() {
-				err := command.Push("../testdata/missing.yml", []string{"testApp"})
+				err := command.Push(pArgs)
 				Expect(err).To(HaveOccurred())
 			})
 		})
 		Context("manifest file does not contain parameters", func() {
+			pArgs := plug.PushArgs{
+				AppName:      "testApp",
+				ManifestFile: "../testdata/no_contains_params.yml",
+			}
 			It("access to the vault does not occur", func() {
-				err := command.Push("../testdata/no_contains_params.yml", []string{"testApp"})
+				err := command.Push(pArgs)
 				Expect(fakeVariables.GetCallCount()).To(BeZero())
 				Expect(err).NotTo(HaveOccurred())
 			})
@@ -44,8 +53,12 @@ var _ = Describe("Command", func() {
 				fakeVariables.GetReturns(nil, true, nil)
 				fakeVariables.GetReturns(nil, true, nil)
 			})
+			pArgs := plug.PushArgs{
+				AppName:      "testApp",
+				ManifestFile: "../testdata/multi_params.yml",
+			}
 			It("access to the vault occurs multiple times", func() {
-				err := command.Push("../testdata/multi_params.yml", []string{"testApp"})
+				err := command.Push(pArgs)
 				Expect(fakeVariables.GetCallCount()).To(Equal(2))
 				Expect(err).NotTo(HaveOccurred())
 			})