From 90bf355d8bb107c32d16542582e7ef38bdf94361 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 17 Mar 2023 18:22:11 +0100
Subject: [PATCH] config-loader: always yield from config sources and keep
 return empty

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/config-loader/src/sources/EnvConfigSource.ts | 7 ++++---
 packages/config-loader/src/sources/types.ts           | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/config-loader/src/sources/EnvConfigSource.ts b/packages/config-loader/src/sources/EnvConfigSource.ts
index 0862ac1960..e02f8617dc 100644
--- a/packages/config-loader/src/sources/EnvConfigSource.ts
+++ b/packages/config-loader/src/sources/EnvConfigSource.ts
@@ -17,7 +17,7 @@
 import { AppConfig } from '@backstage/config';
 import { assertError } from '@backstage/errors';
 import { JsonObject } from '@backstage/types';
-import { ConfigSource, ConfigSourceData } from './types';
+import { ConfigSource } from './types';
 
 export class EnvConfigSource implements ConfigSource {
   static create(options: {
@@ -32,9 +32,10 @@ export class EnvConfigSource implements ConfigSource {
     private readonly env: { [name: string]: string | undefined },
   ) {}
 
-  async *readConfigData(): AsyncIterator<{ data: ConfigSourceData[] }> {
+  async *readConfigData() {
     const data = readEnvConfig(this.env);
-    return { data };
+    yield { data };
+    return;
   }
 }
 
diff --git a/packages/config-loader/src/sources/types.ts b/packages/config-loader/src/sources/types.ts
index 9c65499bfe..5b0dd1d467 100644
--- a/packages/config-loader/src/sources/types.ts
+++ b/packages/config-loader/src/sources/types.ts
@@ -30,5 +30,5 @@ export interface ReadConfigDataOptions {
 export interface ConfigSource {
   readConfigData(
     options?: ReadConfigDataOptions,
-  ): AsyncIterator<{ data: ConfigSourceData[] }>;
+  ): AsyncIterator<{ data: ConfigSourceData[] }, void, void>;
 }