Skip to content

Commit cf95947

Browse files
committed
fix(types): resolve TypeScript errors in GitLab provider
Fixed TypeScript errors: - Remove unused imports (RequestError, gitDeleteRemoteBranch, sleep) - Fix GitBeaker import to use correct type path - Use bracket notation for process.env access (GITLAB_HOST, GITLAB_TOKEN) - Remove unused destructured variables (base, head)
1 parent f18afaa commit cf95947

File tree

5 files changed

+35
-34
lines changed

5 files changed

+35
-34
lines changed

packages/cli/src/commands/fix/pull-request.mts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { RequestError } from '@octokit/request-error'
2-
31
import { UNKNOWN_VALUE } from '@socketsecurity/lib/constants/core'
42
import { debug, debugDir } from '@socketsecurity/lib/debug'
53
import { isNonEmptyString } from '@socketsecurity/lib/strings'
@@ -17,7 +15,6 @@ import {
1715
GQL_PR_STATE_OPEN,
1816
} from '../../constants/github.mts'
1917
import { formatErrorWithDetail } from '../../utils/error/errors.mjs'
20-
import { gitDeleteRemoteBranch } from '../../utils/git/operations.mjs'
2118
import {
2219
cacheFetch,
2320
type GhsaDetails,
@@ -38,10 +35,6 @@ export type OpenSocketFixPrOptions = {
3835
retries?: number | undefined
3936
}
4037

41-
async function sleep(ms: number): Promise<void> {
42-
return new Promise(resolve => setTimeout(resolve, ms))
43-
}
44-
4538
export async function openSocketFixPr(
4639
owner: string,
4740
repo: string,

packages/cli/src/utils/git/gitlab-provider.mts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ import type {
1515
PrResponse,
1616
UpdatePrOptions,
1717
} from './provider.mts'
18-
import type {
19-
MergeRequestSchema,
20-
ProjectSchema,
21-
} from '@gitbeaker/rest/dist/types/resources/index.js'
18+
import type { MergeRequestSchema } from '@gitbeaker/rest'
2219

2320
/**
2421
* GitLab provider for Merge Request operations.
@@ -30,7 +27,7 @@ export class GitLabProvider implements PrProvider {
3027

3128
constructor() {
3229
const token = getGitLabToken()
33-
const host = process.env.GITLAB_HOST || 'https://gitlab.com'
30+
const host = process.env['GITLAB_HOST'] || 'https://gitlab.com'
3431

3532
this.gitlab = new Gitlab({
3633
host,
@@ -103,7 +100,7 @@ export class GitLabProvider implements PrProvider {
103100
}
104101

105102
async updatePr(options: UpdatePrOptions): Promise<void> {
106-
const { base, head, owner, prNumber, repo } = options
103+
const { owner, prNumber, repo } = options
107104

108105
const projectId = `${owner}/${repo}`
109106

@@ -337,7 +334,7 @@ async function sleep(ms: number): Promise<void> {
337334
*/
338335
function getGitLabToken(): string {
339336
// Check environment variable.
340-
const envToken = process.env.GITLAB_TOKEN
337+
const envToken = process.env['GITLAB_TOKEN']
341338
if (envToken) {
342339
return envToken
343340
}

packages/cli/src/utils/git/provider-factory.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function createPrProvider(): PrProvider {
1414
// Check for GitLab.
1515
if (
1616
remoteUrl.includes('gitlab.com') ||
17-
process.env.GITLAB_HOST ||
17+
process.env['GITLAB_HOST'] ||
1818
remoteUrl.includes('gitlab')
1919
) {
2020
// Lazy load to avoid importing GitLab dependency if not needed.

packages/cli/test/fixtures/commands/patch/pnpm/.socket/manifest.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
},
1212
"vulnerabilities": {
1313
"GHSA-76c9-3jph-rj3q": {
14-
"cves": ["CVE-2025-7339"],
14+
"cves": [
15+
"CVE-2025-7339"
16+
],
1517
"summary": "on-headers is vulnerable to http response header manipulation",
1618
"severity": "LOW",
1719
"description": "### Impact\n\nA bug in on-headers versions `< 1.1.0` may result in response headers being inadvertently modified when an array is passed to `response.writeHead()`\n\n### Patches\n\nUsers should upgrade to `1.1.0`\n\n### Workarounds\n\nUses are encouraged to upgrade to `1.1.0`, but this issue can be worked around by passing an object to `response.writeHead()` rather than an array.",
@@ -20,4 +22,4 @@
2022
}
2123
}
2224
}
23-
}
25+
}

packages/cli/test/fixtures/commands/patch/pnpm/custom-patches/index.js

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1+
/*!
2+
* on-headers
3+
* Copyright(c) 2014 Douglas Christopher Wilson
4+
* MIT Licensed
5+
*/
6+
7+
'use strict'
8+
19
/**
210
* Module exports.
311
* @public
412
*/
513

614
module.exports = onHeaders
715

8-
var http = require('node:http')
16+
var http = require('http')
917

1018
// older node versions don't have appendHeader
11-
var isAppendHeaderSupported =
12-
typeof http.ServerResponse.prototype.appendHeader === 'function'
13-
var set1dArray = isAppendHeaderSupported
14-
? set1dArrayWithAppend
15-
: set1dArrayWithSet
19+
var isAppendHeaderSupported = typeof http.ServerResponse.prototype.appendHeader === 'function'
20+
var set1dArray = isAppendHeaderSupported ? set1dArrayWithAppend : set1dArrayWithSet
1621

1722
/**
1823
* Create a replacement writeHead method.
@@ -22,11 +27,11 @@ var set1dArray = isAppendHeaderSupported
2227
* @private
2328
*/
2429

25-
function createWriteHead(prevWriteHead, listener) {
30+
function createWriteHead (prevWriteHead, listener) {
2631
var fired = false
2732

2833
// return function with core name and argument list
29-
return function writeHead(_statusCode) {
34+
return function writeHead (statusCode) {
3035
// set headers from arguments
3136
var args = setWriteHeadHeaders.apply(this, arguments)
3237

@@ -54,7 +59,7 @@ function createWriteHead(prevWriteHead, listener) {
5459
* @public
5560
*/
5661

57-
function onHeaders(res, listener) {
62+
function onHeaders (res, listener) {
5863
if (!res) {
5964
throw new TypeError('argument res is required')
6065
}
@@ -74,7 +79,7 @@ function onHeaders(res, listener) {
7479
* @private
7580
*/
7681

77-
function setHeadersFromArray(res, headers) {
82+
function setHeadersFromArray (res, headers) {
7883
if (headers.length && Array.isArray(headers[0])) {
7984
// 2D
8085
set2dArray(res, headers)
@@ -96,7 +101,7 @@ function setHeadersFromArray(res, headers) {
96101
* @private
97102
*/
98103

99-
function setHeadersFromObject(res, headers) {
104+
function setHeadersFromObject (res, headers) {
100105
var keys = Object.keys(headers)
101106
for (var i = 0; i < keys.length; i++) {
102107
var k = keys[i]
@@ -111,11 +116,15 @@ function setHeadersFromObject(res, headers) {
111116
* @private
112117
*/
113118

114-
function setWriteHeadHeaders(statusCode) {
119+
function setWriteHeadHeaders (statusCode) {
115120
var length = arguments.length
116-
var headerIndex = length > 1 && typeof arguments[1] === 'string' ? 2 : 1
121+
var headerIndex = length > 1 && typeof arguments[1] === 'string'
122+
? 2
123+
: 1
117124

118-
var headers = length >= headerIndex + 1 ? arguments[headerIndex] : undefined
125+
var headers = length >= headerIndex + 1
126+
? arguments[headerIndex]
127+
: undefined
119128

120129
this.statusCode = statusCode
121130

@@ -136,7 +145,7 @@ function setWriteHeadHeaders(statusCode) {
136145
return args
137146
}
138147

139-
function set2dArray(res, headers) {
148+
function set2dArray (res, headers) {
140149
var key
141150
for (var i = 0; i < headers.length; i++) {
142151
key = headers[i][0]
@@ -146,7 +155,7 @@ function set2dArray(res, headers) {
146155
}
147156
}
148157

149-
function set1dArrayWithAppend(res, headers) {
158+
function set1dArrayWithAppend (res, headers) {
150159
for (var i = 0; i < headers.length; i += 2) {
151160
res.removeHeader(headers[i])
152161
}
@@ -160,7 +169,7 @@ function set1dArrayWithAppend(res, headers) {
160169
}
161170
}
162171

163-
function set1dArrayWithSet(res, headers) {
172+
function set1dArrayWithSet (res, headers) {
164173
var key
165174
for (var i = 0; i < headers.length; i += 2) {
166175
key = headers[i]

0 commit comments

Comments
 (0)