From 2611d033d7f9036c50c560e39c5e329e507b8dd9 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Thu, 16 Oct 2025 19:03:46 +0100
Subject: [PATCH] De-duplicate `InitToolsDownloadFIelds` definition

---
 src/init-action.ts         | 11 +----------
 src/setup-codeql-action.ts | 11 +----------
 src/status-report.ts       | 10 ++++++++++
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/init-action.ts b/src/init-action.ts
index 0dbe957a7..13fa6c5b2 100644
--- a/src/init-action.ts
+++ b/src/init-action.ts
@@ -56,6 +56,7 @@ import { ToolsSource } from "./setup-codeql";
 import {
   ActionName,
   InitStatusReport,
+  InitToolsDownloadFields,
   InitWithConfigStatusReport,
   createInitWithConfigStatusReport,
   createStatusReportBase,
@@ -86,16 +87,6 @@ import {
 } from "./util";
 import { validateWorkflow } from "./workflow";
 
-/** Fields of the init status report populated when the tools source is `download`. */
-interface InitToolsDownloadFields {
-  /** Time taken to download the bundle, in milliseconds. */
-  tools_download_duration_ms?: number;
-  /**
-   * Whether the relevant tools dotcom feature flags have been misconfigured.
-   * Only populated if we attempt to determine the default version based on the dotcom feature flags. */
-  tools_feature_flags_valid?: boolean;
-}
-
 async function sendCompletedStatusReport(
   startedAt: Date,
   config: configUtils.Config | undefined,
diff --git a/src/setup-codeql-action.ts b/src/setup-codeql-action.ts
index e9f544fea..ab7ebab55 100644
--- a/src/setup-codeql-action.ts
+++ b/src/setup-codeql-action.ts
@@ -18,6 +18,7 @@ import { ToolsSource } from "./setup-codeql";
 import {
   ActionName,
   InitStatusReport,
+  InitToolsDownloadFields,
   createStatusReportBase,
   getActionsStatus,
   sendStatusReport,
@@ -35,16 +36,6 @@ import {
   getErrorMessage,
 } from "./util";
 
-/** Fields of the init status report populated when the tools source is `download`. */
-interface InitToolsDownloadFields {
-  /** Time taken to download the bundle, in milliseconds. */
-  tools_download_duration_ms?: number;
-  /**
-   * Whether the relevant tools dotcom feature flags have been misconfigured.
-   * Only populated if we attempt to determine the default version based on the dotcom feature flags. */
-  tools_feature_flags_valid?: boolean;
-}
-
 /**
  * Helper function to send a full status report for this action.
  */
diff --git a/src/status-report.ts b/src/status-report.ts
index 39dfa9bf3..e3f442d61 100644
--- a/src/status-report.ts
+++ b/src/status-report.ts
@@ -517,6 +517,16 @@ export interface InitWithConfigStatusReport extends InitStatusReport {
   config_file: string;
 }
 
+/** Fields of the init status report populated when the tools source is `download`. */
+export interface InitToolsDownloadFields {
+  /** Time taken to download the bundle, in milliseconds. */
+  tools_download_duration_ms?: number;
+  /**
+   * Whether the relevant tools dotcom feature flags have been misconfigured.
+   * Only populated if we attempt to determine the default version based on the dotcom feature flags. */
+  tools_feature_flags_valid?: boolean;
+}
+
 /**
  * Composes a `InitWithConfigStatusReport` from the given values.
  *