Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

issue #5412 AWS SSM DoesNotExistException for missing Maintenance Window #5416

Merged
merged 4 commits into from
Aug 2, 2018
Merged

issue #5412 AWS SSM DoesNotExistException for missing Maintenance Window #5416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9dee39b
fix issue #5412
saravanan30erd Aug 1, 2018
34e34c7
verify acceptance test
saravanan30erd Aug 2, 2018
e7314dc
add acceptance test to address issue #5412
saravanan30erd Aug 2, 2018
1389092
update acceptance tests for ssm_maintenance_window
saravanan30erd Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions aws/resource_aws_ssm_maintenance_window.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@ func resourceAwsSsmMaintenanceWindowUpdate(d *schema.ResourceData, meta interfac

_, err := ssmconn.UpdateMaintenanceWindow(params)
if err != nil {
if isAWSErr(err, ssm.ErrCodeDoesNotExistException, "") {
log.Printf("[WARN] Maintenance Window %s not found, removing from state", d.Id())
d.SetId("")
return nil
}
return err
}

Expand All @@ -117,6 +122,11 @@ func resourceAwsSsmMaintenanceWindowRead(d *schema.ResourceData, meta interface{

resp, err := ssmconn.GetMaintenanceWindow(params)
if err != nil {
if isAWSErr(err, ssm.ErrCodeDoesNotExistException, "") {
log.Printf("[WARN] Maintenance Window %s not found, removing from state", d.Id())
d.SetId("")
return nil
}
return err
}

Expand Down
52 changes: 46 additions & 6 deletions aws/resource_aws_ssm_maintenance_window_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import (
)

func TestAccAWSSSMMaintenanceWindow_basic(t *testing.T) {
var winId ssm.MaintenanceWindowIdentity
name := acctest.RandString(10)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Expand All @@ -21,7 +23,7 @@ func TestAccAWSSSMMaintenanceWindow_basic(t *testing.T) {
{
Config: testAccAWSSSMMaintenanceWindowBasicConfig(name),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSSSMMaintenanceWindowExists("aws_ssm_maintenance_window.foo"),
testAccCheckAWSSSMMaintenanceWindowExists("aws_ssm_maintenance_window.foo", &winId),
resource.TestCheckResourceAttr(
"aws_ssm_maintenance_window.foo", "schedule", "cron(0 16 ? * TUE *)"),
resource.TestCheckResourceAttr(
Expand All @@ -37,7 +39,7 @@ func TestAccAWSSSMMaintenanceWindow_basic(t *testing.T) {
{
Config: testAccAWSSSMMaintenanceWindowBasicConfigUpdated(name),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSSSMMaintenanceWindowExists("aws_ssm_maintenance_window.foo"),
testAccCheckAWSSSMMaintenanceWindowExists("aws_ssm_maintenance_window.foo", &winId),
resource.TestCheckResourceAttr(
"aws_ssm_maintenance_window.foo", "schedule", "cron(0 16 ? * WED *)"),
resource.TestCheckResourceAttr(
Expand All @@ -54,7 +56,29 @@ func TestAccAWSSSMMaintenanceWindow_basic(t *testing.T) {
})
}

func testAccCheckAWSSSMMaintenanceWindowExists(n string) resource.TestCheckFunc {
func TestAccAWSSSMMaintenanceWindow_disappears(t *testing.T) {
var winId ssm.MaintenanceWindowIdentity
name := acctest.RandString(10)
resourceName := "aws_ssm_maintenance_window.foo"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSSMMaintenanceWindowDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSSSMMaintenanceWindowBasicConfig(name),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSSSMMaintenanceWindowExists(resourceName, &winId),
testAccCheckAWSSSMMaintenanceWindowDisappears(&winId),
),
ExpectNonEmptyPlan: true,
},
},
})
}

func testAccCheckAWSSSMMaintenanceWindowExists(n string, res *ssm.MaintenanceWindowIdentity) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
if !ok {
Expand All @@ -75,20 +99,36 @@ func testAccCheckAWSSSMMaintenanceWindowExists(n string) resource.TestCheckFunc
},
},
})
if err != nil {
return err
}

for _, i := range resp.WindowIdentities {
if *i.WindowId == rs.Primary.ID {
*res = *i
return nil
}
}
if err != nil {
return err
}

return fmt.Errorf("No AWS SSM Maintenance window found")
}
}

func testAccCheckAWSSSMMaintenanceWindowDisappears(maintenanceWindowIdentity *ssm.MaintenanceWindowIdentity) resource.TestCheckFunc {
return func(s *terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).ssmconn

id := aws.StringValue(maintenanceWindowIdentity.WindowId)
_, err := conn.DeleteMaintenanceWindow(&ssm.DeleteMaintenanceWindowInput{
WindowId: aws.String(id),
})
if err != nil {
return fmt.Errorf("error deleting maintenance window %s: %s", id, err)
}
return nil
}
}

func testAccCheckAWSSSMMaintenanceWindowDestroy(s *terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).ssmconn

Expand Down