@socketsecurity/cli-with-sentry 1.0.11 → 1.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +158 -153
- package/dist/cli.js.map +1 -1
- package/dist/constants.js +3 -3
- package/dist/constants.js.map +1 -1
- package/dist/types/commands/fix/open-pr.d.mts.map +1 -1
- package/dist/types/commands/json/output-cmd-json.d.mts.map +1 -1
- package/dist/types/commands/manifest/cmd-manifest-gradle.d.mts.map +1 -1
- package/dist/types/commands/manifest/cmd-manifest-kotlin.d.mts.map +1 -1
- package/dist/types/commands/manifest/cmd-manifest-scala.d.mts.map +1 -1
- package/dist/types/commands/manifest/detect-manifest-actions.d.mts +1 -1
- package/dist/types/commands/manifest/detect-manifest-actions.d.mts.map +1 -1
- package/dist/types/commands/manifest/generate_auto_manifest.d.mts.map +1 -1
- package/dist/types/commands/wrapper/remove-socket-wrapper.d.mts +1 -1
- package/dist/types/commands/wrapper/remove-socket-wrapper.d.mts.map +1 -1
- package/dist/types/utils/fs.d.mts +11 -1
- package/dist/types/utils/fs.d.mts.map +1 -1
- package/dist/types/utils/glob.d.mts.map +1 -1
- package/dist/types/utils/path-resolve.d.mts.map +1 -1
- package/dist/types/utils/socketjson.d.mts +1 -1
- package/dist/types/utils/socketjson.d.mts.map +1 -1
- package/dist/utils.js +27 -24
- package/dist/utils.js.map +1 -1
- package/external/@coana-tech/cli/cli.mjs +16 -5
- package/external/@socketsecurity/registry/lib/spawn.js +5 -3
- package/package.json +5 -5
package/dist/cli.js
CHANGED
|
@@ -959,8 +959,8 @@ async function fetchReportData(orgSlug, scanId, includeLicensePolicy) {
|
|
|
959
959
|
return sockSdkResult;
|
|
960
960
|
}
|
|
961
961
|
const sockSdk = sockSdkResult.data;
|
|
962
|
-
let
|
|
963
|
-
let
|
|
962
|
+
let policyStatus = 'requested...';
|
|
963
|
+
let scanStatus = 'requested...';
|
|
964
964
|
let finishedFetching = false;
|
|
965
965
|
|
|
966
966
|
// Lazily access constants.spinner.
|
|
@@ -989,10 +989,10 @@ async function fetchReportData(orgSlug, scanId, includeLicensePolicy) {
|
|
|
989
989
|
if (!result.ok) {
|
|
990
990
|
return result;
|
|
991
991
|
}
|
|
992
|
-
const
|
|
992
|
+
const ndJsonString = result.data;
|
|
993
993
|
|
|
994
994
|
// This is nd-json; each line is a json object.
|
|
995
|
-
const lines =
|
|
995
|
+
const lines = ndJsonString.split('\n').filter(Boolean);
|
|
996
996
|
let ok = true;
|
|
997
997
|
const data = lines.map(line => {
|
|
998
998
|
try {
|
|
@@ -1004,13 +1004,13 @@ async function fetchReportData(orgSlug, scanId, includeLicensePolicy) {
|
|
|
1004
1004
|
}
|
|
1005
1005
|
});
|
|
1006
1006
|
if (ok) {
|
|
1007
|
-
updateScan(
|
|
1007
|
+
updateScan('success');
|
|
1008
1008
|
return {
|
|
1009
1009
|
ok: true,
|
|
1010
1010
|
data
|
|
1011
1011
|
};
|
|
1012
1012
|
}
|
|
1013
|
-
updateScan(
|
|
1013
|
+
updateScan('received invalid JSON response');
|
|
1014
1014
|
return {
|
|
1015
1015
|
ok: false,
|
|
1016
1016
|
message: 'Invalid API response',
|
|
@@ -1024,14 +1024,14 @@ async function fetchReportData(orgSlug, scanId, includeLicensePolicy) {
|
|
|
1024
1024
|
}
|
|
1025
1025
|
updateProgress();
|
|
1026
1026
|
const [scan, securityPolicy] = await Promise.all([fetchScanResult().catch(e => {
|
|
1027
|
-
updateScan(
|
|
1027
|
+
updateScan('failure; unknown blocking problem occurred');
|
|
1028
1028
|
return {
|
|
1029
1029
|
ok: false,
|
|
1030
1030
|
message: 'Unexpected API problem',
|
|
1031
1031
|
cause: `We encountered an unexpected problem while requesting the Scan from the API: ${e?.message || '(no error message found)'}${e?.cause ? ` (cause: ${e.cause})` : ''}`
|
|
1032
1032
|
};
|
|
1033
1033
|
}), fetchSecurityPolicy().catch(e => {
|
|
1034
|
-
updatePolicy(
|
|
1034
|
+
updatePolicy('failure; unknown blocking problem occurred');
|
|
1035
1035
|
return {
|
|
1036
1036
|
ok: false,
|
|
1037
1037
|
message: 'Unexpected API problem',
|
|
@@ -1487,7 +1487,7 @@ async function outputCreateNewScan(result, outputKind, interactive) {
|
|
|
1487
1487
|
async function detectManifestActions(
|
|
1488
1488
|
// Passing in null means we attempt detection for every supported language
|
|
1489
1489
|
// regardless of local socket.json status. Sometimes we want that.
|
|
1490
|
-
|
|
1490
|
+
sockJson, cwd = process.cwd()) {
|
|
1491
1491
|
const output = {
|
|
1492
1492
|
cdxgen: false,
|
|
1493
1493
|
// TODO
|
|
@@ -1496,21 +1496,21 @@ socketJson, cwd = process.cwd()) {
|
|
|
1496
1496
|
gradle: false,
|
|
1497
1497
|
sbt: false
|
|
1498
1498
|
};
|
|
1499
|
-
if (
|
|
1499
|
+
if (sockJson?.defaults?.manifest?.sbt?.disabled) {
|
|
1500
1500
|
debug.debugLog('[DEBUG] - sbt auto-detection is disabled in socket.json');
|
|
1501
1501
|
} else if (fs$1.existsSync(path.join(cwd, 'build.sbt'))) {
|
|
1502
1502
|
debug.debugLog('[DEBUG] - Detected a Scala sbt build file');
|
|
1503
1503
|
output.sbt = true;
|
|
1504
1504
|
output.count += 1;
|
|
1505
1505
|
}
|
|
1506
|
-
if (
|
|
1506
|
+
if (sockJson?.defaults?.manifest?.gradle?.disabled) {
|
|
1507
1507
|
debug.debugLog('[DEBUG] - gradle auto-detection is disabled in socket.json');
|
|
1508
1508
|
} else if (fs$1.existsSync(path.join(cwd, 'gradlew'))) {
|
|
1509
1509
|
debug.debugLog('[DEBUG] - Detected a gradle build file');
|
|
1510
1510
|
output.gradle = true;
|
|
1511
1511
|
output.count += 1;
|
|
1512
1512
|
}
|
|
1513
|
-
if (
|
|
1513
|
+
if (sockJson?.defaults?.manifest?.conda?.disabled) {
|
|
1514
1514
|
debug.debugLog('[DEBUG] - conda auto-detection is disabled in socket.json');
|
|
1515
1515
|
} else {
|
|
1516
1516
|
const envyml = path.join(cwd, 'environment.yml');
|
|
@@ -1922,41 +1922,41 @@ async function generateAutoManifest({
|
|
|
1922
1922
|
outputKind,
|
|
1923
1923
|
verbose
|
|
1924
1924
|
}) {
|
|
1925
|
-
const
|
|
1925
|
+
const sockJson = await utils.readOrDefaultSocketJson(cwd);
|
|
1926
1926
|
if (verbose) {
|
|
1927
|
-
logger.logger.info('Using this socket.json for defaults:',
|
|
1927
|
+
logger.logger.info('Using this socket.json for defaults:', sockJson);
|
|
1928
1928
|
}
|
|
1929
|
-
if (!
|
|
1929
|
+
if (!sockJson?.defaults?.manifest?.sbt?.disabled && detected.sbt) {
|
|
1930
1930
|
logger.logger.log('Detected a Scala sbt build, generating pom files with sbt...');
|
|
1931
1931
|
await convertSbtToMaven({
|
|
1932
1932
|
// Note: `sbt` is more likely to be resolved against PATH env
|
|
1933
|
-
bin:
|
|
1933
|
+
bin: sockJson.defaults?.manifest?.sbt?.bin ?? 'sbt',
|
|
1934
1934
|
cwd,
|
|
1935
|
-
out:
|
|
1936
|
-
sbtOpts:
|
|
1937
|
-
verbose: Boolean(
|
|
1935
|
+
out: sockJson.defaults?.manifest?.sbt?.outfile ?? './socket.sbt.pom.xml',
|
|
1936
|
+
sbtOpts: sockJson.defaults?.manifest?.sbt?.sbtOpts?.split(' ').map(s => s.trim()).filter(Boolean) ?? [],
|
|
1937
|
+
verbose: Boolean(sockJson.defaults?.manifest?.sbt?.verbose)
|
|
1938
1938
|
});
|
|
1939
1939
|
}
|
|
1940
|
-
if (!
|
|
1940
|
+
if (!sockJson?.defaults?.manifest?.gradle?.disabled && detected.gradle) {
|
|
1941
1941
|
logger.logger.log('Detected a gradle build (Gradle, Kotlin, Scala), running default gradle generator...');
|
|
1942
1942
|
await convertGradleToMaven({
|
|
1943
1943
|
// Note: `gradlew` is more likely to be resolved against cwd
|
|
1944
1944
|
// Note: .resolve() wont butcher an absolute path
|
|
1945
1945
|
// TODO: `gradlew` (or anything else given) may want to resolve against PATH
|
|
1946
|
-
bin:
|
|
1946
|
+
bin: sockJson.defaults?.manifest?.gradle?.bin ? path.resolve(cwd, sockJson.defaults.manifest.gradle.bin) : path.join(cwd, 'gradlew'),
|
|
1947
1947
|
cwd,
|
|
1948
|
-
verbose: Boolean(
|
|
1949
|
-
gradleOpts:
|
|
1948
|
+
verbose: Boolean(sockJson.defaults?.manifest?.gradle?.verbose),
|
|
1949
|
+
gradleOpts: sockJson.defaults?.manifest?.gradle?.gradleOpts?.split(' ').map(s => s.trim()).filter(Boolean) ?? []
|
|
1950
1950
|
});
|
|
1951
1951
|
}
|
|
1952
|
-
if (!
|
|
1952
|
+
if (!sockJson?.defaults?.manifest?.conda?.disabled && detected.conda) {
|
|
1953
1953
|
logger.logger.log('Detected an environment.yml file, running default Conda generator...');
|
|
1954
1954
|
await handleManifestConda({
|
|
1955
1955
|
cwd,
|
|
1956
|
-
filename:
|
|
1956
|
+
filename: sockJson.defaults?.manifest?.conda?.infile ?? 'environment.yml',
|
|
1957
1957
|
outputKind,
|
|
1958
|
-
out:
|
|
1959
|
-
verbose: Boolean(
|
|
1958
|
+
out: sockJson.defaults?.manifest?.conda?.outfile ?? 'requirements.txt',
|
|
1959
|
+
verbose: Boolean(sockJson.defaults?.manifest?.conda?.verbose)
|
|
1960
1960
|
});
|
|
1961
1961
|
}
|
|
1962
1962
|
}
|
|
@@ -1982,8 +1982,8 @@ async function handleCreateNewScan({
|
|
|
1982
1982
|
}) {
|
|
1983
1983
|
if (autoManifest) {
|
|
1984
1984
|
logger.logger.info('Auto generating manifest files ...');
|
|
1985
|
-
const
|
|
1986
|
-
const detected = await detectManifestActions(
|
|
1985
|
+
const sockJson = await utils.readOrDefaultSocketJson(cwd);
|
|
1986
|
+
const detected = await detectManifestActions(sockJson, cwd);
|
|
1987
1987
|
await generateAutoManifest({
|
|
1988
1988
|
detected,
|
|
1989
1989
|
cwd,
|
|
@@ -3311,13 +3311,13 @@ async function readCache(key,
|
|
|
3311
3311
|
ttlMs = 5 * 60 * 1000) {
|
|
3312
3312
|
// Lazily access constants.githubCachePath.
|
|
3313
3313
|
const cacheJsonPath = path.join(constants.githubCachePath, `${key}.json`);
|
|
3314
|
-
|
|
3315
|
-
|
|
3314
|
+
const stat = utils.safeStatsSync(cacheJsonPath);
|
|
3315
|
+
if (stat) {
|
|
3316
3316
|
const isExpired = Date.now() - stat.mtimeMs > ttlMs;
|
|
3317
3317
|
if (!isExpired) {
|
|
3318
3318
|
return await fs$2.readJson(cacheJsonPath);
|
|
3319
3319
|
}
|
|
3320
|
-
}
|
|
3320
|
+
}
|
|
3321
3321
|
return null;
|
|
3322
3322
|
}
|
|
3323
3323
|
async function writeCache(key, data) {
|
|
@@ -4943,21 +4943,21 @@ const cmdInstall = {
|
|
|
4943
4943
|
|
|
4944
4944
|
async function outputCmdJson(cwd) {
|
|
4945
4945
|
logger.logger.info('Target cwd:', constants.ENV.VITEST ? '<redacted>' : utils.tildify(cwd));
|
|
4946
|
-
const
|
|
4947
|
-
const
|
|
4948
|
-
if (!fs$1.existsSync(
|
|
4949
|
-
logger.logger.fail(`Not found: ${
|
|
4946
|
+
const sockJsonPath = path.join(cwd, 'socket.json');
|
|
4947
|
+
const tildeSockJsonPath = constants.ENV.VITEST ? '<redacted>' : utils.tildify(sockJsonPath);
|
|
4948
|
+
if (!fs$1.existsSync(sockJsonPath)) {
|
|
4949
|
+
logger.logger.fail(`Not found: ${tildeSockJsonPath}`);
|
|
4950
4950
|
process.exitCode = 1;
|
|
4951
4951
|
return;
|
|
4952
4952
|
}
|
|
4953
|
-
if (!
|
|
4954
|
-
logger.logger.fail(`This is not a regular file (maybe a directory?): ${
|
|
4953
|
+
if (!utils.safeStatsSync(sockJsonPath)?.isFile()) {
|
|
4954
|
+
logger.logger.fail(`This is not a regular file (maybe a directory?): ${tildeSockJsonPath}`);
|
|
4955
4955
|
process.exitCode = 1;
|
|
4956
4956
|
return;
|
|
4957
4957
|
}
|
|
4958
|
-
|
|
4959
|
-
logger.logger.success(`This is the contents of ${tildeSjpath}:`);
|
|
4958
|
+
logger.logger.success(`This is the contents of ${tildeSockJsonPath}:`);
|
|
4960
4959
|
logger.logger.error('');
|
|
4960
|
+
const data = utils.safeReadFileSync(sockJsonPath);
|
|
4961
4961
|
logger.logger.log(data);
|
|
4962
4962
|
}
|
|
4963
4963
|
|
|
@@ -5666,8 +5666,8 @@ async function run$B(argv, importMeta, {
|
|
|
5666
5666
|
logger.logger.log('- cwd:', cwd);
|
|
5667
5667
|
logger.logger.groupEnd();
|
|
5668
5668
|
}
|
|
5669
|
-
const
|
|
5670
|
-
const detected = await detectManifestActions(
|
|
5669
|
+
const sockJson = await utils.readOrDefaultSocketJson(cwd);
|
|
5670
|
+
const detected = await detectManifestActions(sockJson, cwd);
|
|
5671
5671
|
debug.debugLog('[DEBUG]', detected);
|
|
5672
5672
|
if (cli.flags['dryRun']) {
|
|
5673
5673
|
logger.logger.log(DRY_RUN_BAILING_NOW$A);
|
|
@@ -5774,39 +5774,39 @@ async function run$A(argv, importMeta, {
|
|
|
5774
5774
|
// Note: path.resolve vs .join:
|
|
5775
5775
|
// If given path is absolute then cwd should not affect it.
|
|
5776
5776
|
cwd = path.resolve(process.cwd(), cwd);
|
|
5777
|
-
const
|
|
5777
|
+
const sockJson = await utils.readOrDefaultSocketJson(cwd);
|
|
5778
5778
|
|
|
5779
5779
|
// Set defaults for any flag/arg that is not given. Check socket.json first.
|
|
5780
|
-
if (stdin === undefined &&
|
|
5781
|
-
stdin =
|
|
5780
|
+
if (stdin === undefined && sockJson.defaults?.manifest?.conda?.stdin !== undefined) {
|
|
5781
|
+
stdin = sockJson.defaults?.manifest?.conda?.stdin;
|
|
5782
5782
|
logger.logger.info('Using default --stdin from socket.json:', stdin);
|
|
5783
5783
|
}
|
|
5784
5784
|
if (stdin) {
|
|
5785
5785
|
filename = '-';
|
|
5786
5786
|
} else if (!filename) {
|
|
5787
|
-
if (
|
|
5788
|
-
filename =
|
|
5787
|
+
if (sockJson.defaults?.manifest?.conda?.infile) {
|
|
5788
|
+
filename = sockJson.defaults?.manifest?.conda?.infile;
|
|
5789
5789
|
logger.logger.info('Using default --file from socket.json:', filename);
|
|
5790
5790
|
} else {
|
|
5791
5791
|
filename = 'environment.yml';
|
|
5792
5792
|
}
|
|
5793
5793
|
}
|
|
5794
|
-
if (stdout === undefined &&
|
|
5795
|
-
stdout =
|
|
5794
|
+
if (stdout === undefined && sockJson.defaults?.manifest?.conda?.stdout !== undefined) {
|
|
5795
|
+
stdout = sockJson.defaults?.manifest?.conda?.stdout;
|
|
5796
5796
|
logger.logger.info('Using default --stdout from socket.json:', stdout);
|
|
5797
5797
|
}
|
|
5798
5798
|
if (stdout) {
|
|
5799
5799
|
out = '-';
|
|
5800
5800
|
} else if (!out) {
|
|
5801
|
-
if (
|
|
5802
|
-
out =
|
|
5801
|
+
if (sockJson.defaults?.manifest?.conda?.outfile) {
|
|
5802
|
+
out = sockJson.defaults?.manifest?.conda?.outfile;
|
|
5803
5803
|
logger.logger.info('Using default --out from socket.json:', out);
|
|
5804
5804
|
} else {
|
|
5805
5805
|
out = 'requirements.txt';
|
|
5806
5806
|
}
|
|
5807
5807
|
}
|
|
5808
|
-
if (verbose === undefined &&
|
|
5809
|
-
verbose =
|
|
5808
|
+
if (verbose === undefined && sockJson.defaults?.manifest?.conda?.verbose !== undefined) {
|
|
5809
|
+
verbose = sockJson.defaults?.manifest?.conda?.verbose;
|
|
5810
5810
|
logger.logger.info('Using default --verbose from socket.json:', verbose);
|
|
5811
5811
|
} else if (verbose === undefined) {
|
|
5812
5812
|
verbose = false;
|
|
@@ -5932,29 +5932,29 @@ async function run$z(argv, importMeta, {
|
|
|
5932
5932
|
// Note: path.resolve vs .join:
|
|
5933
5933
|
// If given path is absolute then cwd should not affect it.
|
|
5934
5934
|
cwd = path.resolve(process.cwd(), cwd);
|
|
5935
|
-
const
|
|
5936
|
-
debug.
|
|
5935
|
+
const sockJson = await utils.readOrDefaultSocketJson(cwd);
|
|
5936
|
+
debug.debugFn('override: socket.json gradle', sockJson?.defaults?.manifest?.gradle);
|
|
5937
5937
|
|
|
5938
5938
|
// Set defaults for any flag/arg that is not given. Check socket.json first.
|
|
5939
5939
|
if (!bin) {
|
|
5940
|
-
if (
|
|
5941
|
-
bin =
|
|
5940
|
+
if (sockJson.defaults?.manifest?.gradle?.bin) {
|
|
5941
|
+
bin = sockJson.defaults?.manifest?.gradle?.bin;
|
|
5942
5942
|
logger.logger.info('Using default --bin from socket.json:', bin);
|
|
5943
5943
|
} else {
|
|
5944
5944
|
bin = path.join(cwd, 'gradlew');
|
|
5945
5945
|
}
|
|
5946
5946
|
}
|
|
5947
5947
|
if (!gradleOpts) {
|
|
5948
|
-
if (
|
|
5949
|
-
gradleOpts =
|
|
5948
|
+
if (sockJson.defaults?.manifest?.gradle?.gradleOpts) {
|
|
5949
|
+
gradleOpts = sockJson.defaults?.manifest?.gradle?.gradleOpts;
|
|
5950
5950
|
logger.logger.info('Using default --gradleOpts from socket.json:', gradleOpts);
|
|
5951
5951
|
} else {
|
|
5952
5952
|
gradleOpts = '';
|
|
5953
5953
|
}
|
|
5954
5954
|
}
|
|
5955
5955
|
if (verbose === undefined) {
|
|
5956
|
-
if (
|
|
5957
|
-
verbose =
|
|
5956
|
+
if (sockJson.defaults?.manifest?.gradle?.verbose !== undefined) {
|
|
5957
|
+
verbose = sockJson.defaults?.manifest?.gradle?.verbose;
|
|
5958
5958
|
logger.logger.info('Using default --verbose from socket.json:', verbose);
|
|
5959
5959
|
} else {
|
|
5960
5960
|
verbose = false;
|
|
@@ -6089,29 +6089,29 @@ async function run$y(argv, importMeta, {
|
|
|
6089
6089
|
// Note: path.resolve vs .join:
|
|
6090
6090
|
// If given path is absolute then cwd should not affect it.
|
|
6091
6091
|
cwd = path.resolve(process.cwd(), cwd);
|
|
6092
|
-
const
|
|
6093
|
-
debug.
|
|
6092
|
+
const sockJson = await utils.readOrDefaultSocketJson(cwd);
|
|
6093
|
+
debug.debugFn('override: socket.json gradle', sockJson?.defaults?.manifest?.gradle);
|
|
6094
6094
|
|
|
6095
6095
|
// Set defaults for any flag/arg that is not given. Check socket.json first.
|
|
6096
6096
|
if (!bin) {
|
|
6097
|
-
if (
|
|
6098
|
-
bin =
|
|
6097
|
+
if (sockJson.defaults?.manifest?.gradle?.bin) {
|
|
6098
|
+
bin = sockJson.defaults?.manifest?.gradle?.bin;
|
|
6099
6099
|
logger.logger.info('Using default --bin from socket.json:', bin);
|
|
6100
6100
|
} else {
|
|
6101
6101
|
bin = path.join(cwd, 'gradlew');
|
|
6102
6102
|
}
|
|
6103
6103
|
}
|
|
6104
6104
|
if (!gradleOpts) {
|
|
6105
|
-
if (
|
|
6106
|
-
gradleOpts =
|
|
6105
|
+
if (sockJson.defaults?.manifest?.gradle?.gradleOpts) {
|
|
6106
|
+
gradleOpts = sockJson.defaults?.manifest?.gradle?.gradleOpts;
|
|
6107
6107
|
logger.logger.info('Using default --gradleOpts from socket.json:', gradleOpts);
|
|
6108
6108
|
} else {
|
|
6109
6109
|
gradleOpts = '';
|
|
6110
6110
|
}
|
|
6111
6111
|
}
|
|
6112
6112
|
if (verbose === undefined) {
|
|
6113
|
-
if (
|
|
6114
|
-
verbose =
|
|
6113
|
+
if (sockJson.defaults?.manifest?.gradle?.verbose !== undefined) {
|
|
6114
|
+
verbose = sockJson.defaults?.manifest?.gradle?.verbose;
|
|
6115
6115
|
logger.logger.info('Using default --verbose from socket.json:', verbose);
|
|
6116
6116
|
} else {
|
|
6117
6117
|
verbose = false;
|
|
@@ -6255,42 +6255,42 @@ async function run$x(argv, importMeta, {
|
|
|
6255
6255
|
// Note: path.resolve vs .join:
|
|
6256
6256
|
// If given path is absolute then cwd should not affect it.
|
|
6257
6257
|
cwd = path.resolve(process.cwd(), cwd);
|
|
6258
|
-
const
|
|
6259
|
-
debug.
|
|
6258
|
+
const sockJson = await utils.readOrDefaultSocketJson(cwd);
|
|
6259
|
+
debug.debugFn('override: socket.json sbt', sockJson?.defaults?.manifest?.sbt);
|
|
6260
6260
|
|
|
6261
6261
|
// Set defaults for any flag/arg that is not given. Check socket.json first.
|
|
6262
6262
|
if (!bin) {
|
|
6263
|
-
if (
|
|
6264
|
-
bin =
|
|
6263
|
+
if (sockJson.defaults?.manifest?.sbt?.bin) {
|
|
6264
|
+
bin = sockJson.defaults?.manifest?.sbt?.bin;
|
|
6265
6265
|
logger.logger.info('Using default --bin from socket.json:', bin);
|
|
6266
6266
|
} else {
|
|
6267
6267
|
bin = 'sbt';
|
|
6268
6268
|
}
|
|
6269
6269
|
}
|
|
6270
|
-
if (stdout === undefined &&
|
|
6271
|
-
stdout =
|
|
6270
|
+
if (stdout === undefined && sockJson.defaults?.manifest?.sbt?.stdout !== undefined) {
|
|
6271
|
+
stdout = sockJson.defaults?.manifest?.sbt?.stdout;
|
|
6272
6272
|
logger.logger.info('Using default --stdout from socket.json:', stdout);
|
|
6273
6273
|
}
|
|
6274
6274
|
if (stdout) {
|
|
6275
6275
|
out = '-';
|
|
6276
6276
|
} else if (!out) {
|
|
6277
|
-
if (
|
|
6278
|
-
out =
|
|
6277
|
+
if (sockJson.defaults?.manifest?.sbt?.outfile) {
|
|
6278
|
+
out = sockJson.defaults?.manifest?.sbt?.outfile;
|
|
6279
6279
|
logger.logger.info('Using default --out from socket.json:', out);
|
|
6280
6280
|
} else {
|
|
6281
6281
|
out = './socket.pom.xml';
|
|
6282
6282
|
}
|
|
6283
6283
|
}
|
|
6284
6284
|
if (!sbtOpts) {
|
|
6285
|
-
if (
|
|
6286
|
-
sbtOpts =
|
|
6285
|
+
if (sockJson.defaults?.manifest?.sbt?.sbtOpts) {
|
|
6286
|
+
sbtOpts = sockJson.defaults?.manifest?.sbt?.sbtOpts;
|
|
6287
6287
|
logger.logger.info('Using default --sbtOpts from socket.json:', sbtOpts);
|
|
6288
6288
|
} else {
|
|
6289
6289
|
sbtOpts = '';
|
|
6290
6290
|
}
|
|
6291
6291
|
}
|
|
6292
|
-
if (verbose === undefined &&
|
|
6293
|
-
verbose =
|
|
6292
|
+
if (verbose === undefined && sockJson.defaults?.manifest?.sbt?.verbose !== undefined) {
|
|
6293
|
+
verbose = sockJson.defaults?.manifest?.sbt?.verbose;
|
|
6294
6294
|
logger.logger.info('Using default --verbose from socket.json:', verbose);
|
|
6295
6295
|
} else if (verbose === undefined) {
|
|
6296
6296
|
verbose = false;
|
|
@@ -6424,41 +6424,41 @@ async function setupManifestConfig(cwd, defaultOnReadError = false) {
|
|
|
6424
6424
|
message: 'Select eco system manifest generator to configure',
|
|
6425
6425
|
choices
|
|
6426
6426
|
});
|
|
6427
|
-
const
|
|
6428
|
-
if (!
|
|
6429
|
-
return
|
|
6427
|
+
const sockJsonCResult = await utils.readSocketJson(cwd, defaultOnReadError);
|
|
6428
|
+
if (!sockJsonCResult.ok) {
|
|
6429
|
+
return sockJsonCResult;
|
|
6430
6430
|
}
|
|
6431
|
-
const
|
|
6432
|
-
if (!
|
|
6433
|
-
|
|
6431
|
+
const sockJson = sockJsonCResult.data;
|
|
6432
|
+
if (!sockJson.defaults) {
|
|
6433
|
+
sockJson.defaults = {};
|
|
6434
6434
|
}
|
|
6435
|
-
if (!
|
|
6436
|
-
|
|
6435
|
+
if (!sockJson.defaults.manifest) {
|
|
6436
|
+
sockJson.defaults.manifest = {};
|
|
6437
6437
|
}
|
|
6438
6438
|
let result;
|
|
6439
6439
|
switch (targetEco) {
|
|
6440
6440
|
case 'conda':
|
|
6441
6441
|
{
|
|
6442
|
-
if (!
|
|
6443
|
-
|
|
6442
|
+
if (!sockJson.defaults.manifest.conda) {
|
|
6443
|
+
sockJson.defaults.manifest.conda = {};
|
|
6444
6444
|
}
|
|
6445
|
-
result = await setupConda(
|
|
6445
|
+
result = await setupConda(sockJson.defaults.manifest.conda);
|
|
6446
6446
|
break;
|
|
6447
6447
|
}
|
|
6448
6448
|
case 'gradle':
|
|
6449
6449
|
{
|
|
6450
|
-
if (!
|
|
6451
|
-
|
|
6450
|
+
if (!sockJson.defaults.manifest.gradle) {
|
|
6451
|
+
sockJson.defaults.manifest.gradle = {};
|
|
6452
6452
|
}
|
|
6453
|
-
result = await setupGradle(
|
|
6453
|
+
result = await setupGradle(sockJson.defaults.manifest.gradle);
|
|
6454
6454
|
break;
|
|
6455
6455
|
}
|
|
6456
6456
|
case 'sbt':
|
|
6457
6457
|
{
|
|
6458
|
-
if (!
|
|
6459
|
-
|
|
6458
|
+
if (!sockJson.defaults.manifest.sbt) {
|
|
6459
|
+
sockJson.defaults.manifest.sbt = {};
|
|
6460
6460
|
}
|
|
6461
|
-
result = await setupSbt(
|
|
6461
|
+
result = await setupSbt(sockJson.defaults.manifest.sbt);
|
|
6462
6462
|
break;
|
|
6463
6463
|
}
|
|
6464
6464
|
default:
|
|
@@ -6484,7 +6484,7 @@ async function setupManifestConfig(cwd, defaultOnReadError = false) {
|
|
|
6484
6484
|
description: 'Do not update the config'
|
|
6485
6485
|
}]
|
|
6486
6486
|
})) {
|
|
6487
|
-
return await utils.writeSocketJson(cwd,
|
|
6487
|
+
return await utils.writeSocketJson(cwd, sockJson);
|
|
6488
6488
|
}
|
|
6489
6489
|
return canceledByUser$1();
|
|
6490
6490
|
}
|
|
@@ -8875,7 +8875,7 @@ function formatReportCard(artifact, color) {
|
|
|
8875
8875
|
};
|
|
8876
8876
|
const alertString = getAlertString(artifact.alerts, !color);
|
|
8877
8877
|
if (!artifact.ecosystem) {
|
|
8878
|
-
debug.debugFn('miss:
|
|
8878
|
+
debug.debugFn('miss: artifact ecosystem', artifact);
|
|
8879
8879
|
}
|
|
8880
8880
|
const purl = `pkg:${artifact.ecosystem}/${artifact.name}${artifact.version ? '@' + artifact.version : ''}`;
|
|
8881
8881
|
return ['Package: ' + (color ? vendor.yoctocolorsCjsExports.bold(purl) : purl), '', ...Object.entries(scoreResult).map(score => `- ${score[0]}:`.padEnd(20, ' ') + ` ${formatScore(score[1], !color, true)}`), alertString].join('\n');
|
|
@@ -10476,36 +10476,36 @@ async function run$c(argv, importMeta, {
|
|
|
10476
10476
|
// Accept zero or more paths. Default to cwd() if none given.
|
|
10477
10477
|
let targets = cli.input || [process.cwd()];
|
|
10478
10478
|
const cwd = cwdOverride && cwdOverride !== 'process.cwd()' ? path.resolve(process.cwd(), String(cwdOverride)) : process.cwd();
|
|
10479
|
-
const
|
|
10479
|
+
const sockJson = await utils.readOrDefaultSocketJson(cwd);
|
|
10480
10480
|
|
|
10481
10481
|
// Note: This needs meow booleanDefault=undefined
|
|
10482
10482
|
if (typeof autoManifest !== 'boolean') {
|
|
10483
|
-
if (
|
|
10484
|
-
autoManifest =
|
|
10483
|
+
if (sockJson.defaults?.scan?.create?.autoManifest !== undefined) {
|
|
10484
|
+
autoManifest = sockJson.defaults.scan.create.autoManifest;
|
|
10485
10485
|
logger.logger.info('Using default --autoManifest from socket.json:', autoManifest);
|
|
10486
10486
|
} else {
|
|
10487
10487
|
autoManifest = false;
|
|
10488
10488
|
}
|
|
10489
10489
|
}
|
|
10490
10490
|
if (!branchName) {
|
|
10491
|
-
if (
|
|
10492
|
-
branchName =
|
|
10491
|
+
if (sockJson.defaults?.scan?.create?.branch) {
|
|
10492
|
+
branchName = sockJson.defaults.scan.create.branch;
|
|
10493
10493
|
logger.logger.info('Using default --branch from socket.json:', branchName);
|
|
10494
10494
|
} else {
|
|
10495
10495
|
branchName = 'socket-default-branch';
|
|
10496
10496
|
}
|
|
10497
10497
|
}
|
|
10498
10498
|
if (!repoName) {
|
|
10499
|
-
if (
|
|
10500
|
-
repoName =
|
|
10499
|
+
if (sockJson.defaults?.scan?.create?.repo) {
|
|
10500
|
+
repoName = sockJson.defaults.scan.create.repo;
|
|
10501
10501
|
logger.logger.info('Using default --repo from socket.json:', repoName);
|
|
10502
10502
|
} else {
|
|
10503
10503
|
repoName = 'socket-default-repository';
|
|
10504
10504
|
}
|
|
10505
10505
|
}
|
|
10506
10506
|
if (typeof report !== 'boolean') {
|
|
10507
|
-
if (
|
|
10508
|
-
report =
|
|
10507
|
+
if (sockJson.defaults?.scan?.create?.report !== undefined) {
|
|
10508
|
+
report = sockJson.defaults.scan.create.report;
|
|
10509
10509
|
logger.logger.info('Using default --report from socket.json:', report);
|
|
10510
10510
|
} else {
|
|
10511
10511
|
report = false;
|
|
@@ -10548,7 +10548,7 @@ async function run$c(argv, importMeta, {
|
|
|
10548
10548
|
updatedInput = true;
|
|
10549
10549
|
}
|
|
10550
10550
|
}
|
|
10551
|
-
const detected = await detectManifestActions(
|
|
10551
|
+
const detected = await detectManifestActions(sockJson, cwd);
|
|
10552
10552
|
if (detected.count > 0 && !autoManifest) {
|
|
10553
10553
|
logger.logger.info(`Detected ${detected.count} manifest targets we could try to generate. Please set the --autoManifest flag if you want to include languages covered by \`socket manifest auto\` in the Scan.`);
|
|
10554
10554
|
}
|
|
@@ -11813,32 +11813,32 @@ async function run$9(argv, importMeta, {
|
|
|
11813
11813
|
// Tmp. just for TS. will drop this later.
|
|
11814
11814
|
defaultOrgSlug = '';
|
|
11815
11815
|
}
|
|
11816
|
-
const
|
|
11816
|
+
const sockJson = await utils.readOrDefaultSocketJson(cwd);
|
|
11817
11817
|
if (all === undefined) {
|
|
11818
|
-
if (
|
|
11819
|
-
all =
|
|
11818
|
+
if (sockJson.defaults?.scan?.github?.all !== undefined) {
|
|
11819
|
+
all = sockJson.defaults?.scan?.github?.all;
|
|
11820
11820
|
} else {
|
|
11821
11821
|
all = false;
|
|
11822
11822
|
}
|
|
11823
11823
|
}
|
|
11824
11824
|
if (!githubApiUrl) {
|
|
11825
|
-
if (
|
|
11826
|
-
githubApiUrl =
|
|
11825
|
+
if (sockJson.defaults?.scan?.github?.githubApiUrl !== undefined) {
|
|
11826
|
+
githubApiUrl = sockJson.defaults.scan.github.githubApiUrl;
|
|
11827
11827
|
} else {
|
|
11828
11828
|
githubApiUrl = 'https://api.github.com';
|
|
11829
11829
|
}
|
|
11830
11830
|
}
|
|
11831
11831
|
if (!orgGithub) {
|
|
11832
|
-
if (
|
|
11833
|
-
orgGithub =
|
|
11832
|
+
if (sockJson.defaults?.scan?.github?.orgGithub !== undefined) {
|
|
11833
|
+
orgGithub = sockJson.defaults.scan.github.orgGithub;
|
|
11834
11834
|
} else {
|
|
11835
11835
|
// Default to Socket org slug. Often that's fine. Vanity and all that.
|
|
11836
11836
|
orgGithub = orgSlug;
|
|
11837
11837
|
}
|
|
11838
11838
|
}
|
|
11839
11839
|
if (!all && !repos) {
|
|
11840
|
-
if (
|
|
11841
|
-
repos =
|
|
11840
|
+
if (sockJson.defaults?.scan?.github?.repos !== undefined) {
|
|
11841
|
+
repos = sockJson.defaults.scan.github.repos;
|
|
11842
11842
|
} else {
|
|
11843
11843
|
repos = '';
|
|
11844
11844
|
}
|
|
@@ -12593,16 +12593,16 @@ async function setupScanConfig(cwd, defaultOnReadError = false) {
|
|
|
12593
12593
|
logger.logger.log('');
|
|
12594
12594
|
logger.logger.log('Note: For details on a flag you can run `socket <cmd> --help`');
|
|
12595
12595
|
logger.logger.log('');
|
|
12596
|
-
const
|
|
12597
|
-
if (!
|
|
12598
|
-
return
|
|
12596
|
+
const sockJsonCResult = await utils.readSocketJson(cwd, defaultOnReadError);
|
|
12597
|
+
if (!sockJsonCResult.ok) {
|
|
12598
|
+
return sockJsonCResult;
|
|
12599
12599
|
}
|
|
12600
|
-
const
|
|
12601
|
-
if (!
|
|
12602
|
-
|
|
12600
|
+
const sockJson = sockJsonCResult.data;
|
|
12601
|
+
if (!sockJson.defaults) {
|
|
12602
|
+
sockJson.defaults = {};
|
|
12603
12603
|
}
|
|
12604
|
-
if (!
|
|
12605
|
-
|
|
12604
|
+
if (!sockJson.defaults.scan) {
|
|
12605
|
+
sockJson.defaults.scan = {};
|
|
12606
12606
|
}
|
|
12607
12607
|
const targetCommand = await prompts.select({
|
|
12608
12608
|
message: 'Which scan command do you want to configure?',
|
|
@@ -12621,10 +12621,10 @@ async function setupScanConfig(cwd, defaultOnReadError = false) {
|
|
|
12621
12621
|
switch (targetCommand) {
|
|
12622
12622
|
case 'create':
|
|
12623
12623
|
{
|
|
12624
|
-
if (!
|
|
12625
|
-
|
|
12624
|
+
if (!sockJson.defaults.scan.create) {
|
|
12625
|
+
sockJson.defaults.scan.create = {};
|
|
12626
12626
|
}
|
|
12627
|
-
const result = await configureScan(
|
|
12627
|
+
const result = await configureScan(sockJson.defaults.scan.create);
|
|
12628
12628
|
if (!result.ok || result.data.canceled) {
|
|
12629
12629
|
return result;
|
|
12630
12630
|
}
|
|
@@ -12632,10 +12632,10 @@ async function setupScanConfig(cwd, defaultOnReadError = false) {
|
|
|
12632
12632
|
}
|
|
12633
12633
|
case 'github':
|
|
12634
12634
|
{
|
|
12635
|
-
if (!
|
|
12636
|
-
|
|
12635
|
+
if (!sockJson.defaults.scan.github) {
|
|
12636
|
+
sockJson.defaults.scan.github = {};
|
|
12637
12637
|
}
|
|
12638
|
-
const result = await configureGithub(
|
|
12638
|
+
const result = await configureGithub(sockJson.defaults.scan.github);
|
|
12639
12639
|
if (!result.ok || result.data.canceled) {
|
|
12640
12640
|
return result;
|
|
12641
12641
|
}
|
|
@@ -12661,7 +12661,7 @@ async function setupScanConfig(cwd, defaultOnReadError = false) {
|
|
|
12661
12661
|
description: 'Do not update the config'
|
|
12662
12662
|
}]
|
|
12663
12663
|
})) {
|
|
12664
|
-
return await utils.writeSocketJson(cwd,
|
|
12664
|
+
return await utils.writeSocketJson(cwd, sockJson);
|
|
12665
12665
|
}
|
|
12666
12666
|
return canceledByUser();
|
|
12667
12667
|
}
|
|
@@ -13855,25 +13855,30 @@ async function installSafeNpm(query) {
|
|
|
13855
13855
|
}
|
|
13856
13856
|
}
|
|
13857
13857
|
|
|
13858
|
-
function removeSocketWrapper(
|
|
13859
|
-
|
|
13860
|
-
|
|
13861
|
-
|
|
13862
|
-
|
|
13863
|
-
|
|
13858
|
+
function removeSocketWrapper(filepath) {
|
|
13859
|
+
let content;
|
|
13860
|
+
try {
|
|
13861
|
+
content = fs$1.readFileSync(filepath, 'utf8');
|
|
13862
|
+
} catch (e) {
|
|
13863
|
+
logger.logger.fail(`There was an error removing the alias${e ? ':' : '.'}`);
|
|
13864
|
+
if (e) {
|
|
13865
|
+
logger.logger.error(e);
|
|
13864
13866
|
}
|
|
13865
|
-
|
|
13866
|
-
|
|
13867
|
-
|
|
13868
|
-
|
|
13869
|
-
|
|
13870
|
-
|
|
13871
|
-
|
|
13872
|
-
|
|
13873
|
-
logger.logger.
|
|
13874
|
-
|
|
13875
|
-
|
|
13876
|
-
}
|
|
13867
|
+
return;
|
|
13868
|
+
}
|
|
13869
|
+
const linesWithoutSocketAlias = content.split('\n').filter(l => l !== 'alias npm="socket npm"' && l !== 'alias npx="socket npx"');
|
|
13870
|
+
const updatedContent = linesWithoutSocketAlias.join('\n');
|
|
13871
|
+
try {
|
|
13872
|
+
fs$1.writeFileSync(filepath, updatedContent, 'utf8');
|
|
13873
|
+
} catch (e) {
|
|
13874
|
+
if (e) {
|
|
13875
|
+
logger.logger.error(e);
|
|
13876
|
+
}
|
|
13877
|
+
return;
|
|
13878
|
+
}
|
|
13879
|
+
logger.logger.success(`The alias was removed from ${filepath}. Running 'npm install' will now run the standard npm command in new terminals going forward.`);
|
|
13880
|
+
logger.logger.log('');
|
|
13881
|
+
logger.logger.info(`Note: We cannot deactivate the alias from current terminal sessions. You have to restart existing terminal sessions to finalize this step.`);
|
|
13877
13882
|
}
|
|
13878
13883
|
|
|
13879
13884
|
const {
|
|
@@ -14175,5 +14180,5 @@ void (async () => {
|
|
|
14175
14180
|
await utils.captureException(e);
|
|
14176
14181
|
}
|
|
14177
14182
|
})();
|
|
14178
|
-
//# debugId=
|
|
14183
|
+
//# debugId=6563e8a4-fb02-463b-9448-1c01e45e1721
|
|
14179
14184
|
//# sourceMappingURL=cli.js.map
|