Run read tests as part of make test (#260)

* Run ReadPlannedAssets tests as part of unit tests

* Fixed full_container_cluster test

Had to update the terraform file for compatibility with GoogleCloudPlatform/magic-modules#4762

* Regenerated full_spanner_instance plan

* Regenerated full_compute_instance plan json

* Removed example_compute_forwarding_rule read test since it can't run in offline mode

* Re-generated example_sql_database_instance tfplan json

* Removed example_compute_instance test

This can't run in offline mode

* Fixed marshalling/unmarshalling of timestamps

* Regenerated project organization policy tfplan json

converters/google/convert.go

@@ -85,10 +85,10 @@ type Timestamp struct {
 }
 
 func (t Timestamp) MarshalJSON() ([]byte, error) {
-	return []byte(`"` + time.Unix(t.Seconds, t.Nanos).Format(time.RFC3339Nano) + `"`), nil
+	return []byte(`"` + time.Unix(0, t.Nanos).UTC().Format(time.RFC3339Nano) + `"`), nil
 }
 
-func (t Timestamp) UnmarshalJSON(b []byte) error {
+func (t *Timestamp) UnmarshalJSON(b []byte) error {
 	p, err := time.Parse(time.RFC3339Nano, strings.Trim(string(b), `"`))
 	if err != nil {
 		return fmt.Errorf("bad Timestamp: %v", err)

converters/google/convert_test.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"sort"
 	"testing"
+	"time"
 
 	"github.com/GoogleCloudPlatform/terraform-validator/ancestrymanager"
 	tfjson "github.com/hashicorp/terraform-json"
@@ -401,3 +402,32 @@ func TestAddStorageModuleAfterUnknown(t *testing.T) {
 	}
 
 }
+
+func TestTimestampMarshalJSON(t *testing.T) {
+	expectedJSON := []byte("\"2021-04-14T15:16:17Z\"")
+	date := time.Date(2021, time.April, 14, 15, 16, 17, 0, time.UTC)
+	ts := Timestamp{
+		Seconds: int64(date.Unix()),
+		Nanos: int64(date.UnixNano()),
+	}
+	json, err := ts.MarshalJSON()
+	if err != nil {
+		t.Fatalf("Unexpected error: %s", err)
+	}
+	assert.EqualValues(t, json, expectedJSON)
+}
+
+func TestTimestampUnmarshalJSON(t *testing.T) {
+	expectedDate := time.Date(2021, time.April, 14, 15, 16, 17, 0, time.UTC)
+	expected := Timestamp{
+		Seconds: int64(expectedDate.Unix()),
+		Nanos: int64(expectedDate.UnixNano()),
+	}
+	json := []byte("\"2021-04-14T15:16:17Z\"")
+	ts := Timestamp{}
+	err := ts.UnmarshalJSON(json)
+	if err != nil {
+		t.Fatalf("Unexpected error: %s", err)
+	}
+	assert.EqualValues(t, ts, expected)
+}

test/read_test.go

@@ -16,22 +16,19 @@ import (
 )
 
 func TestReadPlannedAssetsCoverage(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode.")
-		return
-	}
-
 	cases := []struct {
 		name string
 	}{
 		{name: "example_bigquery_dataset"},
 		{name: "example_bigtable_instance"},
 		{name: "example_compute_disk"},
 		{name: "example_compute_firewall"},
-		{name: "example_compute_instance"},
+		// This test can't run in offline mode
+		// {name: "example_compute_instance"},
 		{name: "example_compute_network"},
 		{name: "example_compute_subnetwork"},
-		{name: "example_compute_forwarding_rule"},
+		// This test can't run in offline mode.
+		// {name: "example_compute_forwarding_rule"},
 		{name: "example_compute_global_forwarding_rule"},
 		{name: "example_container_cluster"},
 		{name: "example_filestore_instance"},