From 2ad84a51dfa838d8c9af86a6bcb6659c8e27c672 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Mon, 12 Sep 2016 07:14:24 +0100 Subject: [PATCH] provider/aws: Fix misspelled words --- builtin/providers/aws/auth_helpers_test.go | 2 +- builtin/providers/aws/provider.go | 4 ++-- .../providers/aws/resource_aws_autoscaling_group.go | 2 +- .../aws/resource_aws_cloudfront_distribution.go | 2 +- .../aws/resource_aws_efs_mount_target_test.go | 6 +++--- .../aws/resource_aws_iam_server_certificate_test.go | 2 +- builtin/providers/aws/resource_aws_iam_user.go | 2 +- .../providers/aws/resource_aws_lambda_permission.go | 2 +- .../providers/aws/resource_aws_rds_cluster_instance.go | 2 +- .../aws/resource_aws_redshift_security_group.go | 4 ++-- builtin/providers/aws/resource_aws_s3_bucket.go | 2 +- builtin/providers/aws/resource_aws_security_group.go | 2 +- .../providers/aws/resource_aws_security_group_rule.go | 2 +- .../resource_aws_security_group_rules_matching_test.go | 2 +- builtin/providers/aws/structure.go | 10 +++++----- builtin/providers/aws/structure_test.go | 4 ++-- builtin/providers/aws/validators_test.go | 4 ++-- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/builtin/providers/aws/auth_helpers_test.go b/builtin/providers/aws/auth_helpers_test.go index f29d3f3e1..5600e9245 100644 --- a/builtin/providers/aws/auth_helpers_test.go +++ b/builtin/providers/aws/auth_helpers_test.go @@ -540,7 +540,7 @@ func TestAWSGetCredentials_shouldBeENV(t *testing.T) { } } -// unsetEnv unsets enviornment variables for testing a "clean slate" with no +// unsetEnv unsets environment variables for testing a "clean slate" with no // credentials in the environment func unsetEnv(t *testing.T) func() { // Grab any existing AWS keys and preserve. In some tests we'll unset these, so diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go index e7b23fd61..28e19a157 100644 --- a/builtin/providers/aws/provider.go +++ b/builtin/providers/aws/provider.go @@ -404,10 +404,10 @@ func init() { "assume_role_role_arn": "The ARN of an IAM role to assume prior to making API calls.", - "assume_role_session_name": "The session name to use when assuming the role. If ommitted," + + "assume_role_session_name": "The session name to use when assuming the role. If omitted," + " no session name is passed to the AssumeRole call.", - "assume_role_external_id": "The external ID to use when assuming the role. If ommitted," + + "assume_role_external_id": "The external ID to use when assuming the role. If omitted," + " no external ID is passed to the AssumeRole call.", } } diff --git a/builtin/providers/aws/resource_aws_autoscaling_group.go b/builtin/providers/aws/resource_aws_autoscaling_group.go index 86ebc53a3..c35552605 100644 --- a/builtin/providers/aws/resource_aws_autoscaling_group.go +++ b/builtin/providers/aws/resource_aws_autoscaling_group.go @@ -503,7 +503,7 @@ func resourceAwsAutoscalingGroupUpdate(d *schema.ResourceData, meta interface{}) if v, ok := d.GetOk("termination_policies"); ok && len(v.([]interface{})) > 0 { opts.TerminationPolicies = expandStringList(v.([]interface{})) } else { - log.Printf("[DEBUG] Explictly setting null termination policy to 'Default'") + log.Printf("[DEBUG] Explicitly setting null termination policy to 'Default'") opts.TerminationPolicies = aws.StringSlice([]string{"Default"}) } } diff --git a/builtin/providers/aws/resource_aws_cloudfront_distribution.go b/builtin/providers/aws/resource_aws_cloudfront_distribution.go index 4d6af9d94..8e938b9d3 100644 --- a/builtin/providers/aws/resource_aws_cloudfront_distribution.go +++ b/builtin/providers/aws/resource_aws_cloudfront_distribution.go @@ -544,7 +544,7 @@ func resourceAwsCloudFrontDistributionDelete(d *schema.ResourceData, meta interf // skip delete if retain_on_delete is enabled if d.Get("retain_on_delete").(bool) { - log.Printf("[WARN] Removing Distribtuion ID %s with retain_on_delete set. Please delete this distribution manually.", d.Id()) + log.Printf("[WARN] Removing Distributions ID %s with retain_on_delete set. Please delete this distribution manually.", d.Id()) d.SetId("") return nil } diff --git a/builtin/providers/aws/resource_aws_efs_mount_target_test.go b/builtin/providers/aws/resource_aws_efs_mount_target_test.go index 78f5faa7e..6d7496a66 100644 --- a/builtin/providers/aws/resource_aws_efs_mount_target_test.go +++ b/builtin/providers/aws/resource_aws_efs_mount_target_test.go @@ -87,10 +87,10 @@ func TestAccAWSEFSMountTarget_disappears(t *testing.T) { } func TestResourceAWSEFSMountTarget_mountTargetDnsName(t *testing.T) { - actual := resourceAwsEfsMountTargetDnsName("non-existant-1c", - "fs-123456ab", "non-existant-1") + actual := resourceAwsEfsMountTargetDnsName("non-existent-1c", + "fs-123456ab", "non-existent-1") - expected := "non-existant-1c.fs-123456ab.efs.non-existant-1.amazonaws.com" + expected := "non-existent-1c.fs-123456ab.efs.non-existent-1.amazonaws.com" if actual != expected { t.Fatalf("Expected EFS mount target DNS name to be %s, got %s", expected, actual) diff --git a/builtin/providers/aws/resource_aws_iam_server_certificate_test.go b/builtin/providers/aws/resource_aws_iam_server_certificate_test.go index a6fccb988..11b109296 100644 --- a/builtin/providers/aws/resource_aws_iam_server_certificate_test.go +++ b/builtin/providers/aws/resource_aws_iam_server_certificate_test.go @@ -63,7 +63,7 @@ func TestAccAWSIAMServerCertificate_disappears(t *testing.T) { }) if err != nil { - return fmt.Errorf("Error destorying cert in test: %s", err) + return fmt.Errorf("Error destroying cert in test: %s", err) } return nil diff --git a/builtin/providers/aws/resource_aws_iam_user.go b/builtin/providers/aws/resource_aws_iam_user.go index 7fd3509ef..d37646360 100644 --- a/builtin/providers/aws/resource_aws_iam_user.go +++ b/builtin/providers/aws/resource_aws_iam_user.go @@ -30,7 +30,7 @@ func resourceAwsIamUser() *schema.Resource { The UniqueID could be used as the Id(), but none of the API calls allow specifying a user by the UniqueID: they require the name. The only way to locate a user by UniqueID is to list them - all and that would make this provider unnecessarilly complex + all and that would make this provider unnecessarily complex and inefficient. Still, there are other reasons one might want the UniqueID, so we can make it available. */ diff --git a/builtin/providers/aws/resource_aws_lambda_permission.go b/builtin/providers/aws/resource_aws_lambda_permission.go index ea6a2f0be..f2b9a3941 100644 --- a/builtin/providers/aws/resource_aws_lambda_permission.go +++ b/builtin/providers/aws/resource_aws_lambda_permission.go @@ -144,7 +144,7 @@ func resourceAwsLambdaPermissionCreate(d *schema.ResourceData, meta interface{}) *input.FunctionName, err)) } - log.Printf("[ERROR] An actual error occured when expecting Lambda policy to be there: %s", err) + log.Printf("[ERROR] An actual error occurred when expecting Lambda policy to be there: %s", err) return resource.NonRetryableError(err) } return nil diff --git a/builtin/providers/aws/resource_aws_rds_cluster_instance.go b/builtin/providers/aws/resource_aws_rds_cluster_instance.go index 4cc403a3f..7cb995da1 100644 --- a/builtin/providers/aws/resource_aws_rds_cluster_instance.go +++ b/builtin/providers/aws/resource_aws_rds_cluster_instance.go @@ -195,7 +195,7 @@ func resourceAwsRDSClusterInstanceRead(d *schema.ResourceData, meta interface{}) return nil } - // Retreive DB Cluster information, to determine if this Instance is a writer + // Retrieve DB Cluster information, to determine if this Instance is a writer conn := meta.(*AWSClient).rdsconn resp, err := conn.DescribeDBClusters(&rds.DescribeDBClustersInput{ DBClusterIdentifier: db.DBClusterIdentifier, diff --git a/builtin/providers/aws/resource_aws_redshift_security_group.go b/builtin/providers/aws/resource_aws_redshift_security_group.go index 84de59669..24a45bfde 100644 --- a/builtin/providers/aws/resource_aws_redshift_security_group.go +++ b/builtin/providers/aws/resource_aws_redshift_security_group.go @@ -347,7 +347,7 @@ func expandRedshiftSGAuthorizeIngress(configured []interface{}) ([]redshift.Auth var ingress []redshift.AuthorizeClusterSecurityGroupIngressInput // Loop over our configured parameters and create - // an array of aws-sdk-go compatabile objects + // an array of aws-sdk-go compatible objects for _, pRaw := range configured { data := pRaw.(map[string]interface{}) @@ -375,7 +375,7 @@ func expandRedshiftSGRevokeIngress(configured []interface{}) ([]redshift.RevokeC var ingress []redshift.RevokeClusterSecurityGroupIngressInput // Loop over our configured parameters and create - // an array of aws-sdk-go compatabile objects + // an array of aws-sdk-go compatible objects for _, pRaw := range configured { data := pRaw.(map[string]interface{}) diff --git a/builtin/providers/aws/resource_aws_s3_bucket.go b/builtin/providers/aws/resource_aws_s3_bucket.go index 28ae61e34..09c8ddb3e 100644 --- a/builtin/providers/aws/resource_aws_s3_bucket.go +++ b/builtin/providers/aws/resource_aws_s3_bucket.go @@ -589,7 +589,7 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error { if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() != "UnsupportedArgument" { return err } - log.Printf("[WARN] S3 bucket: %s, the S3 Transfer Accelaration is not supported in the region: %s", d.Id(), meta.(*AWSClient).region) + log.Printf("[WARN] S3 bucket: %s, the S3 Transfer Acceleration is not supported in the region: %s", d.Id(), meta.(*AWSClient).region) } else { log.Printf("[DEBUG] S3 bucket: %s, read Acceleration: %v", d.Id(), accelerate) d.Set("acceleration_status", accelerate.Status) diff --git a/builtin/providers/aws/resource_aws_security_group.go b/builtin/providers/aws/resource_aws_security_group.go index 65e37562f..15cfcb0e0 100644 --- a/builtin/providers/aws/resource_aws_security_group.go +++ b/builtin/providers/aws/resource_aws_security_group.go @@ -761,7 +761,7 @@ func matchRules(rType string, local []interface{}, remote []map[string]interface if rcRaw != nil { remoteCidrs = rcRaw.([]string) } - // convert remote cidrs to a set, for easy comparisions + // convert remote cidrs to a set, for easy comparisons var list []interface{} for _, s := range remoteCidrs { list = append(list, s) diff --git a/builtin/providers/aws/resource_aws_security_group_rule.go b/builtin/providers/aws/resource_aws_security_group_rule.go index e112878a5..4b18b24c0 100644 --- a/builtin/providers/aws/resource_aws_security_group_rule.go +++ b/builtin/providers/aws/resource_aws_security_group_rule.go @@ -168,7 +168,7 @@ information and instructions for recovery. Error message: %s`, sg_id, awsErr.Mes sg, err := findResourceSecurityGroup(conn, sg_id) if err != nil { - log.Printf("[DEBUG] Error finding Secuirty Group (%s) for Rule (%s): %s", sg_id, id, err) + log.Printf("[DEBUG] Error finding Security Group (%s) for Rule (%s): %s", sg_id, id, err) return resource.NonRetryableError(err) } diff --git a/builtin/providers/aws/resource_aws_security_group_rules_matching_test.go b/builtin/providers/aws/resource_aws_security_group_rules_matching_test.go index fe82d3ec8..5a48733b6 100644 --- a/builtin/providers/aws/resource_aws_security_group_rules_matching_test.go +++ b/builtin/providers/aws/resource_aws_security_group_rules_matching_test.go @@ -313,7 +313,7 @@ func TestRulesMixedMatching(t *testing.T) { }, }, }, - // a local rule with 2 cidrs, remote has 4 cidrs, shoudl be saved to match + // a local rule with 2 cidrs, remote has 4 cidrs, should be saved to match // the local but also an extra rule found { local: []interface{}{ diff --git a/builtin/providers/aws/structure.go b/builtin/providers/aws/structure.go index da34e7cc3..69e372351 100644 --- a/builtin/providers/aws/structure.go +++ b/builtin/providers/aws/structure.go @@ -35,7 +35,7 @@ func expandListeners(configured []interface{}) ([]*elb.Listener, error) { listeners := make([]*elb.Listener, 0, len(configured)) // Loop over our configured listeners and create - // an array of aws-sdk-go compatabile objects + // an array of aws-sdk-go compatible objects for _, lRaw := range configured { data := lRaw.(map[string]interface{}) @@ -234,7 +234,7 @@ func expandParameters(configured []interface{}) ([]*rds.Parameter, error) { var parameters []*rds.Parameter // Loop over our configured parameters and create - // an array of aws-sdk-go compatabile objects + // an array of aws-sdk-go compatible objects for _, pRaw := range configured { data := pRaw.(map[string]interface{}) @@ -258,7 +258,7 @@ func expandRedshiftParameters(configured []interface{}) ([]*redshift.Parameter, var parameters []*redshift.Parameter // Loop over our configured parameters and create - // an array of aws-sdk-go compatabile objects + // an array of aws-sdk-go compatible objects for _, pRaw := range configured { data := pRaw.(map[string]interface{}) @@ -341,7 +341,7 @@ func expandElastiCacheParameters(configured []interface{}) ([]*elasticache.Param parameters := make([]*elasticache.ParameterNameValue, 0, len(configured)) // Loop over our configured parameters and create - // an array of aws-sdk-go compatabile objects + // an array of aws-sdk-go compatible objects for _, pRaw := range configured { data := pRaw.(map[string]interface{}) @@ -1356,7 +1356,7 @@ func flattenBeanstalkTrigger(list []*elasticbeanstalk.Trigger) []string { } // There are several parts of the AWS API that will sort lists of strings, -// causing diffs inbetweeen resources that use lists. This avoids a bit of +// causing diffs inbetween resources that use lists. This avoids a bit of // code duplication for pre-sorts that can be used for things like hash // functions, etc. func sortInterfaceSlice(in []interface{}) []interface{} { diff --git a/builtin/providers/aws/structure_test.go b/builtin/providers/aws/structure_test.go index 90a66653b..981e199c2 100644 --- a/builtin/providers/aws/structure_test.go +++ b/builtin/providers/aws/structure_test.go @@ -899,7 +899,7 @@ func TestFlattenSecurityGroups(t *testing.T) { }, // include the owner id, but from a different account. This is reflects - // EC2 Classic when refering to groups by name + // EC2 Classic when referring to groups by name { ownerId: aws.String("user1234"), pairs: []*ec2.UserIdGroupPair{ @@ -918,7 +918,7 @@ func TestFlattenSecurityGroups(t *testing.T) { }, // include the owner id, but from a different account. This reflects in - // EC2 VPC when refering to groups by id + // EC2 VPC when referring to groups by id { ownerId: aws.String("user1234"), pairs: []*ec2.UserIdGroupPair{ diff --git a/builtin/providers/aws/validators_test.go b/builtin/providers/aws/validators_test.go index f142c8af6..fdf1d3e28 100644 --- a/builtin/providers/aws/validators_test.go +++ b/builtin/providers/aws/validators_test.go @@ -88,7 +88,7 @@ func TestValidateLambdaFunctionName(t *testing.T) { invalidNames := []string{ "/FunctionNameWithSlash", "function.name.with.dots", - // lenght > 140 + // length > 140 "arn:aws:lambda:us-west-2:123456789012:function:TooLoooooo" + "ooooooooooooooooooooooooooooooooooooooooooooooooooooooo" + "ooooooooooooooooongFunctionName", @@ -119,7 +119,7 @@ func TestValidateLambdaQualifier(t *testing.T) { invalidNames := []string{ // No ARNs allowed "arn:aws:lambda:us-west-2:123456789012:function:prod", - // lenght > 128 + // length > 128 "TooLooooooooooooooooooooooooooooooooooooooooooooooooooo" + "ooooooooooooooooooooooooooooooooooooooooooooooooooo" + "oooooooooooongQualifier",