Address review

hashicorp · Oct 28, 2019 · f51339d · f51339d
1 parent 944ebbe
commit f51339d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/azurerm/data_source_client_config.go b/azurerm/data_source_client_config.go
@@ -92,13 +92,15 @@ func dataSourceArmClientConfigRead(d *schema.ResourceData, meta interface{}) err
 	d.Set("object_id", "")
 
 	// TODO remove this when we confirm that MSI no longer returns nil with getAuthenticatedObjectID
+	objectId := ""
 	if client.getAuthenticatedObjectID != nil {
-		if v, err := client.getAuthenticatedObjectID(ctx); err != nil {
+		v, err := client.getAuthenticatedObjectID(ctx)
+		if err != nil {
 			return fmt.Errorf("Error getting authenticated object ID: %v", err)
-		} else {
-			d.Set("object_id", v)
 		}
+		objectId = v
 	}
+	d.Set("object_id", objectId)
 
 	return nil
 }