fix typos in project scope

xulike666 · xulike666 · commit bfd254644739 · 2017-02-10T13:40:04.000+08:00
Signed-off-by: Aaron.L.Xu &lt;likexu@harmonycloud.cn&gt;
diff --git a/commands/rm.go b/commands/rm.go
@@ -22,7 +22,7 @@ func cmdRm(c CommandLine, api libmachine.API) error {
 
 	force := c.Bool("force")
 	confirm := c.Bool("y")
-	var errorOccured []string
+	var errorOccurred []string
 
 	if !userConfirm(confirm, force) {
 		return nil
@@ -31,21 +31,21 @@ func cmdRm(c CommandLine, api libmachine.API) error {
 	for _, hostName := range c.Args() {
 		err := removeRemoteMachine(hostName, api)
 		if err != nil {
-			errorOccured = collectError(fmt.Sprintf("Error removing host %q: %s", hostName, err), force, errorOccured)
+			errorOccurred = collectError(fmt.Sprintf("Error removing host %q: %s", hostName, err), force, errorOccurred)
 		}
 
 		if err == nil || force {
 			removeErr := removeLocalMachine(hostName, api)
 			if removeErr != nil {
-				errorOccured = collectError(fmt.Sprintf("Can't remove \"%s\"", hostName), force, errorOccured)
+				errorOccurred = collectError(fmt.Sprintf("Can't remove \"%s\"", hostName), force, errorOccurred)
 			} else {
 				log.Infof("Successfully removed %s", hostName)
 			}
 		}
 	}
 
-	if len(errorOccured) > 0 && !force {
-		return errors.New(strings.Join(errorOccured, "\n"))
+	if len(errorOccurred) > 0 && !force {
+		return errors.New(strings.Join(errorOccurred, "\n"))
 	}
 
 	return nil
@@ -81,9 +81,9 @@ func removeLocalMachine(hostName string, api libmachine.API) error {
 	return api.Remove(hostName)
 }
 
-func collectError(message string, force bool, errorOccured []string) []string {
+func collectError(message string, force bool, errorOccurred []string) []string {
 	if force {
 		log.Error(message)
 	}
-	return append(errorOccured, message)
+	return append(errorOccurred, message)
 }
diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go
@@ -452,7 +452,7 @@ func (d *Driver) checkPrereqs() error {
 				return fmt.Errorf("There is no keypair with the name %s. Please verify the key name provided.", keyName)
 			}
 			if awsErr.Code() == keypairNotFoundCode && !keyShouldExist {
-				// Not a real error for 'NotFound' since we're checking existance
+				// Not a real error for 'NotFound' since we're checking existence
 			}
 		} else {
 			return err
diff --git a/drivers/azure/azure.go b/drivers/azure/azure.go
@@ -404,7 +404,7 @@ func (d *Driver) Remove() error {
 	}
 
 	// NOTE(ahmetalpbalkan):
-	//   - remove attemps are best effort and if a resource is already gone, we
+	//   - remove attempts are best effort and if a resource is already gone, we
 	//     continue removing other resources instead of failing.
 	//   - we can probably do a lot of parallelization here but a sequential
 	//     logic works fine too. If we were to detach the NIC from the VM and
diff --git a/drivers/azure/azureutil/auth.go b/drivers/azure/azureutil/auth.go
@@ -238,7 +238,7 @@ func validateToken(env azure.Environment, token *azure.ServicePrincipalToken) er
 	return nil
 }
 
-// getScope returns the API scope for authnetication tokens.
+// getScope returns the API scope for authentication tokens.
 func getScope(env azure.Environment) string {
 	// for AzurePublicCloud (https://management.core.windows.net/), this old
 	// Service Management scope covers both ASM and ARM.
diff --git a/drivers/azure/azureutil/powerstate.go b/drivers/azure/azureutil/powerstate.go
@@ -47,7 +47,7 @@ const (
 
 // powerStateFromInstanceView reads the instance view response and extracts the
 // power state status (if exists) from there. If no status is found or an
-// unknown status has occured, returns Unknown.
+// unknown status has occurred, returns Unknown.
 func powerStateFromInstanceView(instanceView *compute.VirtualMachineInstanceView) VMPowerState {
 	if instanceView == nil {
 		log.Debug("Retrieved nil instance view.")
diff --git a/drivers/azure/azureutil/tenantid.go b/drivers/azure/azureutil/tenantid.go
@@ -15,7 +15,7 @@ import (
 	"github.com/Azure/go-autorest/autorest/azure"
 )
 
-// laodOrFindTenantID figures out the AAD tenant ID of the subscription by first
+// loadOrFindTenantID figures out the AAD tenant ID of the subscription by first
 // looking at the cache file, if not exists, makes a network call to load it and
 // cache it for future use.
 func loadOrFindTenantID(env azure.Environment, subscriptionID string) (string, error) {
diff --git a/drivers/exoscale/exoscale.go b/drivers/exoscale/exoscale.go
@@ -89,7 +89,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			EnvVar: "EXOSCALE_AVAILABILITY_ZONE",
 			Name:   "exoscale-availability-zone",
 			Value:  defaultAvailabilityZone,
-			Usage:  "exoscale availibility zone",
+			Usage:  "exoscale availability zone",
 		},
 		mcnflag.StringFlag{
 			EnvVar: "EXOSCALE_SSH_USER",
diff --git a/drivers/hyperv/hyperv.go b/drivers/hyperv/hyperv.go
@@ -428,7 +428,7 @@ func (d *Driver) generateDiskImage() (string, error) {
 	diskImage := d.ResolveStorePath("disk.vhd")
 	fixed := d.ResolveStorePath("fixed.vhd")
 
-	// Resizing vhds requires administrator priviledges
+	// Resizing vhds requires administrator privileges
 	// incase the user is only a hyper-v admin then create the disk at the target size to avoid resizing.
 	isWindowsAdmin, err := isWindowsAdministrator()
 	if err != nil {
diff --git a/drivers/vmwarefusion/fusion_darwin.go b/drivers/vmwarefusion/fusion_darwin.go
@@ -319,7 +319,7 @@ func (d *Driver) Create() error {
 	d.IPAddress = ip
 
 	// Do not execute the rest of boot2docker specific configuration
-	// The uplaod of the public ssh key uses a ssh connection,
+	// The upload of the public ssh key uses a ssh connection,
 	// this works without installed vmware client tools
 	if d.ConfigDriveURL != "" {
 		var keyfh *os.File
@@ -564,7 +564,7 @@ func (d *Driver) getIPfromVmnetConfigurationFile(conffile, macaddr string) (stri
 			continue
 		}
 
-		// we are only in intressted in endings if we in a block. Otherwise we will count
+		// we are only in interested in endings if we in a block. Otherwise we will count
 		// ending of non host blocks as well
 		if matches := hostend.FindStringSubmatch(line); blockdepth > 0 && matches != nil {
 			blockdepth = blockdepth - 1
diff --git a/its/cli/ls_test.go b/its/cli/ls_test.go
@@ -36,7 +36,7 @@ func TestLs(t *testing.T) {
 			ContainLine(1, "testmachine4")
 	})
 
-	test.Run("ls: mutiple filters on label", func() {
+	test.Run("ls: multiple filters on label", func() {
 		test.Machine("ls --filter label=foo=bar --filter label=app=1").Should().Succeed().
 			ContainLines(3).
 			ContainLine(0, "NAME").
diff --git a/libmachine/host/migrate_test.go b/libmachine/host/migrate_test.go
@@ -19,7 +19,7 @@ func TestMigrateHost(t *testing.T) {
 	}{
 		{
 			// Point of this test is largely that no matter what was in RawDriver
-			// before, it shoud load into the Host struct based on what is actually
+			// before, it should load into the Host struct based on what is actually
 			// in the Driver field.
 			//
 			// Note that we don't check for the presence of RawDriver's literal "on
diff --git a/libmachine/provision/suse.go b/libmachine/provision/suse.go
@@ -98,7 +98,7 @@ func (provisioner *SUSEProvisioner) Provision(swarmOptions swarm.Options, authOp
 	provisioner.EngineOptions = engineOptions
 	swarmOptions.Env = engineOptions.Env
 
-	// figure out the filesytem used by /var/lib
+	// figure out the filesystem used by /var/lib
 	fs, err := provisioner.SSHCommand("stat -f -c %T /var/lib/")
 	if err != nil {
 		return err
diff --git a/libmachine/provision/utils.go b/libmachine/provision/utils.go
@@ -276,7 +276,7 @@ func WaitForDocker(p Provisioner, dockerPort int) error {
 // DockerClientVersion returns the version of the Docker client on the host
 // that ssh is connected to, e.g. "1.12.1".
 func DockerClientVersion(ssh SSHCommander) (string, error) {
-	// `docker version --format {{.Client.Version}}` would be preferrable, but
+	// `docker version --format {{.Client.Version}}` would be preferable, but
 	// that fails if the server isn't running yet.
 	//
 	// output is expected to be something like

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func cmdRm(c CommandLine, api libmachine.API) error {`
`22`	`22`
`23`	`23`	`force := c.Bool("force")`
`24`	`24`	`confirm := c.Bool("y")`
`25`		`- var errorOccured []string`
	`25`	`+ var errorOccurred []string`
`26`	`26`
`27`	`27`	`if !userConfirm(confirm, force) {`
`28`	`28`	`return nil`
`@@ -31,21 +31,21 @@ func cmdRm(c CommandLine, api libmachine.API) error {`
`31`	`31`	`for _, hostName := range c.Args() {`
`32`	`32`	`err := removeRemoteMachine(hostName, api)`
`33`	`33`	`if err != nil {`
`34`		`- errorOccured = collectError(fmt.Sprintf("Error removing host %q: %s", hostName, err), force, errorOccured)`
	`34`	`+ errorOccurred = collectError(fmt.Sprintf("Error removing host %q: %s", hostName, err), force, errorOccurred)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`if err == nil \|\| force {`
`38`	`38`	`removeErr := removeLocalMachine(hostName, api)`
`39`	`39`	`if removeErr != nil {`
`40`		`- errorOccured = collectError(fmt.Sprintf("Can't remove \"%s\"", hostName), force, errorOccured)`
	`40`	`+ errorOccurred = collectError(fmt.Sprintf("Can't remove \"%s\"", hostName), force, errorOccurred)`
`41`	`41`	`} else {`
`42`	`42`	`log.Infof("Successfully removed %s", hostName)`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`- if len(errorOccured) > 0 && !force {`
`48`		`- return errors.New(strings.Join(errorOccured, "\n"))`
	`47`	`+ if len(errorOccurred) > 0 && !force {`
	`48`	`+ return errors.New(strings.Join(errorOccurred, "\n"))`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`return nil`
`@@ -81,9 +81,9 @@ func removeLocalMachine(hostName string, api libmachine.API) error {`
`81`	`81`	`return api.Remove(hostName)`
`82`	`82`	`}`
`83`	`83`
`84`		`-func collectError(message string, force bool, errorOccured []string) []string {`
	`84`	`+func collectError(message string, force bool, errorOccurred []string) []string {`
`85`	`85`	`if force {`
`86`	`86`	`log.Error(message)`
`87`	`87`	`}`
`88`		`- return append(errorOccured, message)`
	`88`	`+ return append(errorOccurred, message)`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ func (d *Driver) checkPrereqs() error {`
`452`	`452`	`return fmt.Errorf("There is no keypair with the name %s. Please verify the key name provided.", keyName)`
`453`	`453`	`}`
`454`	`454`	`if awsErr.Code() == keypairNotFoundCode && !keyShouldExist {`
`455`		`- // Not a real error for 'NotFound' since we're checking existance`
	`455`	`+ // Not a real error for 'NotFound' since we're checking existence`
`456`	`456`	`}`
`457`	`457`	`} else {`
`458`	`458`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ func (d *Driver) Remove() error {`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`// NOTE(ahmetalpbalkan):`
`407`		`- // - remove attemps are best effort and if a resource is already gone, we`
	`407`	`+ // - remove attempts are best effort and if a resource is already gone, we`
`408`	`408`	`// continue removing other resources instead of failing.`
`409`	`409`	`// - we can probably do a lot of parallelization here but a sequential`
`410`	`410`	`// logic works fine too. If we were to detach the NIC from the VM and`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ func validateToken(env azure.Environment, token *azure.ServicePrincipalToken) er`
`238`	`238`	`return nil`
`239`	`239`	`}`
`240`	`240`
`241`		`-// getScope returns the API scope for authnetication tokens.`
	`241`	`+// getScope returns the API scope for authentication tokens.`
`242`	`242`	`func getScope(env azure.Environment) string {`
`243`	`243`	`// for AzurePublicCloud (https://management.core.windows.net/), this old`
`244`	`244`	`// Service Management scope covers both ASM and ARM.`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"github.com/Azure/go-autorest/autorest/azure"`
`16`	`16`	`)`
`17`	`17`
`18`		`-// laodOrFindTenantID figures out the AAD tenant ID of the subscription by first`
	`18`	`+// loadOrFindTenantID figures out the AAD tenant ID of the subscription by first`
`19`	`19`	`// looking at the cache file, if not exists, makes a network call to load it and`
`20`	`20`	`// cache it for future use.`
`21`	`21`	`func loadOrFindTenantID(env azure.Environment, subscriptionID string) (string, error) {`