Extract loadUserConfig()

cklin · cklin · commit f4358b38d1f4 · 2025-07-09T14:32:05.000-07:00
diff --git a/src/config-utils.ts b/src/config-utils.ts
@@ -588,23 +588,12 @@ async function loadConfig({
   features,
   logger,
 }: LoadConfigInputs): Promise<Config> {
-  let parsedYAML: UserConfig;
-
-  if (isLocal(configFile)) {
-    if (configFile !== userConfigFromActionPath(tempDir)) {
-      // If the config file is not generated by the Action, it should be relative to the workspace.
-      configFile = path.resolve(workspacePath, configFile);
-      // Error if the config file is now outside of the workspace
-      if (!(configFile + path.sep).startsWith(workspacePath + path.sep)) {
-        throw new ConfigurationError(
-          getConfigFileOutsideWorkspaceErrorMessage(configFile),
-        );
-      }
-    }
-    parsedYAML = getLocalConfig(configFile);
-  } else {
-    parsedYAML = await getRemoteConfig(configFile, apiDetails);
-  }
+  const parsedYAML = await loadUserConfig(
+    configFile,
+    workspacePath,
+    apiDetails,
+    tempDir,
+  );
 
   const languages = await getLanguages(
     codeql,
@@ -658,6 +647,29 @@ async function loadConfig({
   };
 }
 
+async function loadUserConfig(
+  configFile: string,
+  workspacePath: string,
+  apiDetails: api.GitHubApiCombinedDetails,
+  tempDir: string,
+): Promise<UserConfig> {
+  if (isLocal(configFile)) {
+    if (configFile !== userConfigFromActionPath(tempDir)) {
+      // If the config file is not generated by the Action, it should be relative to the workspace.
+      configFile = path.resolve(workspacePath, configFile);
+      // Error if the config file is now outside of the workspace
+      if (!(configFile + path.sep).startsWith(workspacePath + path.sep)) {
+        throw new ConfigurationError(
+          getConfigFileOutsideWorkspaceErrorMessage(configFile),
+        );
+      }
+    }
+    return getLocalConfig(configFile);
+  } else {
+    return await getRemoteConfig(configFile, apiDetails);
+  }
+}
+
 /**
  * Calculates how the codeql config file needs to be augmented before passing
  * it to the CLI. The reason this is necessary is the codeql-action can be called
