-
Notifications
You must be signed in to change notification settings - Fork 563
add useragent with package version #2744
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+71
−1
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import { after, before, beforeEach, describe, it, mock } from 'node:test'; | ||
| import { after, before, beforeEach, describe, it, mock, TestContext } from 'node:test'; | ||
| import assert, { | ||
| deepEqual, | ||
| deepStrictEqual, | ||
|
|
@@ -1674,6 +1674,67 @@ describe('KubeConfig', () => { | |
| const client = kc.makeApiClient(CoreV1Api); | ||
| strictEqual(client instanceof CoreV1Api, true); | ||
| }); | ||
|
|
||
| it('should include User-Agent header with version', async (t: TestContext) => { | ||
| let capturedUserAgent: string | undefined; | ||
|
|
||
| const { server, host, port } = await createTestHttpsServer((req, res) => { | ||
| capturedUserAgent = req.headers['user-agent']; | ||
|
|
||
| res.setHeader('Content-Type', 'application/json'); | ||
| res.writeHead(200); | ||
| res.end( | ||
| JSON.stringify({ | ||
| apiVersion: 'v1', | ||
| kind: 'NamespaceList', | ||
| items: [], | ||
| }), | ||
| ); | ||
| }); | ||
|
|
||
| const kc = new KubeConfig(); | ||
| kc.loadFromClusterAndUser( | ||
| { | ||
| name: 'test-cluster', | ||
| server: `https://${host}:${port}`, | ||
| skipTLSVerify: true, | ||
| } as Cluster, | ||
| { | ||
| name: 'test-user', | ||
| token: 'test-token', | ||
| } as User, | ||
| ); | ||
|
|
||
| const coreV1Api = kc.makeApiClient(CoreV1Api); | ||
| await coreV1Api.listNamespace(); | ||
|
|
||
| // Read version from package.json | ||
| const packageJsonPath = join(__dirname, '..', 'package.json'); | ||
| const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8')); | ||
| const expectedVersion = packageJson.version; | ||
|
|
||
| // Verify version is not blank | ||
| strictEqual(typeof expectedVersion, 'string'); | ||
| strictEqual(expectedVersion.length > 0, true, 'package.json version should not be blank'); | ||
|
|
||
| // Verify User-Agent header contains client name and version | ||
| strictEqual(typeof capturedUserAgent, 'string'); | ||
| strictEqual( | ||
| capturedUserAgent!.startsWith('kubernetes-javascript-client/'), | ||
| true, | ||
| 'capturedUserAgent should start with "kubernetes-javascript-client/"', | ||
| ); | ||
| strictEqual( | ||
| capturedUserAgent!.endsWith(expectedVersion), | ||
| true, | ||
| `User-Agent should include version ${expectedVersion}`, | ||
| ); | ||
| t.after(async () => { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should be moved to right after the server is started. Otherwise, if any assertions fail, this will never be added. |
||
| await new Promise<Error | undefined>((resolve) => { | ||
| server.close(resolve); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| describe('EmptyConfig', () => { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we name it
kubernetes-client-javascriptto better match the org/repo name?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
makes sense to me