Stack rm q

cmd/amp/main.go

@@ -33,8 +33,6 @@ var (
 
 // All main does is process commands and flags and invoke the app
 func main() {
-	fmt.Printf("amp (cli version: %s, build: %s)\n", Version, Build)
-
 	cobra.OnInitialize(func() {
 		InitConfig(configFile, &Config, verbose, serverAddr)
 		if addr := RootCmd.Flag("server").Value.String(); addr != "" {
@@ -43,7 +41,6 @@ func main() {
 		if Config.ServerAddress == "" {
 			Config.ServerAddress = client.DefaultServerAddress
 		}
-		fmt.Println("Server: " + Config.ServerAddress)
 		AMP = client.NewAMP(&Config)
 		AMP.Connect()
 		cli.AtExit(func() {
@@ -62,14 +59,24 @@ func main() {
 			fmt.Println(Config)
 		},
 	}
-
+	// infoCmd represents the amp information
+	infoCmd := &cobra.Command{
+		Use:   "info",
+		Short: "Display amp version and server information",
+		Long:  `Display amp version and server information.`,
+		Run: func(cmd *cobra.Command, args []string) {
+			fmt.Printf("amp (cli version: %s, build: %s)\n", Version, Build)
+			fmt.Printf("Server: %s\n", Config.ServerAddress)
+		},
+	}
 	RootCmd.SetUsageTemplate(usageTemplate)
 	RootCmd.SetHelpTemplate(helpTemplate)
 
 	RootCmd.PersistentFlags().StringVar(&configFile, "config", "", "Config file (default is $HOME/.amp.yaml)")
 	RootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, `Verbose output`)
 	RootCmd.PersistentFlags().StringVar(&serverAddr, "server", "", "Server address")
 	RootCmd.AddCommand(configCmd)
+	RootCmd.AddCommand(infoCmd)
 	if err := RootCmd.Execute(); err != nil {
 		fmt.Println(err)
 		cli.Exit(-1)

cmd/amp/stack.go

@@ -82,7 +82,7 @@ func init() {
 	RootCmd.AddCommand(StackCmd)
 	flags := upCmd.Flags()
 	flags.StringVarP(&stackfile, "file", "f", stackfile, "The name of the stackfile")
-	rmCmd.Flags().Bool("force", false, "Remove the stack whatever condition")
+	rmCmd.Flags().BoolP("force", "f", false, "Remove the stack whatever condition")
 	listCmd.Flags().BoolP("quiet", "q", false, "return only stack id to be use with grep")
 	StackCmd.AddCommand(upCmd)
 	StackCmd.AddCommand(startCmd)
@@ -186,18 +186,20 @@ func remove(amp *client.AMP, cmd *cobra.Command, args []string) error {
 	if cmd.Flag("force").Value.String() == "true" {
 		force = true
 	}
-	request := &stack.RemoveRequest{
-		StackIdent: ident,
-		Force:      force,
-	}
+	for _, stackIdent := range args {
+		request := &stack.RemoveRequest{
+			StackIdent: stackIdent,
+			Force:      force,
+		}
 
-	client := stack.NewStackServiceClient(amp.Conn)
-	reply, err := client.Remove(context.Background(), request)
-	if err != nil {
-		return err
-	}
+		client := stack.NewStackServiceClient(amp.Conn)
+		reply, err := client.Remove(context.Background(), request)
+		if err != nil {
+			return err
+		}
 
-	fmt.Println(reply)
+		fmt.Println(reply.StackId)
+	}
 	return nil
 }
 

swarm

@@ -334,7 +334,7 @@ haproxy() { # Owner: freignat91
     --label amp.swarm="infrastructure" \
     -p 8080:8080 \
     -p 80:80 \
-    appcelerator/haproxy:latest
+    appcelerator/haproxy:test2
 }