From 9f1609e8ace646a96b5efc0d6fe076fc3260a28c Mon Sep 17 00:00:00 2001
From: Brian Flad <bflad417@gmail.com>
Date: Wed, 22 Jul 2020 20:33:18 -0400
Subject: [PATCH] resource/aws_ssm_maintenance_window_task: Remove deprecated
 logging_info and task_parameters configuration blocks

Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/7823
Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/13398

Output from acceptance testing:

```
--- PASS: TestAccAWSSSMMaintenanceWindowTask_emptyNotificationConfig (13.56s)
--- PASS: TestAccAWSSSMMaintenanceWindowTask_TaskInvocationStepFunctionParameters (14.66s)
--- PASS: TestAccAWSSSMMaintenanceWindowTask_updateForcesNewResource (22.46s)
--- PASS: TestAccAWSSSMMaintenanceWindowTask_basic (22.75s)
--- PASS: TestAccAWSSSMMaintenanceWindowTask_TaskInvocationLambdaParameters (36.30s)
--- PASS: TestAccAWSSSMMaintenanceWindowTask_TaskInvocationAutomationParameters (36.56s)
--- PASS: TestAccAWSSSMMaintenanceWindowTask_TaskInvocationRunCommandParameters (39.53s)
```
---
 ...esource_aws_ssm_maintenance_window_task.go | 135 +----------------
 ...ce_aws_ssm_maintenance_window_task_test.go | 142 +++---------------
 website/docs/guides/version-3-upgrade.html.md |  76 ++++++++++
 .../ssm_maintenance_window_task.html.markdown |  15 +-
 4 files changed, 101 insertions(+), 267 deletions(-)

diff --git a/aws/resource_aws_ssm_maintenance_window_task.go b/aws/resource_aws_ssm_maintenance_window_task.go
index 72d7148027d2..2ee399ba986e 100644
--- a/aws/resource_aws_ssm_maintenance_window_task.go
+++ b/aws/resource_aws_ssm_maintenance_window_task.go
@@ -92,55 +92,10 @@ func resourceAwsSsmMaintenanceWindowTask() *schema.Resource {
 				Optional: true,
 			},
 
