Merge branch 'main' of github.com:janog-netcon/netcon-cli

Naoki Kanazawa · Naoki Kanazawa · commit a024abe2e299 · 2021-01-24T20:56:37.000+09:00
diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
@@ -152,7 +152,7 @@ func DeleteScheduler(dis []types.DeleteInstance, vmmsClient *vmms.Client, lg *za
 			for _, v := range dis[i-1:] {
 				msg = msg + v.ProblemName + ": " + v.InstanceName + ", "
 			}
-			return fmt.Errorf("Remains on the CreateInstanceList. %s", msg)
+			return fmt.Errorf("%w Remains on the CreateInstanceList. %s", err, msg)
 		}
 	}
 	return nil
@@ -200,5 +200,5 @@ func CreateScheduler(cis []types.CreateInstance, zps []types.ZonePriority, vmmsC
 	for _, v := range cis[i:] {
 		msg = msg + v.ProblemName + ", "
 	}
-	return fmt.Errorf("Error. %s Remains on the CreateInstanceList. %s", err, msg)
+	return fmt.Errorf("%w Remains on the CreateInstanceList. %s", err, msg)
 }

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ func DeleteScheduler(dis []types.DeleteInstance, vmmsClient vmms.Client, lg za`
`152`	`152`	`for _, v := range dis[i-1:] {`
`153`	`153`	`msg = msg + v.ProblemName + ": " + v.InstanceName + ", "`
`154`	`154`	`}`
`155`		`- return fmt.Errorf("Remains on the CreateInstanceList. %s", msg)`
	`155`	`+ return fmt.Errorf("%w Remains on the CreateInstanceList. %s", err, msg)`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`	`return nil`
`@@ -200,5 +200,5 @@ func CreateScheduler(cis []types.CreateInstance, zps []types.ZonePriority, vmmsC`
`200`	`200`	`for _, v := range cis[i:] {`
`201`	`201`	`msg = msg + v.ProblemName + ", "`
`202`	`202`	`}`
`203`		`- return fmt.Errorf("Error. %s Remains on the CreateInstanceList. %s", err, msg)`
	`203`	`+ return fmt.Errorf("%w Remains on the CreateInstanceList. %s", err, msg)`
`204`	`204`	`}`