Skip to content

Commit 24cd42a

Browse files
authored
Merge pull request #77 from github/cschleiden/user-agent
Set custom user agent including the extension's version
2 parents b70dba8 + 816da37 commit 24cd42a

5 files changed

Lines changed: 77 additions & 95 deletions

File tree

package-lock.json

Lines changed: 68 additions & 85 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/api/api.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import {Octokit} from "@octokit/rest";
2+
import {version} from "../../package.json";
3+
4+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
5+
export const userAgent = `VS Code GitHub Actions (${version})`;
26

37
export function getClient(token: string): Octokit {
48
return new Octokit({
59
auth: token,
6-
userAgent: "VS Code GitHub Actions",
7-
previews: ["jane-hopper"]
10+
userAgent: userAgent
811
});
912
}

src/client/client.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/workflow/languageServer.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {InitializationOptions, LogLevel} from "@github/actions-languageserver/in
66
import {BaseLanguageClient, LanguageClientOptions} from "vscode-languageclient";
77
import {LanguageClient as BrowserLanguageClient} from "vscode-languageclient/browser";
88
import {LanguageClient as NodeLanguageClient, ServerOptions, TransportKind} from "vscode-languageclient/node";
9+
import {userAgent} from "../api/api";
910
import {getSession} from "../auth/auth";
1011
import {getGitHubContext} from "../git/repository";
1112
import {WorkflowSelector} from "./documentSelector";
@@ -23,6 +24,7 @@ export async function initLanguageServer(context: vscode.ExtensionContext) {
2324
const ghContext = await getGitHubContext();
2425
const initializationOptions: InitializationOptions = {
2526
sessionToken: session.accessToken,
27+
userAgent: userAgent,
2628
repos: ghContext?.repos.map(repo => ({
2729
id: repo.id,
2830
owner: repo.owner,

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"sourceMap": true,
99
"strict": true,
1010
"moduleResolution": "node",
11-
"rootDir": "src",
12-
"outDir": "out"
11+
"outDir": "out",
12+
"resolveJsonModule": true
1313
}
1414
}

0 commit comments

Comments
 (0)