Diff suppress unconventional public image family naming pattern (hash…

…icorp#1024) * DiffSuppress for all public images family names * Update documentation * TF_ACC guard * diskImageEquals should use ==
chrisst · Jan 31, 2018 · 58668c1 · 58668c1
1 parent 71a7202
commit 58668c1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/docs/r/compute_disk.html.markdown b/docs/r/compute_disk.html.markdown
@@ -47,8 +47,14 @@ The following arguments are supported:
     to encrypt this disk.
 
 * `image` - (Optional) The image from which to initialize this disk. This can be
-    one of: the image's `self_link`, of a full name and version, e.g.
-    `debian-8-jessie-v20170523`
+    one of: the image's `self_link`, `projects/{project}/global/images/{image}`,
+    `projects/{project}/global/images/family/{family}`, `global/images/{image}`,
+    `global/images/family/{family}`, `family/{family}`, `{project}/{family}`,
+    `{project}/{image}`, `{family}`, or `{image}`. If referred by family, the
+    images names must include the family name. If they don't, use the
+    [google_compute_image data source](/docs/providers/google/d/datasource_compute_image.html).
+    For instance, the image `centos-6-v20180104` includes its family name `centos-6`.
+    These images can be referred by family name here.
 
 * `project` - (Optional) The project in which the resource belongs. If it
     is not provided, the provider project is used.

diff --git a/docs/r/compute_instance.html.markdown b/docs/r/compute_instance.html.markdown
@@ -156,9 +156,10 @@ The `initialize_params` block supports:
     `projects/{project}/global/images/family/{family}`, `global/images/{image}`,
     `global/images/family/{family}`, `family/{family}`, `{project}/{family}`,
     `{project}/{image}`, `{family}`, or `{image}`. If referred by family, the
-    images names must include the family name. For instance, the image
-    `centos-6-v20180104` includes its family name `centos-6`. These images can
-    be referred by family name here.
+    images names must include the family name. If they don't, use the
+    [google_compute_image data source](/docs/providers/google/d/datasource_compute_image.html).
+    For instance, the image `centos-6-v20180104` includes its family name `centos-6`.
+    These images can be referred by family name here.
 
 The `scratch_disk` block supports: