From d9edb8e578bdc39d2eba218ba9828f8e371fe862 Mon Sep 17 00:00:00 2001 From: njucz Date: Thu, 19 Nov 2020 15:06:27 +0800 Subject: [PATCH] move "outbound_ip" to the top level --- .../spring_cloud_service_resource.go | 38 ++++++++++--------- .../spring_cloud_service_resource_test.go | 2 +- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/azurerm/internal/services/appplatform/spring_cloud_service_resource.go b/azurerm/internal/services/appplatform/spring_cloud_service_resource.go index 4e7a9a733b6ac..232d0f9bcfbcd 100644 --- a/azurerm/internal/services/appplatform/spring_cloud_service_resource.go +++ b/azurerm/internal/services/appplatform/spring_cloud_service_resource.go @@ -111,22 +111,6 @@ func resourceArmSpringCloudService() *schema.Resource { Computed: true, ForceNew: true, }, - - "outbound_ip": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "public_ips": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - }, - }, }, }, }, @@ -225,6 +209,22 @@ func resourceArmSpringCloudService() *schema.Resource { }, }, + "outbound_ip": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "public_ips": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + }, + }, + }, + "tags": tags.Schema(), }, } @@ -396,6 +396,11 @@ func resourceArmSpringCloudServiceRead(d *schema.ResourceData, meta interface{}) if err := d.Set("network", flattenArmSpringCloudNetwork(resp.Properties.NetworkProfile)); err != nil { return fmt.Errorf("setting `network`: %+v", err) } + if resp.Properties.NetworkProfile != nil { + if err := d.Set("outbound_ip", flattenArmSpringCloudNetworkOutboundIPs(resp.Properties.NetworkProfile.OutboundIPs)); err != nil { + return fmt.Errorf("setting `outbound_ip`: %+v", err) + } + } if resp.Properties.ConfigServerProperties != nil && resp.Properties.ConfigServerProperties.ConfigServer != nil { if props := resp.Properties.ConfigServerProperties.ConfigServer.GitProperty; props != nil { if err := d.Set("config_server_git_setting", flattenArmSpringCloudConfigServerGitProperty(props, d)); err != nil { @@ -821,7 +826,6 @@ func flattenArmSpringCloudNetwork(input *appplatform.NetworkProfile) []interface "cidr_ranges": cidrRanges, "app_network_resource_group": appNetworkResourceGroup, "service_runtime_network_resource_group": serviceRuntimeNetworkResourceGroup, - "outbound_ip": flattenArmSpringCloudNetworkOutboundIPs(input.OutboundIPs), }, } } diff --git a/azurerm/internal/services/appplatform/tests/spring_cloud_service_resource_test.go b/azurerm/internal/services/appplatform/tests/spring_cloud_service_resource_test.go index ab9baab24174a..043dc1dfc48f2 100644 --- a/azurerm/internal/services/appplatform/tests/spring_cloud_service_resource_test.go +++ b/azurerm/internal/services/appplatform/tests/spring_cloud_service_resource_test.go @@ -112,7 +112,7 @@ func TestAccAzureRMSpringCloudService_virtualNetwork(t *testing.T) { testCheckAzureRMSpringCloudServiceExists(data.ResourceName), resource.TestCheckResourceAttrSet(data.ResourceName, "network.0.service_runtime_network_resource_group"), resource.TestCheckResourceAttrSet(data.ResourceName, "network.0.app_network_resource_group"), - resource.TestCheckResourceAttrSet(data.ResourceName, "network.0.outbound_ip.0.public_ips.0"), + resource.TestCheckResourceAttrSet(data.ResourceName, "outbound_ip.0.public_ips.0"), ), }, data.ImportStep(