delete時もprojectとzoneを渡すように変更した

Author: Naoki Kanazawa

pkg/command/vmms.go

@@ -105,8 +105,12 @@ func NewVmmsInstanceDeleteCommand() *cobra.Command {
 
 	flags := cmd.Flags()
 	flags.StringP("instance-name", "", "", "instance name")
+	flags.StringP("project", "", "", "Project")
+	flags.StringP("zone", "", "", "Zone")
 
 	cmd.MarkFlagRequired("instance-name")
+	cmd.MarkFlagRequired("project")
+	cmd.MarkFlagRequired("zone")
 
 	return cmd
 }
@@ -126,9 +130,17 @@ func vmmsInstanceDeleteCommandFunc(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+	project, err := flags.GetString("project")
+	if err != nil {
+		return err
+	}
+	zone, err := flags.GetString("zone")
+	if err != nil {
+		return err
+	}
 
 	cli := vmms.NewClient(endpoint, credential)
-	if err := cli.DeleteInstance(instanceName); err != nil {
+	if err := cli.DeleteInstance(instanceName, project, zone); err != nil {
 		return err
 	}
 

pkg/vmms/vmms.go

@@ -98,17 +98,36 @@ func (c *client) CreateInstance(problemID, machineImageName, project, zone strin
 	return &instance, nil
 }
 
+type deleteInstanceRequestBody struct {
+	Project string `json:"project" validate:"required" example:"networkcontest"`
+	Zone    string `json:"zone" validate:"required" zone:"asia-northeast1-b"`
+}
+
 type deleteInstanceResponseBody struct {
 	Response struct {
 		IsDeleted bool `json:"is_deleted"`
 	} `json:"response"`
 }
 
 // DeleteInstance VMを削除する
-func (c *client) DeleteInstance(name string) error {
+func (c *client) DeleteInstance(name, project, zone string) error {
 	u := fmt.Sprintf("%s/instance/%s", c.Endpoint, name)
 
-	req, err := http.NewRequest("DELETE", u, nil)
+	reqBody := createInstanceRequestBody{
+		Project: project,
+		Zone:    zone,
+	}
+
+	if err := validate.Struct(reqBody); err != nil {
+		return err
+	}
+
+	reqBodyByte, err := json.Marshal(reqBody)
+	if err != nil {
+		return err
+	}
+
+	req, err := http.NewRequest("DELETE", u, bytes.NewBuffer(reqBodyByte))
 	if err != nil {
 		return err
 	}