Merge pull request juju#11125 from anastasiamac/not-supported-msg-lp1860154

jujubot · web-flow · commit 0b9d2d867111 · 2020-01-20T09:23:48.000+10:00
juju#11125 ## Description of change Bootstrap message was omitting critical detail when bootstrapping k8s controller with --build-agent option: it was erring out but not saying that the option is not supported. See linked bug. ## QA steps ``` $ juju bootstrap --build-agent microk8s mk8s Creating Juju controller "mk8s" on microk8s/localhost ERROR failed to bootstrap model: --build-agent when bootstrapping a k8s controller not supported ``` ## Bug reference https://bugs.launchpad.net/juju/+bug/1860154
diff --git a/environs/bootstrap/bootstrap.go b/environs/bootstrap/bootstrap.go
@@ -233,13 +233,13 @@ func bootstrapCAAS(
 	bootstrapParams environs.BootstrapParams,
 ) error {
 	if args.BuildAgent {
-		return errors.NewNotSupported(nil, "--build-agent when bootstrapping a k8s controller")
+		return errors.NotSupportedf("--build-agent when bootstrapping a k8s controller")
 	}
 	if args.BootstrapImage != "" {
-		return errors.NewNotSupported(nil, "--bootstrap-image when bootstrapping a k8s controller")
+		return errors.NotSupportedf("--bootstrap-image when bootstrapping a k8s controller")
 	}
 	if args.BootstrapSeries != "" {
-		return errors.NewNotSupported(nil, "--bootstrap-series when bootstrapping a k8s controller")
+		return errors.NotSupportedf("--bootstrap-series when bootstrapping a k8s controller")
 	}
 
 	constraintsValidator, err := environ.ConstraintsValidator(callCtx)

Original file line number	Diff line number	Diff line change
`@@ -233,13 +233,13 @@ func bootstrapCAAS(`
`233`	`233`	`bootstrapParams environs.BootstrapParams,`
`234`	`234`	`) error {`
`235`	`235`	`if args.BuildAgent {`
`236`		`- return errors.NewNotSupported(nil, "--build-agent when bootstrapping a k8s controller")`
	`236`	`+ return errors.NotSupportedf("--build-agent when bootstrapping a k8s controller")`
`237`	`237`	`}`
`238`	`238`	`if args.BootstrapImage != "" {`
`239`		`- return errors.NewNotSupported(nil, "--bootstrap-image when bootstrapping a k8s controller")`
	`239`	`+ return errors.NotSupportedf("--bootstrap-image when bootstrapping a k8s controller")`
`240`	`240`	`}`
`241`	`241`	`if args.BootstrapSeries != "" {`
`242`		`- return errors.NewNotSupported(nil, "--bootstrap-series when bootstrapping a k8s controller")`
	`242`	`+ return errors.NotSupportedf("--bootstrap-series when bootstrapping a k8s controller")`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`constraintsValidator, err := environ.ConstraintsValidator(callCtx)`