From 70a44802de7fc3a53a7185b29211ba4027070961 Mon Sep 17 00:00:00 2001
From: megan07 <mbang@hashicorp.com>
Date: Thu, 14 Nov 2019 18:09:29 -0600
Subject: [PATCH] add import id parsing option (#2693)

Merged PR #2693.
---
 build/terraform                                                 | 2 +-
 build/terraform-beta                                            | 2 +-
 .../resources/resource_google_folder_organization_policy.go     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/terraform b/build/terraform
index a758a43042ac..68616a6ac3a3 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit a758a43042ac3bed2392105bbbef16c0ba289287
+Subproject commit 68616a6ac3a353a4bf65fd02fbb0a6ca0064c4db
diff --git a/build/terraform-beta b/build/terraform-beta
index ea755faec1fa..247765f2b3e1 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit ea755faec1fad939024b93843db40ac13e1b802f
+Subproject commit 247765f2b3e13e56e91c906b111d547ec8623616
diff --git a/third_party/terraform/resources/resource_google_folder_organization_policy.go b/third_party/terraform/resources/resource_google_folder_organization_policy.go
index 6bed8a291b24..0dbb206190dd 100644
--- a/third_party/terraform/resources/resource_google_folder_organization_policy.go
+++ b/third_party/terraform/resources/resource_google_folder_organization_policy.go
@@ -44,6 +44,7 @@ func resourceFolderOrgPolicyImporter(d *schema.ResourceData, meta interface{}) (
 
 	if err := parseImportId([]string{
 		"folders/(?P<folder>[^/]+)/constraints/(?P<constraint>[^/]+)",
+		"folders/(?P<folder>[^/]+)/(?P<constraint>[^/]+)",
 		"(?P<folder>[^/]+)/(?P<constraint>[^/]+)"},
 		d, config); err != nil {
 		return nil, err