Fix dependency incompatibilities

src/config-utils.test.ts

@@ -55,7 +55,7 @@ function mockGetContents(
     data: content,
   };
   const spyGetContents = sinon
-    .stub(client.repos, "getContent")
+    .stub(client.rest.repos, "getContent")
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     .resolves(response as any);
   sinon.stub(api, "getApiClient").value(() => client);
@@ -73,7 +73,7 @@ function mockListLanguages(languages: string[]) {
     response.data[language] = 123;
   }
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-  sinon.stub(client.repos, "listLanguages").resolves(response as any);
+  sinon.stub(client.rest.repos, "listLanguages").resolves(response as any);
   sinon.stub(api, "getApiClient").value(() => client);
 }
 

src/config-utils.ts

@@ -889,7 +889,7 @@ export async function getLanguagesInRepo(
   logger: Logger
 ): Promise<LanguageOrAlias[]> {
   logger.debug(`GitHub repo ${repository.owner} ${repository.repo}`);
-  const response = await api.getApiClient().repos.listLanguages({
+  const response = await api.getApiClient().rest.repos.listLanguages({
     owner: repository.owner,
     repo: repository.repo,
   });
@@ -901,7 +901,7 @@ export async function getLanguagesInRepo(
   // Since sets in javascript maintain insertion order, using a set here and then splatting it
   // into an array gives us an array of languages ordered by popularity
   const languages: Set<LanguageOrAlias> = new Set();
-  for (const lang of Object.keys(response.data)) {
+  for (const lang of Object.keys(response.data as Record<string, number>)) {
     const parsedLang = parseLanguage(lang);
     if (parsedLang !== undefined) {
       languages.add(parsedLang);
@@ -1852,7 +1852,7 @@ async function getRemoteConfig(
 
   const response = await api
     .getApiClientWithExternalAuth(apiDetails)
-    .repos.getContent({
+    .rest.repos.getContent({
       owner: pieces.groups.owner,
       repo: pieces.groups.repo,
       path: pieces.groups.path,

src/feature-flags.ts

@@ -423,7 +423,7 @@ class GitHubFeatureFlags {
           "This run of the CodeQL Action does not have permission to access Code Scanning API endpoints. " +
             "As a result, it will not be opted into any experimental features. " +
             "This could be because the Action is running on a pull request from a fork. If not, " +
-            `please ensure the Action has the 'security-events: write' permission. Details: ${e}`
+            `please ensure the Action has the 'security-events: write' permission. Details: ${e.message}`
         );
         this.hasAccessedRemoteFeatureFlags = false;
         return {};

src/setup-codeql.ts

@@ -82,7 +82,7 @@ export async function tryFindCliVersionDotcomOnly(
     );
     const apiClient = api.getApiClient();
     const codeQLActionRepository = getCodeQLActionRepository(logger);
-    const release = await apiClient.repos.getReleaseByTag({
+    const release = await apiClient.rest.repos.getReleaseByTag({
       owner: codeQLActionRepository.split("/")[0],
       repo: codeQLActionRepository.split("/")[1],
       tag: tagName,
@@ -165,7 +165,7 @@ async function getCodeQLBundleDownloadURL(
     }
     const [repositoryOwner, repositoryName] = repository.split("/");
     try {
-      const release = await api.getApiClient().repos.getReleaseByTag({
+      const release = await api.getApiClient().rest.repos.getReleaseByTag({
         owner: repositoryOwner,
         repo: repositoryName,
         tag: tagName,

src/testing-utils.ts

@@ -199,8 +199,10 @@ export function mockLanguagesInRepo(languages: string[]) {
 
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   mockClient.returns({
-    repos: {
-      listLanguages,
+    rest: {
+      repos: {
+        listLanguages,
+      },
     },
   } as any);
   return listLanguages;

src/util.test.ts

@@ -214,7 +214,7 @@ function mockGetMetaVersionHeader(
     },
   };
   const spyGetContents = sinon
-    .stub(client.meta, "get")
+    .stub(client.rest.meta, "get")
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     .resolves(response as any);
   sinon.stub(api, "getApiClient").value(() => client);

src/util.ts

@@ -366,7 +366,7 @@ export async function getGitHubVersion(
   // Doesn't strictly have to be the meta endpoint as we're only
   // using the response headers which are available on every request.
   const apiClient = getApiClient();
-  const response = await apiClient.meta.get();
+  const response = await apiClient.rest.meta.get();
 
   // This happens on dotcom, although we expect to have already returned in that
   // case. This can also serve as a fallback in cases we haven't foreseen.