Skip to content

Commit ae57810

Browse files
bhati-pradeepsiddharth-nutanix
authored andcommitted
Fix nutanix_project and nutanix_projects datasource to not use kind attribute
1 parent 4dc5a41 commit ae57810

3 files changed

Lines changed: 22 additions & 2 deletions

File tree

nutanix/data_source_nutanix_host.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,26 @@ func flattenReferenceList(references []*v3.ReferenceValues) []map[string]interfa
649649
return res
650650
}
651651

652+
func flattenExternalNetworkListReference(reference *v3.ReferenceValues) map[string]interface{} {
653+
if reference != nil {
654+
return map[string]interface{}{
655+
"uuid": reference.UUID,
656+
"name": reference.Name,
657+
}
658+
}
659+
return map[string]interface{}{}
660+
}
661+
662+
func flattenExternalNetworkListReferenceList(references []*v3.ReferenceValues) []map[string]interface{} {
663+
res := make([]map[string]interface{}, len(references))
664+
if len(references) > 0 {
665+
for i, r := range references {
666+
res[i] = flattenExternalNetworkListReference(r)
667+
}
668+
}
669+
return res
670+
}
671+
652672
func flattenHypervisor(hypervisor *v3.Hypervisor) map[string]interface{} {
653673
if hypervisor != nil {
654674
return map[string]interface{}{

nutanix/data_source_nutanix_project.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ func dataSourceNutanixProjectRead(d *schema.ResourceData, meta interface{}) erro
351351
if err := d.Set("subnet_reference_list", flattenReferenceList(project.Spec.Resources.SubnetReferenceList)); err != nil {
352352
return fmt.Errorf("error setting `subnet_reference_list` for Project(%s): %s", d.Id(), err)
353353
}
354-
if err := d.Set("external_network_list", flattenReferenceList(project.Spec.Resources.ExternalNetworkList)); err != nil {
354+
if err := d.Set("external_network_list", flattenExternalNetworkListReferenceList(project.Spec.Resources.ExternalNetworkList)); err != nil {
355355
return fmt.Errorf("error setting `external_network_list` for Project(%s): %s", d.Id(), err)
356356
}
357357
if err := d.Set("metadata", m); err != nil {

nutanix/data_source_nutanix_projects.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ func flattenProjectEntities(projects []*v3.Project) []map[string]interface{} {
335335
"user_reference_list": flattenReferenceList(project.Spec.Resources.UserReferenceList),
336336
"external_user_group_reference_list": flattenReferenceList(project.Spec.Resources.ExternalUserGroupReferenceList),
337337
"subnet_reference_list": flattenReferenceList(project.Spec.Resources.SubnetReferenceList),
338-
"external_network_list": flattenReferenceList(project.Spec.Resources.ExternalNetworkList),
338+
"external_network_list": flattenExternalNetworkListReferenceList(project.Spec.Resources.ExternalNetworkList),
339339
"metadata": metadata,
340340
"categories": categories,
341341
"project_reference": flattenReferenceValues(project.Metadata.ProjectReference),

0 commit comments

Comments
 (0)