re-go-fmt after rebase

use us-west-2 region in tests

update test with working config

provider/aws: Update EMR contribution with passing test, polling for instance in DELETE method

remove defaulted role

document emr_cluster

rename aws_emr -> aws_emr_cluster

update docs for name change

update delete timeout/polling

rename emr taskgroup to emr instance group

default instance group count to 0, down from 60

update to ref emr_cluster, emr_instance_group

more cleanups for instance groups; need to read and update

add read, delete method for instance groups

refactor the read method to seperate out the fetching of the specific group

more refactoring for finding instance groups

update emr instance group docs

err check on reading HTTP. Dont' return the error, just log it

refactor the create method to catch optionals

additional cleanups, added a read method

update test to be non-master-only

wrap up the READ method for clusters

poll for instance group to be running after a modification

patch up a possible deref

provider/aws: EMR cleanups

fix test naming

remove outdated docs

randomize emr_profile names

Author: catsby

builtin/providers/aws/provider.go

@@ -232,13 +232,13 @@ func Provider() terraform.ResourceProvider {
 			"aws_elasticsearch_domain":                     resourceAwsElasticSearchDomain(),
 			"aws_elastictranscoder_pipeline":               resourceAwsElasticTranscoderPipeline(),
 			"aws_elastictranscoder_preset":                 resourceAwsElasticTranscoderPreset(),
-                        "aws_elb":                                      resourceAwsElb(),
-                        "aws_elb_attachment":                           resourceAwsElbAttachment(),
-                        "aws_emr":                                      resourceAwsEMR(),
-                        "aws_emr_task_group":                           resourceAwsEMRTaskGroup(),
-                        "aws_flow_log":                                 resourceAwsFlowLog(),
-                        "aws_glacier_vault":                            resourceAwsGlacierVault(),
-                        "aws_iam_access_key":                           resourceAwsIamAccessKey(),
+			"aws_elb":                                      resourceAwsElb(),
+			"aws_elb_attachment":                           resourceAwsElbAttachment(),
+			"aws_emr_cluster":                              resourceAwsEMRCluster(),
+			"aws_emr_instance_group":                       resourceAwsEMRInstanceGroup(),
+			"aws_flow_log":                                 resourceAwsFlowLog(),
+			"aws_glacier_vault":                            resourceAwsGlacierVault(),
+			"aws_iam_access_key":                           resourceAwsIamAccessKey(),
 			"aws_iam_account_password_policy":              resourceAwsIamAccountPasswordPolicy(),
 			"aws_iam_group_policy":                         resourceAwsIamGroupPolicy(),
 			"aws_iam_group":                                resourceAwsIamGroup(),