Skip to content

Commit

Permalink
Merge pull request #10302 from manadart/2.5-spelling-corrections
Browse files Browse the repository at this point in the history
#10302

## Description of change

This patch is non-functional spelling corrections that have begun to be surfaced by linting in CI.
  • Loading branch information
jujubot committed Jun 10, 2019
2 parents b00789c + c62652a commit 890482e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions environs/manual/winrmprovisioner/winrmprovisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ func InitAdministratorUser(args *manual.ProvisionMachineArgs) error {

logger.Infof("Trying http client as user %s on %s", args.Host, args.User)
if err = args.WinRM.Client.Ping(); err != nil {
logger.Debugf("WinRM unsecure listener is not enabled on %s", args.Host)
logger.Debugf("WinRM insecure listener is not enabled on %s", args.Host)
return errors.Annotatef(err, "cannot provision, because all winrm default connections failed")
}

defClient := args.WinRM.Client
logger.Infof("Trying to enable https client certificate authentication")
if args.WinRM.Client, err = enableCertAuth(args); err != nil {
logger.Infof("Cannot enable client auth cert authentication for winrm")
logger.Infof("Reverting back to usecure client interaction")
logger.Infof("Reverting back to insecure client interaction")
args.WinRM.Client = defClient
return nil
}
Expand All @@ -160,8 +160,8 @@ func InitAdministratorUser(args *manual.ProvisionMachineArgs) error {
return nil
}

logger.Infof("Winrm https connection is broken, can't retrive a response")
logger.Infof("Reverting back to usecure client interactions")
logger.Infof("Winrm https connection is broken, cannot retrieve a response")
logger.Infof("Reverting back to insecure client interactions")
args.WinRM.Client = defClient

return nil
Expand Down Expand Up @@ -413,7 +413,7 @@ func DetectSeriesAndHardwareCharacteristics(host string, cli manual.WinrmClientA
return hc, series, nil
}

// initHC it will initialize the hardware characterisrics struct with the
// initHC it will initialize the hardware characteristics struct with the
// parsed and checked info slice string
// info description :
// - info[0] the arch of the machine
Expand Down
2 changes: 1 addition & 1 deletion provider/openstack/credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func (c OpenstackCredentials) DetectCredentials() (*cloud.CloudCredential, error
func (c OpenstackCredentials) detectCredential() (*cloud.Credential, string, string, error) {
creds, err := identity.CredentialsFromEnv()
if err != nil {
return nil, "", "", errors.Errorf("failed to retrive cred from env : %v", err)
return nil, "", "", errors.Errorf("failed to retrieve credential from env : %v", err)
}
if creds.TenantName == "" {
logger.Debugf("neither OS_TENANT_NAME nor OS_PROJECT_NAME environment variable not set")
Expand Down
2 changes: 1 addition & 1 deletion provider/openstack/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ func (EnvironProvider) DetectRegions() ([]cloud.Region, error) {
// return return a region using them.
creds, err := identity.CredentialsFromEnv()
if err != nil {
return nil, errors.Errorf("failed to retrive cred from env : %v", err)
return nil, errors.Errorf("failed to retrieve credential from env : %v", err)
}
if creds.Region == "" {
return nil, errors.NewNotFound(nil, "OS_REGION_NAME environment variable not set")
Expand Down

0 comments on commit 890482e

Please sign in to comment.