Merge pull request #154 from Cox-Automotive/develop

Develop

docs/guides/local_installation.md

@@ -88,11 +88,3 @@ mkdir -p ~/.terraform.d/plugins/Cox-Automotive/engineering-enablement/alks/2.0.5
   ```
 
 * Note: If you've previously installed our provider, and it is stored in your remote state: you may need to run the [`replace-provider` command](https://www.terraform.io/docs/commands/state/replace-provider.html).
-
----
-
-### Supported Versions
-
-| Terraform 0.10.x       |  Terraform 0.11.x        | Terraform 0.12.x - Terraform 0.15.x  | Terraform 1.0.x   |
-| ---------------------- | ------------------------ | ------------------------------------ | ----------------- |
-| ALKS TFP 0.9.0 < 1.3.0 | ALKS TFP 1.3.0 < 1.5.15  | ALKS TFP 1.3.0+                      | ALKS TFP 2.0.0+   |

docs/index.md

@@ -162,4 +162,10 @@ In addition to [generic `provider` arguments](https://www.terraform.io/docs/conf
     * `policy` - (Optional) This specifies additional policy restrictions to apply to the resulting STS credentials beyond any existing inline or managed policies. Please see the AWS SDK documentation for more information.
 
 ---
+### Supported Versions
+
+| Terraform 0.10.x       |  Terraform 0.11.x        | Terraform 0.12.x - Terraform 0.15.x  | Terraform 1.0.x   |
+| ---------------------- | ------------------------ | ------------------------------------ | ----------------- |
+| ALKS TFP 0.9.0 < 1.3.0 | ALKS TFP 1.3.0 < 1.5.15  | ALKS TFP 1.3.0+                      | ALKS TFP 2.0.0+   |
+
 For questions, please reach out to the [ALKS team](https://github.com/orgs/Cox-Automotive/teams/cai-internal-tools).

helpers.go

@@ -14,8 +14,8 @@ func validateIAMEnabled(client *alks.Client) error {
 	}
 
 	if !resp.LoginRole.IamKeyActive {
-		return errors.New("Looks like you are not using ALKS IAM credentials. This will result in errors when creating roles. \n " +
-			"Note: If using ALKS CLI to get credentials, be sure to use the '-i' flag. \n Please see https://coxautoinc.sharepoint.com/sites/service-internal-tools-team/SitePages/ALKS-Terraform-Provider---Troubleshooting.aspx for more information.")
+		return errors.New("uh oh! You're using the " + resp.LoginRole.Role + " role which is not IAM active. " +
+			"Please instead use one of the following roles: Admin, IAMAdmin, LabAdmin, or a Machine Identity")
 	}
 
 	return nil