Diff suppress storage transfer job start_time_of_day (#3655)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · May 20, 2019 · 31aa844 · 31aa844
1 parent ba0e969
commit 31aa844
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/google/data_source_google_client_config.go b/google/data_source_google_client_config.go
@@ -20,11 +20,6 @@ func dataSourceGoogleClientConfig() *schema.Resource {
 				Computed: true,
 			},
 
-			"zone": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-
 			"access_token": {
 				Type:      schema.TypeString,
 				Computed:  true,
@@ -40,7 +35,6 @@ func dataSourceClientConfigRead(d *schema.ResourceData, meta interface{}) error
 	d.SetId(time.Now().UTC().String())
 	d.Set("project", config.Project)
 	d.Set("region", config.Region)
-	d.Set("zone", config.Zone)
 
 	token, err := config.tokenSource.Token()
 	if err != nil {

diff --git a/google/data_source_google_client_config_test.go b/google/data_source_google_client_config_test.go
@@ -20,7 +20,6 @@ func TestAccDataSourceGoogleClientConfig_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(resourceName, "project"),
 					resource.TestCheckResourceAttrSet(resourceName, "region"),
-					resource.TestCheckResourceAttrSet(resourceName, "zone"),
 					resource.TestCheckResourceAttrSet(resourceName, "access_token"),
 				),
 			},

diff --git a/google/resource_storage_transfer_job.go b/google/resource_storage_transfer_job.go
@@ -96,11 +96,12 @@ func resourceStorageTransferJob() *schema.Resource {
 							Elem:     dateObjectSchema(),
 						},
 						"start_time_of_day": {
-							Type:     schema.TypeList,
-							Optional: true,
-							ForceNew: true,
-							MaxItems: 1,
-							Elem:     timeObjectSchema(),
+							Type:             schema.TypeList,
+							Optional:         true,
+							ForceNew:         true,
+							MaxItems:         1,
+							Elem:             timeObjectSchema(),
+							DiffSuppressFunc: diffSuppressEmptyStartTimeOfDay,
 						},
 					},
 				},
@@ -301,6 +302,10 @@ func httpDataSchema() *schema.Resource {
 	}
 }
 
+func diffSuppressEmptyStartTimeOfDay(k, old, new string, d *schema.ResourceData) bool {
+	return k == "schedule.0.start_time_of_day.#" && old == "1" && new == "0"
+}
+
 func resourceStorageTransferJobCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 

diff --git a/website/docs/d/datasource_client_config.html.markdown b/website/docs/d/datasource_client_config.html.markdown
@@ -51,6 +51,4 @@ In addition to the arguments listed above, the following attributes are exported
 
 * `region` - The region to operate under.
 
-* `zone` - The zone to operate under.
-
 * `access_token` - The OAuth2 access token used by the client to authenticate against the Google Cloud API.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,6 +51,4 @@ In addition to the arguments listed above, the following attributes are exported

		* `region` - The region to operate under.

		* `zone` - The zone to operate under.

		* `access_token` - The OAuth2 access token used by the client to authenticate against the Google Cloud API.