From 9ae7a8ddb0f5ae2f90a38f0d5b7ae9b7c22d6fd1 Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Mon, 12 Mar 2018 13:18:39 -0700 Subject: [PATCH] test fixes (#1185) --- google/resource_container_cluster_test.go | 2 +- google/resource_google_folder_organization_policy_test.go | 4 ++-- google/resource_google_organization_policy_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/google/resource_container_cluster_test.go b/google/resource_container_cluster_test.go index 5edcad70..2e4f3d94 100644 --- a/google/resource_container_cluster_test.go +++ b/google/resource_container_cluster_test.go @@ -713,7 +713,7 @@ func TestAccContainerCluster_withIPAllocationPolicy(t *testing.T) { "services_secondary_range_name": "services", }, ), - ExpectError: regexp.MustCompile("services secondary range \"pods\" not found in subnet"), + ExpectError: regexp.MustCompile("services secondary range \"services\" not found in subnet"), }, }, }) diff --git a/google/resource_google_folder_organization_policy_test.go b/google/resource_google_folder_organization_policy_test.go index 5388116c..8259c4c2 100644 --- a/google/resource_google_folder_organization_policy_test.go +++ b/google/resource_google_folder_organization_policy_test.go @@ -83,7 +83,7 @@ func TestAccFolderOrganizationPolicy_list_allowSome(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccFolderOrganizationPolicy_list_allowSome(org, folder, project), - Check: testAccCheckGoogleFolderOrganizationListPolicyAllowedValues("list", []string{project}), + Check: testAccCheckGoogleFolderOrganizationListPolicyAllowedValues("list", []string{"projects/" + project}), }, }, }) @@ -293,7 +293,7 @@ resource "google_folder_organization_policy" "list" { list_policy { allow { - values = ["%s"] + values = ["projects/%s"] } } } diff --git a/google/resource_google_organization_policy_test.go b/google/resource_google_organization_policy_test.go index 795e6669..f16fd069 100644 --- a/google/resource_google_organization_policy_test.go +++ b/google/resource_google_organization_policy_test.go @@ -90,7 +90,7 @@ func TestAccOrganizationPolicy_list_allowSome(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccOrganizationPolicy_list_allowSome(org, project), - Check: testAccCheckGoogleOrganizationListPolicyAllowedValues("list", []string{project}), + Check: testAccCheckGoogleOrganizationListPolicyAllowedValues("list", []string{"projects/" + project}), }, { ResourceName: "google_organization_policy.list", @@ -293,7 +293,7 @@ resource "google_organization_policy" "list" { list_policy { allow { values = [ - "%s", + "projects/%s", ] } }