Merge pull request #4497 from hashicorp/b-aws-iam-role-test-fix
provider/aws: Update some IAM tests
This commit is contained in:
commit
89f71d4ec4
|
@ -5,6 +5,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/aws/aws-sdk-go/aws"
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/aws/aws-sdk-go/aws/awserr"
|
||||||
"github.com/aws/aws-sdk-go/service/iam"
|
"github.com/aws/aws-sdk-go/service/iam"
|
||||||
"github.com/hashicorp/terraform/helper/resource"
|
"github.com/hashicorp/terraform/helper/resource"
|
||||||
"github.com/hashicorp/terraform/terraform"
|
"github.com/hashicorp/terraform/terraform"
|
||||||
|
@ -39,8 +40,33 @@ func TestAccAWSIAMRolePolicy_basic(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func testAccCheckIAMRolePolicyDestroy(s *terraform.State) error {
|
func testAccCheckIAMRolePolicyDestroy(s *terraform.State) error {
|
||||||
if len(s.RootModule().Resources) > 0 {
|
iamconn := testAccProvider.Meta().(*AWSClient).iamconn
|
||||||
return fmt.Errorf("Expected all resources to be gone, but found: %#v", s.RootModule().Resources)
|
|
||||||
|
for _, rs := range s.RootModule().Resources {
|
||||||
|
if rs.Type != "aws_iam_role_policy" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
role, name := resourceAwsIamRolePolicyParseId(rs.Primary.ID)
|
||||||
|
|
||||||
|
request := &iam.GetRolePolicyInput{
|
||||||
|
PolicyName: aws.String(name),
|
||||||
|
RoleName: aws.String(role),
|
||||||
|
}
|
||||||
|
|
||||||
|
var err error
|
||||||
|
getResp, err := iamconn.GetRolePolicy(request)
|
||||||
|
if err != nil {
|
||||||
|
if iamerr, ok := err.(awserr.Error); ok && iamerr.Code() == "NoSuchEntity" {
|
||||||
|
// none found, that's good
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf("Error reading IAM policy %s from role %s: %s", name, role, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if getResp != nil {
|
||||||
|
return fmt.Errorf("Found IAM Role, expected none: %s", getResp)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/aws/aws-sdk-go/aws"
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/aws/aws-sdk-go/aws/awserr"
|
||||||
"github.com/aws/aws-sdk-go/service/iam"
|
"github.com/aws/aws-sdk-go/service/iam"
|
||||||
"github.com/hashicorp/terraform/helper/resource"
|
"github.com/hashicorp/terraform/helper/resource"
|
||||||
"github.com/hashicorp/terraform/terraform"
|
"github.com/hashicorp/terraform/terraform"
|
||||||
|
@ -33,8 +34,28 @@ func TestAccAWSIAMSamlProvider_basic(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func testAccCheckIAMSamlProviderDestroy(s *terraform.State) error {
|
func testAccCheckIAMSamlProviderDestroy(s *terraform.State) error {
|
||||||
if len(s.RootModule().Resources) > 0 {
|
iamconn := testAccProvider.Meta().(*AWSClient).iamconn
|
||||||
return fmt.Errorf("Expected all resources to be gone, but found: %#v", s.RootModule().Resources)
|
|
||||||
|
for _, rs := range s.RootModule().Resources {
|
||||||
|
if rs.Type != "aws_iam_saml_provider" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
input := &iam.GetSAMLProviderInput{
|
||||||
|
SAMLProviderArn: aws.String(rs.Primary.ID),
|
||||||
|
}
|
||||||
|
out, err := iamconn.GetSAMLProvider(input)
|
||||||
|
if err != nil {
|
||||||
|
if iamerr, ok := err.(awserr.Error); ok && iamerr.Code() == "NoSuchEntity" {
|
||||||
|
// none found, that's good
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf("Error reading IAM SAML Provider, out: %s, err: %s", out, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if out != nil {
|
||||||
|
return fmt.Errorf("Found IAM SAML Provider, expected none: %s", out)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/aws/aws-sdk-go/aws"
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/aws/aws-sdk-go/aws/awserr"
|
||||||
"github.com/aws/aws-sdk-go/service/iam"
|
"github.com/aws/aws-sdk-go/service/iam"
|
||||||
"github.com/hashicorp/terraform/helper/resource"
|
"github.com/hashicorp/terraform/helper/resource"
|
||||||
"github.com/hashicorp/terraform/terraform"
|
"github.com/hashicorp/terraform/terraform"
|
||||||
|
@ -39,8 +40,33 @@ func TestAccAWSIAMUserPolicy_basic(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func testAccCheckIAMUserPolicyDestroy(s *terraform.State) error {
|
func testAccCheckIAMUserPolicyDestroy(s *terraform.State) error {
|
||||||
if len(s.RootModule().Resources) > 0 {
|
iamconn := testAccProvider.Meta().(*AWSClient).iamconn
|
||||||
return fmt.Errorf("Expected all resources to be gone, but found: %#v", s.RootModule().Resources)
|
|
||||||
|
for _, rs := range s.RootModule().Resources {
|
||||||
|
if rs.Type != "aws_iam_user_policy" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
role, name := resourceAwsIamRolePolicyParseId(rs.Primary.ID)
|
||||||
|
|
||||||
|
request := &iam.GetRolePolicyInput{
|
||||||
|
PolicyName: aws.String(name),
|
||||||
|
RoleName: aws.String(role),
|
||||||
|
}
|
||||||
|
|
||||||
|
var err error
|
||||||
|
getResp, err := iamconn.GetRolePolicy(request)
|
||||||
|
if err != nil {
|
||||||
|
if iamerr, ok := err.(awserr.Error); ok && iamerr.Code() == "NoSuchEntity" {
|
||||||
|
// none found, that's good
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf("Error reading IAM policy %s from role %s: %s", name, role, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if getResp != nil {
|
||||||
|
return fmt.Errorf("Found IAM Role, expected none: %s", getResp)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
Loading…
Reference in New Issue