Support optional and prefixed folder_id in preconditions

terraform-google-modules · Feb 21, 2019 · 926009c · 926009c
1 parent 3950915
commit 926009c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modules/core_project_factory/scripts/preconditions/preconditions.py b/modules/core_project_factory/scripts/preconditions/preconditions.py
@@ -160,7 +160,10 @@ def validate(self, credentials):
         )
 
         body = {"permissions": self.permissions}
-        resource = "folders/" + self.folder_id
+        if self.folder_id.startswith("folders/"):
+            resource = self.folder_id
+        else:
+            resource = "folders/" + self.folder_id
 
         request = service.folders().testIamPermissions(
             resource=resource,