Merge pull request #5104 from terraform-providers/b/nat-gateway

r/nat_gateway: handling a crash when the `sku` block is nil
hashicorp · Dec 9, 2019 · 78572c9 · 78572c9
2 parents 21b0bb4 + 52eb19e
commit 78572c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/azurerm/data_source_nat_gateway.go b/azurerm/data_source_nat_gateway.go
@@ -85,14 +85,16 @@ func dataSourceArmNatGatewayRead(d *schema.ResourceData, meta interface{}) error
 		}
 		return fmt.Errorf("Error reading Nat Gateway %q (Resource Group %q): %+v", name, resourceGroup, err)
 	}
-	if resp.ID == nil {
+	if resp.ID == nil || *resp.ID == "" {
 		return fmt.Errorf("Cannot read NAT Gateway %q (Resource Group %q) ID", name, resourceGroup)
 	}
 	d.SetId(*resp.ID)
 
 	d.Set("name", resp.Name)
-	d.Set("sku_name", resp.Sku.Name)
 	d.Set("resource_group_name", resourceGroup)
+	if sku := resp.Sku; sku != nil {
+		d.Set("sku_name", resp.Sku.Name)
+	}
 
 	if location := resp.Location; location != nil {
 		d.Set("location", azure.NormalizeLocation(*location))

diff --git a/azurerm/resource_arm_nat_gateway.go b/azurerm/resource_arm_nat_gateway.go
@@ -140,7 +140,7 @@ func resourceArmNatGatewayCreateUpdate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return fmt.Errorf("Error retrieving NAT Gateway %q (Resource Group %q): %+v", name, resourceGroup, err)
 	}
-	if resp.ID == nil {
+	if resp.ID == nil || *resp.ID == "" {
 		return fmt.Errorf("Cannot read NAT Gateway %q (Resource Group %q) ID", name, resourceGroup)
 	}
 	d.SetId(*resp.ID)