From c661aaeb70cdd9b7ac8709f031225ee606b6debf Mon Sep 17 00:00:00 2001
From: Sarah French <15078782+SarahFrench@users.noreply.github.com>
Date: Fri, 27 May 2022 21:09:49 +0100
Subject: [PATCH 1/2] Update user and group resource import snippets to use
 emails

---
 docs/resources/group.md | 2 +-
 docs/resources/user.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/resources/group.md b/docs/resources/group.md
index 8e36aff7..b94e7d32 100644
--- a/docs/resources/group.md
+++ b/docs/resources/group.md
@@ -62,5 +62,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import googleworkspace_group.sales 01abcde23fg4h5i
+terraform import googleworkspace_group.sales {{email}}
 ```
diff --git a/docs/resources/user.md b/docs/resources/user.md
index f1f9b3ea..457ff600 100644
--- a/docs/resources/user.md
+++ b/docs/resources/user.md
@@ -401,5 +401,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import googleworkspace_user.dwight 123456789012345678901
+terraform import googleworkspace_user.dwight {{primary_email}}
 ```

From e70b469c2c4948243b10478cacff5663567b0e0d Mon Sep 17 00:00:00 2001
From: Sarah French <15078782+SarahFrench@users.noreply.github.com>
Date: Mon, 6 Jun 2022 15:49:08 +0100
Subject: [PATCH 2/2] Re-add info about using IDs for user and group import

---
 docs/resources/group.md | 6 ++++++
 docs/resources/user.md  | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/docs/resources/group.md b/docs/resources/group.md
index b94e7d32..75784f22 100644
--- a/docs/resources/group.md
+++ b/docs/resources/group.md
@@ -64,3 +64,9 @@ Import is supported using the following syntax:
 ```shell
 terraform import googleworkspace_group.sales {{email}}
 ```
+
+It is also possible to use an alphanumerical ID, which is present in the URL when viewing the Group's page in the Google Workspace UI:
+
+```shell
+terraform import googleworkspace_group.sales 01abcde23fg4h5i
+```
\ No newline at end of file
diff --git a/docs/resources/user.md b/docs/resources/user.md
index 457ff600..45fb8017 100644
--- a/docs/resources/user.md
+++ b/docs/resources/user.md
@@ -403,3 +403,9 @@ Import is supported using the following syntax:
 ```shell
 terraform import googleworkspace_user.dwight {{primary_email}}
 ```
+
+It is also possible to use the Google Account's unique ID, a 21-digit number:
+
+```shell
+terraform import googleworkspace_user.dwight 123456789012345678901
+```
\ No newline at end of file