test fixes (#1185)

Author: danawillow

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"),
 			},
 		},
 	})

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"]
     }
   }
 }

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",
 			]
 		}
   }