Upgrade to Plugin SDK v2 and use Terraform 0.12 syntax in documentation.

hashicorp · Aug 21, 2020 · 8304317 · 8304317
1 parent c21359e
commit 8304317
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 36 deletions.
diff --git a/aws/internal/service/autoscalingplans/waiter/status.go b/aws/internal/service/autoscalingplans/waiter/status.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/autoscalingplans"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 const (

diff --git a/aws/internal/service/autoscalingplans/waiter/waiter.go b/aws/internal/service/autoscalingplans/waiter/waiter.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/autoscalingplans"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 const (

diff --git a/aws/resource_aws_autoscalingplans_scaling_plan.go b/aws/resource_aws_autoscalingplans_scaling_plan.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/autoscalingplans"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/autoscalingplans/waiter"
 )
 

diff --git a/aws/resource_aws_autoscalingplans_scaling_plan_test.go b/aws/resource_aws_autoscalingplans_scaling_plan_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/autoscalingplans"
 	"github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/autoscalingplans/waiter"
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfawsresource"
 )
@@ -111,11 +111,9 @@ func TestAccAwsAutoScalingPlansScalingPlan_basicDynamicScaling(t *testing.T) {
 						"max_capacity":                           "3",
 						"min_capacity":                           "0",
 						"predefined_load_metric_specification.#": "0",
-						"predictive_scaling_max_capacity_buffer": "0",
 						"resource_id":                            fmt.Sprintf("autoScalingGroup/%s", rName),
 						"scalable_dimension":                     "autoscaling:autoScalingGroup:DesiredCapacity",
 						"scaling_policy_update_behavior":         "KeepExternalPolicies",
-						"scheduled_action_buffer_time":           "0",
 						"service_namespace":                      "autoscaling",
 						"target_tracking_configuration.#":        "1",
 					}),
@@ -163,12 +161,10 @@ func TestAccAwsAutoScalingPlansScalingPlan_basicPredictiveScaling(t *testing.T)
 						"predefined_load_metric_specification.#": "1",
 						"predefined_load_metric_specification.0.predefined_load_metric_type": "ASGTotalCPUUtilization",
 						"predictive_scaling_max_capacity_behavior":                           "SetForecastCapacityToMaxCapacity",
-						"predictive_scaling_max_capacity_buffer":                             "0",
 						"predictive_scaling_mode":                                            "ForecastOnly",
 						"resource_id":                                                        fmt.Sprintf("autoScalingGroup/%s", rName),
 						"scalable_dimension":                                                 "autoscaling:autoScalingGroup:DesiredCapacity",
 						"scaling_policy_update_behavior":                                     "KeepExternalPolicies",
-						"scheduled_action_buffer_time":                                       "0",
 						"service_namespace":                                                  "autoscaling",
 						"target_tracking_configuration.#":                                    "1",
 					}),
@@ -193,10 +189,9 @@ func TestAccAwsAutoScalingPlansScalingPlan_basicUpdate(t *testing.T) {
 	rNameUpdated := acctest.RandomWithPrefix("tf-acc-test")
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:            func() { testAccPreCheck(t) },
-		Providers:           testAccProviders,
-		CheckDestroy:        testAccCheckAutoScalingPlansScalingPlanDestroy,
-		DisableBinaryDriver: true,
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAutoScalingPlansScalingPlanDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccAutoScalingPlansScalingPlanConfigBasicDynamicScaling(rName, rName),
@@ -216,11 +211,9 @@ func TestAccAwsAutoScalingPlansScalingPlan_basicUpdate(t *testing.T) {
 						"max_capacity":                           "3",
 						"min_capacity":                           "0",
 						"predefined_load_metric_specification.#": "0",
-						"predictive_scaling_max_capacity_buffer": "0",
 						"resource_id":                            fmt.Sprintf("autoScalingGroup/%s", rName),
 						"scalable_dimension":                     "autoscaling:autoScalingGroup:DesiredCapacity",
 						"scaling_policy_update_behavior":         "KeepExternalPolicies",
-						"scheduled_action_buffer_time":           "0",
 						"service_namespace":                      "autoscaling",
 						"target_tracking_configuration.#":        "1",
 					}),
@@ -246,12 +239,10 @@ func TestAccAwsAutoScalingPlansScalingPlan_basicUpdate(t *testing.T) {
 						"predefined_load_metric_specification.#": "1",
 						"predefined_load_metric_specification.0.predefined_load_metric_type": "ASGTotalCPUUtilization",
 						"predictive_scaling_max_capacity_behavior":                           "SetForecastCapacityToMaxCapacity",
-						"predictive_scaling_max_capacity_buffer":                             "0",
 						"predictive_scaling_mode":                                            "ForecastOnly",
 						"resource_id":                                                        fmt.Sprintf("autoScalingGroup/%s", rName),
 						"scalable_dimension":                                                 "autoscaling:autoScalingGroup:DesiredCapacity",
 						"scaling_policy_update_behavior":                                     "KeepExternalPolicies",
-						"scheduled_action_buffer_time":                                       "0",
 						"service_namespace":                                                  "autoscaling",
 						"target_tracking_configuration.#":                                    "1",
 					}),
@@ -379,19 +370,9 @@ func testAccCheckAutoScalingPlansApplicationSourceTags(scalingPlan *autoscalingp
 func testAccAutoScalingPlansScalingPlanConfigBase(rName, tagName string) string {
 	return composeConfig(
 		testAccLatestAmazonLinuxHvmEbsAmiConfig(),
+		testAccAvailableAZsNoOptInDefaultExcludeConfig(),
 		testAccAvailableEc2InstanceTypeForRegion("t3.micro", "t2.micro"),
 		fmt.Sprintf(`
-data "aws_availability_zones" "available" {
-  # Exclude usw2-az4 (us-west-2d) as it has limited instance types.
-  exclude_zone_ids = ["usw2-az4"]
-  state            = "available"
-
-  filter {
-    name   = "opt-in-status"
-    values = ["opt-in-not-required"]
-  }
-}
-
 resource "aws_launch_configuration" "test" {
   image_id      = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
   instance_type = data.aws_ec2_instance_type_offering.available.instance_type

diff --git a/website/docs/r/autoscalingplans_scaling_plan.html.markdown b/website/docs/r/autoscalingplans_scaling_plan.html.markdown
@@ -21,8 +21,8 @@ data "aws_availability_zones" "available" {}
 resource "aws_autoscaling_group" "example" {
   name_prefix = "example"
 
-  launch_configuration = "${aws_launch_configuration.example.name}"
-  availability_zones   = ["${data.aws_availability_zones.available.names[0]}"]
+  launch_configuration = aws_launch_configuration.example.name
+  availability_zones   = [data.aws_availability_zones.available.names[0]]
 
   min_size = 0
   max_size = 3
@@ -49,7 +49,7 @@ resource "aws_autoscalingplans_scaling_plan" "example" {
   scaling_instruction {
     max_capacity       = 3
     min_capacity       = 0
-    resource_id        = "${format("autoScalingGroup/%s", aws_autoscaling_group.example.name)}"
+    resource_id        = format("autoScalingGroup/%s", aws_autoscaling_group.example.name)
     scalable_dimension = "autoscaling:autoScalingGroup:DesiredCapacity"
     service_namespace  = "autoscaling"
 
@@ -72,8 +72,8 @@ data "aws_availability_zones" "available" {}
 resource "aws_autoscaling_group" "example" {
   name_prefix = "example"
 
-  launch_configuration = "${aws_launch_configuration.example.name}"
-  availability_zones   = ["${data.aws_availability_zones.available.names[0]}"]
+  launch_configuration = aws_launch_configuration.example.name
+  availability_zones   = [data.aws_availability_zones.available.names[0]]
 
   min_size = 0
   max_size = 3
@@ -102,7 +102,7 @@ resource "aws_autoscalingplans_scaling_plan" "example" {
 
     max_capacity       = 3
     min_capacity       = 0
-    resource_id        = "${format("autoScalingGroup/%s", aws_autoscaling_group.example.name)}"
+    resource_id        = format("autoScalingGroup/%s", aws_autoscaling_group.example.name)
     scalable_dimension = "autoscaling:autoScalingGroup:DesiredCapacity"
     service_namespace  = "autoscaling"