Skip to content

Commit

Permalink
Add field storage_policy_name in vmware_cluster (#8514) (#6072)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Aug 15, 2023
1 parent a5f80e0 commit 0a88c06
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .changelog/8514.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
gkeonprem: add field `storage_policy_name` in resource `google_gkeonprem_vmware_cluster` (beta)
```
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ control plane for this VMware User Cluster (default: 8192 MB memory).`,
Computed: true,
Description: `The Vsphere datastore used by the Control Plane Node.`,
},
"storage_policy_name": {
Type: schema.TypeString,
Computed: true,
Description: `The Vsphere storage policy used by the control plane Node.`,
},
},
},
},
Expand Down Expand Up @@ -837,6 +842,11 @@ Inherited from the admin cluster.`,
Computed: true,
Description: `The name of the vCenter resource pool for the user cluster.`,
},
"storage_policy_name": {
Type: schema.TypeString,
Computed: true,
Description: `The name of the vCenter storage policy for the user cluster.`,
},
},
},
},
Expand Down Expand Up @@ -1512,12 +1522,18 @@ func flattenGkeonpremVmwareClusterControlPlaneNodeVsphereConfig(v interface{}, d
transformed := make(map[string]interface{})
transformed["datastore"] =
flattenGkeonpremVmwareClusterControlPlaneNodeVsphereConfigDatastore(original["datastore"], d, config)
transformed["storage_policy_name"] =
flattenGkeonpremVmwareClusterControlPlaneNodeVsphereConfigStoragePolicyName(original["storagePolicyName"], d, config)
return []interface{}{transformed}
}
func flattenGkeonpremVmwareClusterControlPlaneNodeVsphereConfigDatastore(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenGkeonpremVmwareClusterControlPlaneNodeVsphereConfigStoragePolicyName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenGkeonpremVmwareClusterAntiAffinityGroups(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
if v == nil {
return nil
Expand Down Expand Up @@ -2221,6 +2237,8 @@ func flattenGkeonpremVmwareClusterVcenter(v interface{}, d *schema.ResourceData,
flattenGkeonpremVmwareClusterVcenterCaCertData(original["caCertData"], d, config)
transformed["address"] =
flattenGkeonpremVmwareClusterVcenterAddress(original["address"], d, config)
transformed["storage_policy_name"] =
flattenGkeonpremVmwareClusterVcenterStoragePolicyName(original["storagePolicyName"], d, config)
return []interface{}{transformed}
}
func flattenGkeonpremVmwareClusterVcenterResourcePool(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
Expand Down Expand Up @@ -2251,6 +2269,10 @@ func flattenGkeonpremVmwareClusterVcenterAddress(v interface{}, d *schema.Resour
return v
}

func flattenGkeonpremVmwareClusterVcenterStoragePolicyName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenGkeonpremVmwareClusterStatus(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
if v == nil {
return nil
Expand Down Expand Up @@ -2433,13 +2455,24 @@ func expandGkeonpremVmwareClusterControlPlaneNodeVsphereConfig(v interface{}, d
transformed["datastore"] = transformedDatastore
}

transformedStoragePolicyName, err := expandGkeonpremVmwareClusterControlPlaneNodeVsphereConfigStoragePolicyName(original["storage_policy_name"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedStoragePolicyName); val.IsValid() && !tpgresource.IsEmptyValue(val) {
transformed["storagePolicyName"] = transformedStoragePolicyName
}

return transformed, nil
}

func expandGkeonpremVmwareClusterControlPlaneNodeVsphereConfigDatastore(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
return v, nil
}

func expandGkeonpremVmwareClusterControlPlaneNodeVsphereConfigStoragePolicyName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
return v, nil
}

func expandGkeonpremVmwareClusterAntiAffinityGroups(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
l := v.([]interface{})
if len(l) == 0 || l[0] == nil {
Expand Down
8 changes: 8 additions & 0 deletions website/docs/r/gkeonprem_vmware_cluster.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,10 @@ The following arguments are supported:
(Output)
The Vsphere datastore used by the Control Plane Node.

* `storage_policy_name` -
(Output)
The Vsphere storage policy used by the control plane Node.

- - -


Expand Down Expand Up @@ -791,6 +795,10 @@ In addition to the arguments listed above, the following computed attributes are
(Output)
The vCenter IP address.

* `storage_policy_name` -
(Output)
The name of the vCenter storage policy for the user cluster.

<a name="nested_status"></a>The `status` block contains:

* `error_message` -
Expand Down

0 comments on commit 0a88c06

Please sign in to comment.