From 58668c13ff121b05d7d6244fd70925947aadbe38 Mon Sep 17 00:00:00 2001 From: Vincent Roseberry Date: Wed, 31 Jan 2018 09:33:26 -0800 Subject: [PATCH] Diff suppress unconventional public image family naming pattern (#1024) * DiffSuppress for all public images family names * Update documentation * TF_ACC guard * diskImageEquals should use == --- docs/r/compute_disk.html.markdown | 10 ++++++++-- docs/r/compute_instance.html.markdown | 7 ++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/docs/r/compute_disk.html.markdown b/docs/r/compute_disk.html.markdown index 95a7eee0508..bfe784f1341 100644 --- 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 index 236fe46266c..bb163f0032b 100644 --- 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: