projectとzoneに対応した

Author: Naoki Kanazawa

README.md

@@ -9,18 +9,32 @@ mapping.example.yaml
 ```yaml
 - problem_id: 89bc780e-7a54-4015-8327-125564a7da50
   machine_image_name: image-aki
+  project: networkcontest
+  zone: asia-northeast1-b
 - problem_id: d14ccfff-6410-4aea-a31d-d323f8050214
   machine_image_name: image-kit
+  project: networkcontest
+  zone: asia-northeast1-b
 - problem_id: 6b0b1605-9021-4848-a4ab-246f22ffcb61
   machine_image_name: image-kny
+  project: networkcontest
+  zone: asia-northeast1-b
 - problem_id: 8b8082f6-d7df-4555-ae25-feb07f857987
   machine_image_name: image-nas
+  project: networkcontest
+  zone: asia-northeast1-b
 - problem_id: 968fd81d-d511-4ab5-84db-13fc756f3d7c
   machine_image_name: image-pea
+  project: networkcontest
+  zone: asia-northeast1-b
 - problem_id: 227803fb-2fe1-4b89-a805-79e7679bf030
   machine_image_name: image-sc0
+  project: networkcontest
+  zone: asia-northeast1-b
 - problem_id: 561d9876-7568-4096-b164-126cba6e4eb7
   machine_image_name: image-sc1
+  project: networkcontest
+  zone: asia-northeast1-b
 ```
 
 ```bash

mapping.example.yaml

@@ -1,14 +1,28 @@
 - problem_id: 89bc780e-7a54-4015-8327-125564a7da50
   machine_image_name: image-aki
+  project: networkcontest
+  zone: asia-northeast1-b
 - problem_id: d14ccfff-6410-4aea-a31d-d323f8050214
   machine_image_name: image-kit
+  project: networkcontest
+  zone: asia-northeast1-b
 - problem_id: 6b0b1605-9021-4848-a4ab-246f22ffcb61
   machine_image_name: image-kny
+  project: networkcontest
+  zone: asia-northeast1-b
 - problem_id: 8b8082f6-d7df-4555-ae25-feb07f857987
   machine_image_name: image-nas
+  project: networkcontest
+  zone: asia-northeast1-b
 - problem_id: 968fd81d-d511-4ab5-84db-13fc756f3d7c
   machine_image_name: image-pea
+  project: networkcontest
+  zone: asia-northeast1-b
 - problem_id: 227803fb-2fe1-4b89-a805-79e7679bf030
   machine_image_name: image-sc0
+  project: networkcontest
+  zone: asia-northeast1-b
 - problem_id: 561d9876-7568-4096-b164-126cba6e4eb7
   machine_image_name: image-sc1
+  project: networkcontest
+  zone: asia-northeast1-b

pkg/command/contest.go

@@ -44,6 +44,8 @@ func NewContestInitCommand() *cobra.Command {
 type mapping struct {
 	ProblemID        string `yaml:"problem_id"`
 	MachineImageName string `yaml:"machine_image_name"`
+	Project          string `yaml:"project"`
+	Zone             string `yaml:"zone"`
 }
 
 func contestInitCommandFunc(cmd *cobra.Command, args []string) error {
@@ -85,7 +87,13 @@ func contestInitCommandFunc(cmd *cobra.Command, args []string) error {
 			xerrors.New("problem_id が空になっている場所があります")
 		}
 		if m.MachineImageName == "" {
-			xerrors.New("machine-image-name が空になっている場所にあります")
+			xerrors.New("machine-image-name が空になっている場所があります")
+		}
+		if m.Project == "" {
+			xerrors.New("project が空になっている場所があります")
+		}
+		if m.Zone == "" {
+			xerrors.New("zone が空になっている場所があります")
 		}
 	}
 
@@ -98,8 +106,8 @@ func contestInitCommandFunc(cmd *cobra.Command, args []string) error {
 		c := count
 		for c > 0 {
 
-			fmt.Printf("[INFO] creating... problemID: %s, machineImageName: %s\n", m.ProblemID, m.MachineImageName)
-			i, err := cli.CreateInstance(m.ProblemID, m.MachineImageName)
+			fmt.Printf("[INFO] creating... problemID: %s, machineImageName: %s, project: %s, zone: %s\n", m.ProblemID, m.MachineImageName, m.Project, m.Zone)
+			i, err := cli.CreateInstance(m.ProblemID, m.MachineImageName, m.Project, m.Zone)
 			if err != nil {
 				fmt.Println("[ERROR] failed to create instance.")
 				return err

pkg/command/vmms.go

@@ -46,9 +46,13 @@ func NewVmmsInstanceCreateCommand() *cobra.Command {
 	flags := cmd.Flags()
 	flags.StringP("problem-id", "", "", "Problem ID")
 	flags.StringP("machine-image-name", "", "", "Machine Image Name")
+	flags.StringP("project", "", "", "Project")
+	flags.StringP("zone", "", "", "Zone")
 
 	cmd.MarkFlagRequired("problem-id")
 	cmd.MarkFlagRequired("machine-image-name")
+	cmd.MarkFlagRequired("project")
+	cmd.MarkFlagRequired("zone")
 
 	return cmd
 }
@@ -72,9 +76,17 @@ func vmmsInstanceCreateCommandFunc(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)
-	pes, err := cli.CreateInstance(problemID, machineImageName)
+	pes, err := cli.CreateInstance(problemID, machineImageName, project, zone)
 	if err != nil {
 		return err
 	}

pkg/vmms/vmms.go

@@ -28,6 +28,8 @@ func NewClient(endpoint, credential string) *client {
 type createInstanceRequestBody struct {
 	ProblemID        string `json:"problem_id" validate:"required,uuid"`
 	MachineImageName string `json:"machine_image_name" validate:"required" example:"problem-sc0"`
+	Project          string `json:"project" validate:"required" example:"networkcontest"`
+	Zone             string `json:"zone" validate:"required" zone:"asia-northeast1-b"`
 }
 
 type createInstanceResponseBody struct {
@@ -46,12 +48,14 @@ type createInstanceErrorResponseBody struct {
 }
 
 // CreateInstance VMを作成する
-func (c *client) CreateInstance(problemID, machineImageName string) (*types.Instance, error) {
+func (c *client) CreateInstance(problemID, machineImageName, project, zone string) (*types.Instance, error) {
 	u := fmt.Sprintf("%s/instance", c.Endpoint)
 
 	reqBody := createInstanceRequestBody{
 		ProblemID:        problemID,
 		MachineImageName: machineImageName,
+		Project:          project,
+		Zone:             zone,
 	}
 
 	if err := validate.Struct(reqBody); err != nil {