From aea749530c28e04d2fe8f0592268fbd7bd10781d Mon Sep 17 00:00:00 2001 From: The Magician Date: Thu, 23 Mar 2023 10:04:24 -0700 Subject: [PATCH] Populate missing fields for data_google_compute_(?*_)address (#7486) (#14078) Signed-off-by: Modular Magician --- .changelog/7486.txt | 3 ++ google/data_source_google_compute_address.go | 53 +++++++++++++++++++ ...ta_source_google_compute_global_address.go | 53 +++++++++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 .changelog/7486.txt diff --git a/.changelog/7486.txt b/.changelog/7486.txt new file mode 100644 index 00000000000..f13cb02b324 --- /dev/null +++ b/.changelog/7486.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +compute: added missing fields for `google_compute_(?.*_)address` datasource +``` diff --git a/google/data_source_google_compute_address.go b/google/data_source_google_compute_address.go index 60fa0c52b60..de532074e08 100644 --- a/google/data_source_google_compute_address.go +++ b/google/data_source_google_compute_address.go @@ -28,6 +28,41 @@ func DataSourceGoogleComputeAddress() *schema.Resource { Computed: true, }, + "address_type": { + Type: schema.TypeString, + Computed: true, + }, + + "network": { + Type: schema.TypeString, + Computed: true, + }, + + "network_tier": { + Type: schema.TypeString, + Computed: true, + }, + + "prefix_length": { + Type: schema.TypeInt, + Computed: true, + }, + + "purpose": { + Type: schema.TypeString, + Computed: true, + }, + + "subnetwork": { + Type: schema.TypeString, + Computed: true, + }, + + "users": { + Type: schema.TypeString, + Computed: true, + }, + "status": { Type: schema.TypeString, Computed: true, @@ -78,6 +113,24 @@ func dataSourceGoogleComputeAddressRead(d *schema.ResourceData, meta interface{} if err := d.Set("address", address.Address); err != nil { return fmt.Errorf("Error setting address: %s", err) } + if err := d.Set("address_type", address.AddressType); err != nil { + return fmt.Errorf("Error setting address_type: %s", err) + } + if err := d.Set("network", address.Network); err != nil { + return fmt.Errorf("Error setting network: %s", err) + } + if err := d.Set("network_tier", address.NetworkTier); err != nil { + return fmt.Errorf("Error setting network_tier: %s", err) + } + if err := d.Set("prefix_length", address.PrefixLength); err != nil { + return fmt.Errorf("Error setting prefix_length: %s", err) + } + if err := d.Set("purpose", address.Purpose); err != nil { + return fmt.Errorf("Error setting purpose: %s", err) + } + if err := d.Set("subnetwork", address.Subnetwork); err != nil { + return fmt.Errorf("Error setting subnetwork: %s", err) + } if err := d.Set("status", address.Status); err != nil { return fmt.Errorf("Error setting status: %s", err) } diff --git a/google/data_source_google_compute_global_address.go b/google/data_source_google_compute_global_address.go index 9da2970d895..f07fa0cf87c 100644 --- a/google/data_source_google_compute_global_address.go +++ b/google/data_source_google_compute_global_address.go @@ -21,6 +21,41 @@ func DataSourceGoogleComputeGlobalAddress() *schema.Resource { Computed: true, }, + "address_type": { + Type: schema.TypeString, + Computed: true, + }, + + "network": { + Type: schema.TypeString, + Computed: true, + }, + + "network_tier": { + Type: schema.TypeString, + Computed: true, + }, + + "prefix_length": { + Type: schema.TypeInt, + Computed: true, + }, + + "purpose": { + Type: schema.TypeString, + Computed: true, + }, + + "subnetwork": { + Type: schema.TypeString, + Computed: true, + }, + + "users": { + Type: schema.TypeString, + Computed: true, + }, + "status": { Type: schema.TypeString, Computed: true, @@ -60,6 +95,24 @@ func dataSourceGoogleComputeGlobalAddressRead(d *schema.ResourceData, meta inter if err := d.Set("address", address.Address); err != nil { return fmt.Errorf("Error setting address: %s", err) } + if err := d.Set("address_type", address.AddressType); err != nil { + return fmt.Errorf("Error setting address_type: %s", err) + } + if err := d.Set("network", address.Network); err != nil { + return fmt.Errorf("Error setting network: %s", err) + } + if err := d.Set("network_tier", address.NetworkTier); err != nil { + return fmt.Errorf("Error setting network_tier: %s", err) + } + if err := d.Set("prefix_length", address.PrefixLength); err != nil { + return fmt.Errorf("Error setting prefix_length: %s", err) + } + if err := d.Set("purpose", address.Purpose); err != nil { + return fmt.Errorf("Error setting purpose: %s", err) + } + if err := d.Set("subnetwork", address.Subnetwork); err != nil { + return fmt.Errorf("Error setting subnetwork: %s", err) + } if err := d.Set("status", address.Status); err != nil { return fmt.Errorf("Error setting status: %s", err) }