From 7e0f35bcc93a84a644bbba5f3a94b2b5e81a8bda Mon Sep 17 00:00:00 2001
From: Maciej Strzelczyk <strzelczyk@google.com>
Date: Wed, 5 Oct 2022 15:19:38 +0200
Subject: [PATCH] docs(samples): Fixing an issue with listing all instances
 (#349)

---
 compute/compute/ingredients/instances/list_all.py | 8 ++++----
 compute/compute/snippets/instances/list_all.py    | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/compute/compute/ingredients/instances/list_all.py b/compute/compute/ingredients/instances/list_all.py
index ced8e7a1f277..60498c4df67f 100644
--- a/compute/compute/ingredients/instances/list_all.py
+++ b/compute/compute/ingredients/instances/list_all.py
@@ -12,10 +12,11 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-# This is an ingredient file. It is not meant to be run directly. Check the samples/snippets 
+# This is an ingredient file. It is not meant to be run directly. Check the samples/snippets
 # folder for complete code samples that are ready to be used.
 # Disabling flake8 for the ingredients file, as it would fail F821 - undefined name check.
 # flake8: noqa
+from collections import defaultdict
 from typing import Dict, Iterable
 
 from google.cloud import compute_v1
@@ -42,17 +43,16 @@ def list_all_instances(
 
     agg_list = instance_client.aggregated_list(request=request)
 
-    all_instances = {}
+    all_instances = defaultdict(list)
     print("Instances found:")
     # Despite using the `max_results` parameter, you don't need to handle the pagination
     # yourself. The returned `AggregatedListPager` object handles pagination
     # automatically, returning separated pages as you iterate over the results.
     for zone, response in agg_list:
         if response.instances:
-            all_instances[zone] = response.instances
+            all_instances[zone].extend(response.instances)
             print(f" {zone}:")
             for instance in response.instances:
                 print(f" - {instance.name} ({instance.machine_type})")
     return all_instances
 # </INGREDIENT>
-
diff --git a/compute/compute/snippets/instances/list_all.py b/compute/compute/snippets/instances/list_all.py
index 3bfda0b9a3c3..47302fe423a6 100644
--- a/compute/compute/snippets/instances/list_all.py
+++ b/compute/compute/snippets/instances/list_all.py
@@ -20,6 +20,7 @@
 
 
 # [START compute_instances_list_all]
+from collections import defaultdict
 from typing import Dict, Iterable
 
 from google.cloud import compute_v1
@@ -45,14 +46,14 @@ def list_all_instances(
 
     agg_list = instance_client.aggregated_list(request=request)
 
-    all_instances = {}
+    all_instances = defaultdict(list)
     print("Instances found:")
     # Despite using the `max_results` parameter, you don't need to handle the pagination
     # yourself. The returned `AggregatedListPager` object handles pagination
     # automatically, returning separated pages as you iterate over the results.
     for zone, response in agg_list:
         if response.instances:
-            all_instances[zone] = response.instances
+            all_instances[zone].extend(response.instances)
             print(f" {zone}:")
             for instance in response.instances:
                 print(f" - {instance.name} ({instance.machine_type})")