-			"logging_info": {
-				Type:          schema.TypeList,
-				MaxItems:      1,
-				Optional:      true,
-				ConflictsWith: []string{"task_invocation_parameters"},
-				Deprecated:    "use 'task_invocation_parameters' argument instead",
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						"s3_bucket_name": {
-							Type:     schema.TypeString,
-							Required: true,
-						},
-						"s3_region": {
-							Type:     schema.TypeString,
-							Required: true,
-						},
-						"s3_bucket_prefix": {
-							Type:     schema.TypeString,
-							Optional: true,
-						},
-					},
-				},
-			},
-
-			"task_parameters": {
-				Type:          schema.TypeSet,
-				Optional:      true,
-				ConflictsWith: []string{"task_invocation_parameters"},
-				Deprecated:    "use 'task_invocation_parameters' argument instead",
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						"name": {
-							Type:     schema.TypeString,
-							Required: true,
-						},
-						"values": {
-							Type:     schema.TypeList,
-							Required: true,
-							Elem:     &schema.Schema{Type: schema.TypeString},
-						},
-					},
-				},
-			},
-
 			"task_invocation_parameters": {
-				Type:          schema.TypeList,
-				Optional:      true,
-				ConflictsWith: []string{"task_parameters", "logging_info"},
-				MaxItems:      1,
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"automation_parameters": {
@@ -328,62 +283,6 @@ func resourceAwsSsmMaintenanceWindowTask() *schema.Resource {
 	}
 }
 
-func expandAwsSsmMaintenanceWindowLoggingInfo(config []interface{}) *ssm.LoggingInfo {
-	if len(config) == 0 || config[0] == nil {
-		return nil
-	}
-
-	loggingConfig := config[0].(map[string]interface{})
-
-	loggingInfo := &ssm.LoggingInfo{
-		S3BucketName: aws.String(loggingConfig["s3_bucket_name"].(string)),
-		S3Region:     aws.String(loggingConfig["s3_region"].(string)),
-	}
-
-	if s := loggingConfig["s3_bucket_prefix"].(string); s != "" {
-		loggingInfo.S3KeyPrefix = aws.String(s)
-	}
-
-	return loggingInfo
-}
-
-func flattenAwsSsmMaintenanceWindowLoggingInfo(loggingInfo *ssm.LoggingInfo) []interface{} {
-
-	result := make(map[string]interface{})
-	result["s3_bucket_name"] = *loggingInfo.S3BucketName
-	result["s3_region"] = *loggingInfo.S3Region
-
-	if loggingInfo.S3KeyPrefix != nil {
-		result["s3_bucket_prefix"] = *loggingInfo.S3KeyPrefix
-	}
-
-	return []interface{}{result}
-}
-
-func expandAwsSsmTaskParameters(config []interface{}) map[string]*ssm.MaintenanceWindowTaskParameterValueExpression {
-	params := make(map[string]*ssm.MaintenanceWindowTaskParameterValueExpression)
-	for _, v := range config {
-		paramConfig := v.(map[string]interface{})
-		params[paramConfig["name"].(string)] = &ssm.MaintenanceWindowTaskParameterValueExpression{
-			Values: expandStringList(paramConfig["values"].([]interface{})),
-		}
-	}
-	return params
-}
-
-func flattenAwsSsmTaskParameters(taskParameters map[string]*ssm.MaintenanceWindowTaskParameterValueExpression) []interface{} {
-	result := make([]interface{}, 0, len(taskParameters))
-	for k, v := range taskParameters {
-		taskParam := map[string]interface{}{
-			"name":   k,
-			"values": flattenStringList(v.Values),
-		}
-		result = append(result, taskParam)
-	}
-
-	return result
-}
-
 func expandAwsSsmTaskInvocationParameters(config []interface{}) *ssm.MaintenanceWindowTaskInvocationParameters {
 	if len(config) == 0 || config[0] == nil {
 		return nil
@@ -697,14 +596,6 @@ func resourceAwsSsmMaintenanceWindowTaskCreate(d *schema.ResourceData, meta inte
 		params.Priority = aws.Int64(int64(v.(int)))
 	}
 
-	if v, ok := d.GetOk("logging_info"); ok {
-		params.LoggingInfo = expandAwsSsmMaintenanceWindowLoggingInfo(v.([]interface{}))
-	}
-
-	if v, ok := d.GetOk("task_parameters"); ok {
-		params.TaskParameters = expandAwsSsmTaskParameters(v.(*schema.Set).List())
-	}
-
 	if v, ok := d.GetOk("task_invocation_parameters"); ok {
 		params.TaskInvocationParameters = expandAwsSsmTaskInvocationParameters(v.([]interface{}))
 	}
@@ -747,18 +638,6 @@ func resourceAwsSsmMaintenanceWindowTaskRead(d *schema.ResourceData, meta interf
 	d.Set("name", resp.Name)
 	d.Set("description", resp.Description)
 
-	if resp.LoggingInfo != nil {
-		if err := d.Set("logging_info", flattenAwsSsmMaintenanceWindowLoggingInfo(resp.LoggingInfo)); err != nil {
-			return fmt.Errorf("Error setting logging_info error: %#v", err)
-		}
-	}
-
-	if resp.TaskParameters != nil {
-		if err := d.Set("task_parameters", flattenAwsSsmTaskParameters(resp.TaskParameters)); err != nil {
-			return fmt.Errorf("Error setting task_parameters error: %#v", err)
-		}
-	}
-
 	if resp.TaskInvocationParameters != nil {
 		if err := d.Set("task_invocation_parameters", flattenAwsSsmTaskInvocationParameters(resp.TaskInvocationParameters)); err != nil {
 			return fmt.Errorf("Error setting task_invocation_parameters error: %#v", err)
@@ -799,14 +678,6 @@ func resourceAwsSsmMaintenanceWindowTaskUpdate(d *schema.ResourceData, meta inte
 		params.Priority = aws.Int64(int64(v.(int)))
 	}
 
-	if v, ok := d.GetOk("logging_info"); ok {
-		params.LoggingInfo = expandAwsSsmMaintenanceWindowLoggingInfo(v.([]interface{}))
-	}
-
-	if v, ok := d.GetOk("task_parameters"); ok {
-		params.TaskParameters = expandAwsSsmTaskParameters(v.(*schema.Set).List())
-	}
-
 	if v, ok := d.GetOk("task_invocation_parameters"); ok {
 		params.TaskInvocationParameters = expandAwsSsmTaskInvocationParameters(v.([]interface{}))
 	}
diff --git a/aws/resource_aws_ssm_maintenance_window_task_test.go b/aws/resource_aws_ssm_maintenance_window_task_test.go
index 73292c1a48f5..a91f7db720de 100644
--- a/aws/resource_aws_ssm_maintenance_window_task_test.go
+++ b/aws/resource_aws_ssm_maintenance_window_task_test.go
@@ -220,32 +220,6 @@ func TestAccAWSSSMMaintenanceWindowTask_TaskInvocationStepFunctionParameters(t *
 	})
 }
 
-func TestAccAWSSSMMaintenanceWindowTask_TaskParameters(t *testing.T) {
-	var task ssm.MaintenanceWindowTask
-	resourceName := "aws_ssm_maintenance_window_task.test"
-	rName := acctest.RandomWithPrefix("tf-acc-test")
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckAWSSSMMaintenanceWindowTaskDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccAWSSSMMaintenanceWindowTaskConfigTaskParametersMultiple(rName),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckAWSSSMMaintenanceWindowTaskExists(resourceName, &task),
-				),
-			},
-			{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateIdFunc: testAccAWSSSMMaintenanceWindowTaskImportStateIdFunc(resourceName),
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
 func TestAccAWSSSMMaintenanceWindowTask_emptyNotificationConfig(t *testing.T) {
 	var task ssm.MaintenanceWindowTask
 	rName := acctest.RandomWithPrefix("tf-acc-test")
@@ -432,9 +406,13 @@ resource "aws_ssm_maintenance_window_task" "test" {
     values = ["${aws_ssm_maintenance_window_target.test.id}"]
   }
 
-  task_parameters {
-    name   = "commands"
-    values = ["pwd"]
+  task_invocation_parameters {
+    run_command_parameters {
+      parameter {
+        name   = "commands"
+        values = ["pwd"]
+      }
+    }
   }
 }
 
@@ -460,9 +438,13 @@ resource "aws_ssm_maintenance_window_task" "test" {
     values = ["${aws_ssm_maintenance_window_target.test.id}"]
   }
 
-  task_parameters {
-    name   = "commands"
-    values = ["pwd"]
+  task_invocation_parameters {
+    run_command_parameters {
+      parameter {
+        name   = "commands"
+        values = ["pwd"]
+      }
+    }
   }
 }
 
@@ -523,9 +505,13 @@ resource "aws_ssm_maintenance_window_task" "test" {
     values = ["${aws_ssm_maintenance_window_target.test.id}"]
   }
 
-  task_parameters {
-    name   = "commands"
-    values = ["date"]
+  task_invocation_parameters {
+    run_command_parameters {
+      parameter {
+        name   = "commands"
+        values = ["date"]
+      }
+    }
   }
 }
 
@@ -768,89 +754,3 @@ resource "aws_ssm_maintenance_window_task" "test" {
 }
 `, rName)
 }
-
-func testAccAWSSSMMaintenanceWindowTaskConfigTaskParametersMultiple(rName string) string {
-	return fmt.Sprintf(`
-resource "aws_ssm_maintenance_window" "test" {
-  cutoff   = 1
-  duration = 3
-  name     = %[1]q
-  schedule = "cron(0 16 ? * TUE *)"
-}
-
-resource "aws_ssm_maintenance_window_target" "test" {
-  name          = %[1]q
-  resource_type = "INSTANCE"
-  window_id     = "${aws_ssm_maintenance_window.test.id}"
-
-  targets {
-    key    = "tag:Name"
-    values = ["tf-acc-test"]
-  }
-}
-
-resource "aws_iam_role" "test" {
-  name = %[1]q
-  assume_role_policy = <<POLICY
-{
-    "Version": "2012-10-17",
-    "Statement": [
-        {
-            "Action": "sts:AssumeRole",
-            "Principal": {
-                "Service": "events.amazonaws.com"
-            },
-            "Effect": "Allow",
-            "Sid": ""
-        }
-    ]
-}
-POLICY
-}
-
-resource "aws_iam_role_policy" "test" {
-  name = %[1]q
-  role = "${aws_iam_role.test.name}"
-  policy = <<POLICY
-{
-  "Version": "2012-10-17",
-  "Statement": {
-    "Effect": "Allow",
-    "Action": "ssm:*",
-    "Resource": "*"
-  }
-}
-POLICY
-}
-
-resource "aws_ssm_maintenance_window_task" "test" {
-  max_concurrency  = 1
-  max_errors       = 1
-  priority         = 1
-  service_role_arn = "${aws_iam_role.test.arn}"
-  task_arn         = "AWS-RunRemoteScript"
-  task_type        = "RUN_COMMAND"
-  window_id        = "${aws_ssm_maintenance_window.test.id}"
-
-  targets {
-    key    = "WindowTargetIds"
-    values = ["${aws_ssm_maintenance_window_target.test.id}"]
-  }
-
-  task_parameters {
-    name   = "sourceType"
-    values = ["s3"]
-  }
-
-  task_parameters {
-    name   = "sourceInfo"
-    values = ["https://s3.amazonaws.com/bucket"]
-  }
-
-  task_parameters {
-    name   = "commandLine"
-    values = ["date"]
-  }
-}
-`, rName)
-}
diff --git a/website/docs/guides/version-3-upgrade.html.md b/website/docs/guides/version-3-upgrade.html.md
index b73b9116e4bc..6f6718d451a3 100644
--- a/website/docs/guides/version-3-upgrade.html.md
+++ b/website/docs/guides/version-3-upgrade.html.md
@@ -534,3 +534,79 @@ Previously when the `platform_credential` and `platform_principal` arguments wer
 ### valid_until Argument No Longer Uses 24 Hour Default
 
 Previously when the `valid_until` argument was not configured, the resource would default to a 24 hour request. This behavior has been removed and allows for non-expiring requests. To recreate the old behavior, the [`time_offset` resource](/docs/providers/time/r/offset.html) can potentially be used.
+
+## Resource: aws_ssm_maintenance_window_task
+
+### logging_info Configuration Block Removal
+
+Switch your Terraform configuration to the `task_invocation_parameters` configuration block `run_command_parameters` configuration block `output_s3_bucket` and `output_s3_key_prefix` arguments instead.
+
+For example, given this previous configuration:
+
+```hcl
+resource "aws_ssm_maintenance_window_task" "example" {
+  # ... other configuration ...
+
+  logging_info {
+    s3_bucket_name       = aws_s3_bucket.example.id
+    s3_bucket_key_prefix = "example"
+  }
+}
+```
+
+An updated configuration:
+
+```hcl
+resource "aws_ssm_maintenance_window_task" "example" {
+  # ... other configuration ...
+
+  task_invocation_parameters {
+    # ... potentially other configuration ...
+
+    run_command_parameters {
+      # ... potentially other configuration ...
+
+      output_s3_bucket     = aws_s3_bucket.example.id
+      output_s3_key_prefix = "example"
+    }
+  }
+}
+```
+
+### task_parameters Configuration Block Removal
+
+Switch your Terraform configuration to the `task_invocation_parameters` configuration block `run_command_parameters` configuration block `parameter` configuration blocks instead.
+
+For example, given this previous configuration:
+
+```hcl
+resource "aws_ssm_maintenance_window_task" "example" {
+  # ... other configuration ...
+
+  task_parameters {
+    name   = "commands"
+    values = ["date"]
+  }
+}
+```
+
+An updated configuration:
+
+```hcl
+resource "aws_ssm_maintenance_window_task" "example" {
+  # ... other configuration ...
+
+  task_invocation_parameters {
+    # ... potentially other configuration ...
+
+    run_command_parameters {
+      # ... potentially other configuration ...
+
+      parameter {
+        name   = "commands"
+        values = ["date"]
+      }
+    }
+  }
+}
+```
diff --git a/website/docs/r/ssm_maintenance_window_task.html.markdown b/website/docs/r/ssm_maintenance_window_task.html.markdown
index 4e88126ef805..b33c14c55b2f 100644
--- a/website/docs/r/ssm_maintenance_window_task.html.markdown
+++ b/website/docs/r/ssm_maintenance_window_task.html.markdown
@@ -147,20 +147,7 @@ The following arguments are supported:
 * `description` - (Optional) The description of the maintenance window task.
 * `targets` - (Required) The targets (either instances or window target ids). Instances are specified using Key=InstanceIds,Values=instanceid1,instanceid2. Window target ids are specified using Key=WindowTargetIds,Values=window target id1, window target id2.
 * `priority` - (Optional) The priority of the task in the Maintenance Window, the lower the number the higher the priority. Tasks in a Maintenance Window are scheduled in priority order with tasks that have the same priority scheduled in parallel.
-* `logging_info` - (Optional, **Deprecated**) A structure containing information about an Amazon S3 bucket to write instance-level logs to. Use `task_invocation_parameters` configuration block `run_command_parameters` configuration block `output_s3_*` arguments instead. Conflicts with `task_invocation_parameters`. Documented below.
-* `task_parameters` - (Optional, **Deprecated**) A structure containing information about parameters required by the particular `task_arn`. Use `parameter` configuration blocks under the `task_invocation_parameters` configuration block instead. Conflicts with `task_invocation_parameters`. Documented below.
-* `task_invocation_parameters` - (Optional) The parameters for task execution. This argument is conflict with `task_parameters` and `logging_info`.
-
-`logging_info` supports the following:
-
-* `s3_bucket_name` - (Required)
-* `s3_region` - (Required)
-* `s3_bucket_prefix` - (Optional)
-
-`task_parameters` supports the following:
-
-* `name` - (Required)
-* `values` - (Required)
+* `task_invocation_parameters` - (Optional) Configuration block with parameters for task execution.
 
 `task_invocation_parameters` supports the following: