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.

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

tests/provider: Add prechecks (OpsWorks) #15811

Merged
merged 1 commit into from
Oct 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion aws/resource_aws_opsworks_application_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestAccAWSOpsworksApplication_basic(t *testing.T) {
resourceName := "aws_opsworks_application.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksApplicationDestroy,
Steps: []resource.TestStep{
Expand Down
6 changes: 3 additions & 3 deletions aws/resource_aws_opsworks_custom_layer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestAccAWSOpsworksCustomLayer_basic(t *testing.T) {
resourceName := "aws_opsworks_custom_layer.tf-acc"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksCustomLayerDestroy,
Steps: []resource.TestStep{
Expand Down Expand Up @@ -64,7 +64,7 @@ func TestAccAWSOpsworksCustomLayer_tags(t *testing.T) {
resourceName := "aws_opsworks_custom_layer.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksCustomLayerDestroy,
Steps: []resource.TestStep{
Expand Down Expand Up @@ -108,7 +108,7 @@ func TestAccAWSOpsworksCustomLayer_noVPC(t *testing.T) {
resourceName := "aws_opsworks_custom_layer.tf-acc"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksCustomLayerDestroy,
Steps: []resource.TestStep{
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_aws_opsworks_ganglia_layer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func TestAccAWSOpsworksGangliaLayer_basic(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_ganglia_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksGangliaLayerDestroy,
Steps: []resource.TestStep{
Expand All @@ -35,7 +35,7 @@ func TestAccAWSOpsworksGangliaLayer_tags(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_ganglia_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksGangliaLayerDestroy,
Steps: []resource.TestStep{
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_aws_opsworks_haproxy_layer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func TestAccAWSOpsworksHAProxyLayer_basic(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_haproxy_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksHAProxyLayerDestroy,
Steps: []resource.TestStep{
Expand All @@ -35,7 +35,7 @@ func TestAccAWSOpsworksHAProxyLayer_tags(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_haproxy_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksHAProxyLayerDestroy,
Steps: []resource.TestStep{
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_aws_opsworks_instance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAccAWSOpsworksInstance_basic(t *testing.T) {
resourceName := "aws_opsworks_instance.tf-acc"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksInstanceDestroy,
Steps: []resource.TestStep{
Expand Down Expand Up @@ -67,7 +67,7 @@ func TestAccAWSOpsworksInstance_UpdateHostNameForceNew(t *testing.T) {
var before, after opsworks.Instance

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksInstanceDestroy,
Steps: []resource.TestStep{
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_aws_opsworks_java_app_layer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAccAWSOpsworksJavaAppLayer_basic(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_java_app_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksJavaAppLayerDestroy,
Steps: []resource.TestStep{
Expand All @@ -37,7 +37,7 @@ func TestAccAWSOpsworksJavaAppLayer_tags(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_java_app_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksJavaAppLayerDestroy,
Steps: []resource.TestStep{
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_aws_opsworks_memcached_layer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAccAWSOpsworksMemcachedLayer_basic(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_memcached_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksMemcachedLayerDestroy,
Steps: []resource.TestStep{
Expand All @@ -37,7 +37,7 @@ func TestAccAWSOpsworksMemcachedLayer_tags(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_memcached_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksMemcachedLayerDestroy,
Steps: []resource.TestStep{
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_aws_opsworks_mysql_layer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAccAWSOpsworksMysqlLayer_basic(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_mysql_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksMysqlLayerDestroy,
Steps: []resource.TestStep{
Expand All @@ -37,7 +37,7 @@ func TestAccAWSOpsworksMysqlLayer_tags(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_mysql_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksMysqlLayerDestroy,
Steps: []resource.TestStep{
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_aws_opsworks_nodejs_app_layer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAccAWSOpsworksNodejsAppLayer_basic(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_nodejs_app_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksNodejsAppLayerDestroy,
Steps: []resource.TestStep{
Expand All @@ -37,7 +37,7 @@ func TestAccAWSOpsworksNodejsAppLayer_tags(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_nodejs_app_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksNodejsAppLayerDestroy,
Steps: []resource.TestStep{
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_aws_opsworks_permission_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestAccAWSOpsworksPermission_basic(t *testing.T) {
sName := fmt.Sprintf("tf-ops-perm-%d", acctest.RandInt())
var opsperm opsworks.Permission
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksPermissionDestroy,
Steps: []resource.TestStep{
Expand Down Expand Up @@ -99,7 +99,7 @@ func TestAccAWSOpsworksPermission_Self(t *testing.T) {
resourceName := "aws_opsworks_permission.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: nil, // Cannot delete own OpsWorks Permission
Steps: []resource.TestStep{
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_aws_opsworks_php_app_layer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAccAWSOpsworksPhpAppLayer_basic(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_php_app_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksPhpAppLayerDestroy,
Steps: []resource.TestStep{
Expand All @@ -42,7 +42,7 @@ func TestAccAWSOpsworksPhpAppLayer_tags(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_php_app_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksPhpAppLayerDestroy,
Steps: []resource.TestStep{
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_aws_opsworks_rails_app_layer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAccAWSOpsworksRailsAppLayer_basic(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_rails_app_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksRailsAppLayerDestroy,
Steps: []resource.TestStep{
Expand Down Expand Up @@ -47,7 +47,7 @@ func TestAccAWSOpsworksRailsAppLayer_tags(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_rails_app_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksRailsAppLayerDestroy,
Steps: []resource.TestStep{
Expand Down
2 changes: 1 addition & 1 deletion aws/resource_aws_opsworks_rds_db_instance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestAccAWSOpsworksRdsDbInstance_basic(t *testing.T) {
sName := fmt.Sprintf("test-db-instance-%d", acctest.RandInt())
var opsdb opsworks.RdsDbInstance
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksRdsDbDestroy,
Steps: []resource.TestStep{
Expand Down
30 changes: 25 additions & 5 deletions aws/resource_aws_opsworks_stack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ func TestAccAWSOpsworksStack_noVpcBasic(t *testing.T) {
var opsstack opsworks.Stack

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSOpsWorksStacks(t) },
PreCheck: func() {
testAccPreCheck(t)
testAccPartitionHasServicePreCheck("opsworks", t)
testAccPreCheckAWSOpsWorksStacks(t)
},
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksStackDestroy,
Steps: []resource.TestStep{
Expand All @@ -49,7 +53,11 @@ func TestAccAWSOpsworksStack_noVpcChangeServiceRoleForceNew(t *testing.T) {
var before, after opsworks.Stack

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSOpsWorksStacks(t) },
PreCheck: func() {
testAccPreCheck(t)
testAccPartitionHasServicePreCheck("opsworks", t)
testAccPreCheckAWSOpsWorksStacks(t)
},
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksStackDestroy,
Steps: []resource.TestStep{
Expand Down Expand Up @@ -81,7 +89,11 @@ func TestAccAWSOpsworksStack_vpc(t *testing.T) {
var opsstack opsworks.Stack

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSOpsWorksStacks(t) },
PreCheck: func() {
testAccPreCheck(t)
testAccPartitionHasServicePreCheck("opsworks", t)
testAccPreCheckAWSOpsWorksStacks(t)
},
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksStackDestroy,
Steps: []resource.TestStep{
Expand Down Expand Up @@ -125,7 +137,11 @@ func TestAccAWSOpsworksStack_noVpcCreateTags(t *testing.T) {
var opsstack opsworks.Stack

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSOpsWorksStacks(t) },
PreCheck: func() {
testAccPreCheck(t)
testAccPartitionHasServicePreCheck("opsworks", t)
testAccPreCheckAWSOpsWorksStacks(t)
},
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksStackDestroy,
Steps: []resource.TestStep{
Expand Down Expand Up @@ -164,7 +180,11 @@ func TestAccAWSOpsworksStack_CustomCookbooks_SetPrivateProperties(t *testing.T)
var opsstack opsworks.Stack

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSOpsWorksStacks(t) },
PreCheck: func() {
testAccPreCheck(t)
testAccPartitionHasServicePreCheck("opsworks", t)
testAccPreCheckAWSOpsWorksStacks(t)
},
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksStackDestroy,
Steps: []resource.TestStep{
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_aws_opsworks_static_web_layer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAccAWSOpsworksStaticWebLayer_basic(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_static_web_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksStaticWebLayerDestroy,
Steps: []resource.TestStep{
Expand All @@ -42,7 +42,7 @@ func TestAccAWSOpsworksStaticWebLayer_tags(t *testing.T) {
stackName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_opsworks_static_web_layer.test"
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksStaticWebLayerDestroy,
Steps: []resource.TestStep{
Expand Down
2 changes: 1 addition & 1 deletion aws/resource_aws_opsworks_user_profile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestAccAWSOpsworksUserProfile_basic(t *testing.T) {
rName := fmt.Sprintf("test-user-%d", acctest.RandInt())
updateRName := fmt.Sprintf("test-user-%d", acctest.RandInt())
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
PreCheck: func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck("opsworks", t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsOpsworksUserProfileDestroy,
Steps: []resource.TestStep{
Expand Down