From c1a8bbf5e5cd331a51eb8548350f558069dc8307 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 14 Jul 2022 15:32:41 +0200
Subject: [PATCH] errors: inline headers type

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/warm-paws-sneeze.md      |  5 +++++
 packages/errors/api-report.md       | 13 ++++++++++++-
 packages/errors/src/errors/types.ts | 14 +++++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/warm-paws-sneeze.md

diff --git a/.changeset/warm-paws-sneeze.md b/.changeset/warm-paws-sneeze.md
new file mode 100644
index 0000000000..e620074f43
--- /dev/null
+++ b/.changeset/warm-paws-sneeze.md
@@ -0,0 +1,5 @@
+---
+'@backstage/errors': patch
+---
+
+Inline the type of `ConsumedResponse.headers` and tweaked it to be the intersection of the built-in type and `node-fetch` type.
diff --git a/packages/errors/api-report.md b/packages/errors/api-report.md
index aab4e9baec..1a65ae2315 100644
--- a/packages/errors/api-report.md
+++ b/packages/errors/api-report.md
@@ -16,7 +16,18 @@ export class ConflictError extends CustomErrorBase {}
 
 // @public
 export type ConsumedResponse = {
-  readonly headers: Headers;
+  readonly headers: {
+    append(name: string, value: string): void;
+    delete(name: string): void;
+    get(name: string): string | null;
+    has(name: string): boolean;
+    set(name: string, value: string): void;
+    forEach(callback: (value: string, name: string) => void): void;
+    entries(): IterableIterator<[string, string]>;
+    keys(): IterableIterator<string>;
+    values(): IterableIterator<string>;
+    [Symbol.iterator](): Iterator<[string, string]>;
+  };
   readonly ok: boolean;
   readonly redirected: boolean;
   readonly status: number;
diff --git a/packages/errors/src/errors/types.ts b/packages/errors/src/errors/types.ts
index a62975571f..b0e86fd19a 100644
--- a/packages/errors/src/errors/types.ts
+++ b/packages/errors/src/errors/types.ts
@@ -21,7 +21,19 @@
  * @public
  */
 export type ConsumedResponse = {
-  readonly headers: Headers;
+  readonly headers: {
+    append(name: string, value: string): void;
+    delete(name: string): void;
+    get(name: string): string | null;
+    has(name: string): boolean;
+    set(name: string, value: string): void;
+    forEach(callback: (value: string, name: string) => void): void;
+
+    entries(): IterableIterator<[string, string]>;
+    keys(): IterableIterator<string>;
+    values(): IterableIterator<string>;
+    [Symbol.iterator](): Iterator<[string, string]>;
+  };
   readonly ok: boolean;
   readonly redirected: boolean;
   readonly status: number;