@capraconsulting/cals-cli 3.5.2 → 3.7.0

package/lib/index.es.js

@@ -9,28 +9,27 @@ import https from 'https';
 import os from 'os';
 import AJV from 'ajv';
 import yaml from 'js-yaml';
-import { uniq } from 'lodash';
+import { uniq } from 'lodash-es';
 import { Octokit } from '@octokit/rest';
 import fetch from 'node-fetch';
 import pLimit from 'p-limit';
 import keytar from 'keytar';
 import * as process$1 from 'process';
 import { performance } from 'perf_hooks';
-import { SecretsManagerClient, DescribeSecretCommand, UntagResourceCommand, TagResourceCommand, GetSecretValueCommand, CreateSecretCommand, RestoreSecretCommand, PutSecretValueCommand, ReplicateSecretToRegionsCommand, RemoveRegionsFromReplicationCommand } from '@aws-sdk/client-secrets-manager';
-import { STSClient, GetCallerIdentityCommand } from '@aws-sdk/client-sts';
-import read from 'read';
 import { strict } from 'assert';
 import execa from 'execa';
+import read from 'read';
 import { Transform } from 'stream';
 
-var version = "3.5.2";
+var version = "3.7.0";
 
 class CacheProvider {
     constructor(config) {
-        this.mustValidate = false;
-        this.defaultCacheTime = 1800;
         this.config = config;
     }
+    mustValidate = false;
+    config;
+    defaultCacheTime = 1800;
     /**
      * Retrieve cache if existent, ignoring the time.
      *
@@ -84,15 +83,17 @@ function clearLine(stdout) {
 }
 class Reporter {
     constructor(opts = {}) {
-        this.stdout = process.stdout;
-        this.stderr = process.stderr;
-        this.stdin = process.stdin;
-        this.isTTY = this.stdout.isTTY;
-        this.format = chalk;
-        this.startTime = Date.now();
         this.nonInteractive = !!opts.nonInteractive;
         this.isVerbose = !!opts.verbose;
     }
+    stdout = process.stdout;
+    stderr = process.stderr;
+    stdin = process.stdin;
+    isTTY = this.stdout.isTTY;
+    nonInteractive;
+    isVerbose;
+    format = chalk;
+    startTime = Date.now();
     error(msg) {
         clearLine(this.stderr);
         this.stderr.write(`${this.format.red("error")} ${msg}\n`);
@@ -116,15 +117,13 @@ class Reporter {
 }
 
 class Config {
-    constructor() {
-        this.cwd = path.resolve(process.cwd());
-        this.configFile = path.join(os.homedir(), ".cals-config.json");
-        this.cacheDir = cachedir("cals-cli");
-        this.agent = new https.Agent({
-            keepAlive: true,
-        });
-        this.configCached = undefined;
-    }
+    cwd = path.resolve(process.cwd());
+    configFile = path.join(os.homedir(), ".cals-config.json");
+    cacheDir = cachedir("cals-cli");
+    agent = new https.Agent({
+        keepAlive: true,
+    });
+    configCached = undefined;
     get config() {
         const existingConfig = this.configCached;
         if (existingConfig !== undefined) {
@@ -468,12 +467,11 @@ function getRepoId(orgName, repoName) {
     return `${orgName}/${repoName}`;
 }
 function checkAgainstSchema(value) {
-    var _a;
     const ajv = new AJV({ allErrors: true });
     const valid = ajv.validate(schema, value);
     return valid
         ? { definition: value }
-        : { error: (_a = ajv.errorsText()) !== null && _a !== void 0 ? _a : "Unknown error" };
+        : { error: ajv.errorsText() ?? "Unknown error" };
 }
 function requireValidDefinition(definition) {
     // Verify no duplicates in users and extract known logins.
@@ -518,7 +516,8 @@ function requireValidDefinition(definition) {
                 if (!teamIdList.includes(id)) {
                     throw new Error(`Project team ${id} in project ${project.name} is not registered in team list`);
                 }
-            });
+            }) // Verify repo teams exists as teams.
+            ;
             (org.repos || []).forEach((repo) => {
                 (repo.teams || []).forEach((team) => {
                     const id = getTeamId(org.organization, team.name);
@@ -542,6 +541,7 @@ function requireValidDefinition(definition) {
     }, []);
 }
 class DefinitionFile {
+    path;
     constructor(path) {
         this.path = path;
     }
@@ -587,10 +587,8 @@ function createReporter(argv) {
 }
 
 class GitHubTokenCliProvider {
-    constructor() {
-        this.keyringService = "cals";
-        this.keyringAccount = "github-token";
-    }
+    keyringService = "cals";
+    keyringAccount = "github-token";
     async getToken() {
         if (process.env.CALS_GITHUB_TOKEN) {
             return process.env.CALS_GITHUB_TOKEN;
@@ -626,8 +624,12 @@ async function undefinedForNotFound(value) {
 }
 
 class GitHubService {
+    config;
+    octokit;
+    cache;
+    tokenProvider;
+    semaphore;
     constructor(props) {
-        this._requestCount = 0;
         this.config = props.config;
         this.octokit = props.octokit;
         this.cache = props.cache;
@@ -639,7 +641,6 @@ class GitHubService {
             /* eslint-disable @typescript-eslint/no-unsafe-member-access */
             this._requestCount++;
             if (options.method !== "GET") {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                 return this.semaphore(() => request(options));
             }
             // Try to cache ETag for GET requests to save on rate limiting.
@@ -663,7 +664,6 @@ class GitHubService {
             }
             const getResponse = async (allowRetry = true) => {
                 try {
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                     return await request(options);
                 }
                 catch (e) {
@@ -702,6 +702,7 @@ class GitHubService {
             /* eslint-enable @typescript-eslint/no-unsafe-member-access */
         });
     }
+    _requestCount = 0;
     get requestCount() {
         return this._requestCount;
     }
@@ -792,7 +793,6 @@ class GitHubService {
                 if (res.organization.repositories.nodes == null) {
                     throw new Error("Missing organization nodes");
                 }
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 repos.push(...res.organization.repositories.nodes);
                 if (!res.organization.repositories.pageInfo.hasNextPage) {
                     break;
@@ -821,15 +821,12 @@ class GitHubService {
                 login: it.login,
                 data: it,
             })),
-            ...(await this.getOrgMembersInvitedList(org)).map((it) => {
-                var _a;
-                return ({
-                    type: "invited",
-                    // TODO: Fix ?? case properly
-                    login: (_a = it.login) !== null && _a !== void 0 ? _a : "invalid",
-                    data: it,
-                });
-            }),
+            ...(await this.getOrgMembersInvitedList(org)).map((it) => ({
+                type: "invited",
+                // TODO: Fix ?? case properly
+                login: it.login ?? "invalid",
+                data: it,
+            })),
         ];
     }
     async getRepository(owner, repo) {
@@ -898,15 +895,12 @@ class GitHubService {
                 login: it.login,
                 data: it,
             })),
-            ...(await this.getTeamMemberInvitedList(org, team)).map((it) => {
-                var _a;
-                return ({
-                    type: "invited",
-                    // TODO: Fix ?? case properly
-                    login: (_a = it.login) !== null && _a !== void 0 ? _a : "invalid",
-                    data: it,
-                });
-            }),
+            ...(await this.getTeamMemberInvitedList(org, team)).map((it) => ({
+                type: "invited",
+                // TODO: Fix ?? case properly
+                login: it.login ?? "invalid",
+                data: it,
+            })),
         ];
     }
     async getSearchedPullRequestList(owner) {
@@ -1031,17 +1025,16 @@ class GitHubService {
   }
 }`;
         return this.cache.json(`vulnerability-alerts-${owner}-${repo}`, async () => {
-            var _a, _b, _c, _d, _e;
             const result = [];
             let after = null;
             while (true) {
                 const query = getQuery(after);
                 const res = await this.runGraphqlQuery(query);
-                result.push(...((_c = (_b = (_a = res.repository) === null || _a === void 0 ? void 0 : _a.vulnerabilityAlerts.edges) === null || _b === void 0 ? void 0 : _b.map((it) => it.node)) !== null && _c !== void 0 ? _c : []));
-                if (!((_d = res.repository) === null || _d === void 0 ? void 0 : _d.vulnerabilityAlerts.pageInfo.hasNextPage)) {
+                result.push(...(res.repository?.vulnerabilityAlerts.edges?.map((it) => it.node) ?? []));
+                if (!res.repository?.vulnerabilityAlerts.pageInfo.hasNextPage) {
                     break;
                 }
-                after = (_e = res.repository) === null || _e === void 0 ? void 0 : _e.vulnerabilityAlerts.pageInfo.endCursor;
+                after = res.repository?.vulnerabilityAlerts.pageInfo.endCursor;
             }
             return result;
         });
@@ -1083,27 +1076,23 @@ class GitHubService {
   }
 }`;
         const issues = await this.cache.json(`renovate-bot-issues-${owner}-${repo}`, async () => {
-            var _a, _b, _c, _d, _e;
             const result = [];
             let after = null;
             while (true) {
                 const query = getQuery(after);
                 const res = await this.runGraphqlQuery(query);
-                const nodes = (_c = (_b = (_a = res.repository) === null || _a === void 0 ? void 0 : _a.issues.edges) === null || _b === void 0 ? void 0 : _b.map((it) => it.node)) !== null && _c !== void 0 ? _c : [];
+                const nodes = res.repository?.issues.edges?.map((it) => it.node) ?? [];
                 result.push(...nodes
                     .filter((it) => it.title === "Dependency Dashboard")
-                    .map((it) => {
-                    var _a, _b, _c, _d, _e;
-                    return ({
-                        number: it.number,
-                        body: it.body,
-                        lastUpdatedByRenovate: (_e = (_d = (_c = (_b = (_a = it.userContentEdits) === null || _a === void 0 ? void 0 : _a.nodes) === null || _b === void 0 ? void 0 : _b.filter((it) => { var _a; return ((_a = it.editor) === null || _a === void 0 ? void 0 : _a.login) === "renovate"; })) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.createdAt) !== null && _e !== void 0 ? _e : null,
-                    });
-                }));
-                if (!((_d = res.repository) === null || _d === void 0 ? void 0 : _d.issues.pageInfo.hasNextPage)) {
+                    .map((it) => ({
+                    number: it.number,
+                    body: it.body,
+                    lastUpdatedByRenovate: it.userContentEdits?.nodes?.filter((it) => it.editor?.login === "renovate")?.[0]?.createdAt ?? null,
+                })));
+                if (!res.repository?.issues.pageInfo.hasNextPage) {
                     break;
                 }
-                after = (_e = res.repository) === null || _e === void 0 ? void 0 : _e.issues.pageInfo.endCursor;
+                after = res.repository?.issues.pageInfo.endCursor;
             }
             return result;
         });
@@ -1122,8 +1111,7 @@ async function createOctokit(config, tokenProvider) {
     });
 }
 async function createGitHubService(props) {
-    var _a;
-    const tokenProvider = (_a = props.tokenProvider) !== null && _a !== void 0 ? _a : new GitHubTokenCliProvider();
+    const tokenProvider = props.tokenProvider ?? new GitHubTokenCliProvider();
     return new GitHubService({
         config: props.config,
         octokit: await createOctokit(props.config, tokenProvider),
@@ -1132,7 +1120,7 @@ async function createGitHubService(props) {
     });
 }
 
-var index$4 = /*#__PURE__*/Object.freeze({
+var index$3 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   DefinitionFile: DefinitionFile,
   getGitHubOrgs: getGitHubOrgs,
@@ -1141,341 +1129,15 @@ var index$4 = /*#__PURE__*/Object.freeze({
   parseDefinition: parseDefinition
 });
 
-var index$3 = /*#__PURE__*/Object.freeze({
+var index$2 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   createGitHubService: createGitHubService,
   GitHubService: GitHubService
 });
 
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-class LoadSecrets {
-    constructor(props) {
-        this.smClientForRegions = {};
-        this.stsClient = new STSClient({
-            region: "eu-west-1",
-        });
-        this.reporter = props.reporter;
-        this.silent = props.silent;
-    }
-    getSmClient(region) {
-        if (!this.smClientForRegions[region]) {
-            this.smClientForRegions[region] = new SecretsManagerClient({
-                region,
-            });
-        }
-        return this.smClientForRegions[region];
-    }
-    async getInput(options) {
-        return new Promise((resolve, reject) => {
-            read(options, (err, answer) => {
-                if (err) {
-                    reject(err);
-                }
-                resolve(answer);
-            });
-        });
-    }
-    async getSecretDetails(client, secretId) {
-        try {
-            return await client.send(new DescribeSecretCommand({ SecretId: secretId }));
-        }
-        catch (e) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            if (e.name && e.name === "ResourceNotFoundException") {
-                return null;
-            }
-            throw e;
-        }
-    }
-    async handleStringUpdate() {
-        return await this.getInput({
-            prompt: "Enter value (Ctrl+C to abort): ",
-            silent: this.silent,
-        });
-    }
-    async handleJsonUpdate(secret) {
-        this.reporter.log("The secret is of type JSON with these expected fields:");
-        for (const field of secret.fields) {
-            const key = typeof field === "string" ? field : field.key;
-            const desc = typeof field === "string"
-                ? ""
-                : field.description
-                    ? ` (${field.description})`
-                    : "";
-            this.reporter.log(`  - ${key}${desc}`);
-        }
-        this.reporter.log("");
-        // TODO: Ability to specify full json value as one line.
-        const collectedValues = {};
-        for (const field of secret.fields) {
-            const key = typeof field === "string" ? field : field.key;
-            this.reporter.log(`Field: ${this.reporter.format.greenBright(key)}`);
-            if (typeof field !== "string" && field.example != null) {
-                this.reporter.log(`Example: ${this.reporter.format.magentaBright(field.example)}`);
-            }
-            const value = await this.getInput({
-                prompt: "Enter value (Ctrl+C to abort): ",
-                silent: this.silent,
-            });
-            collectedValues[key] = value;
-            this.reporter.log("");
-        }
-        return JSON.stringify(collectedValues, undefined, "  ");
-    }
-    getFullName(secretGroup, secret) {
-        return `${secretGroup.namePrefix}${secret.name}`;
-    }
-    async syncTags(client, secret, tags) {
-        const keysToRemove = secret
-            .Tags.filter((existingTag) => !tags.some((it) => it.Key === existingTag.Key))
-            .map((it) => it.Key);
-        if (keysToRemove.length > 0) {
-            this.reporter.log(`Removing obsolete tags: ${keysToRemove.join(", ")}`);
-            await client.send(new UntagResourceCommand({
-                SecretId: secret.ARN,
-                TagKeys: keysToRemove,
-            }));
-        }
-        const tagsToUpdate = tags.filter((expectedTag) => {
-            const existing = secret.Tags.find((it) => it.Key === expectedTag.Key);
-            return existing == null || existing.Value != expectedTag.Value;
-        });
-        if (tagsToUpdate.length > 0) {
-            this.reporter.log(`Storing tags: ${tagsToUpdate.map((it) => it.Key).join(", ")}`);
-            await client.send(new TagResourceCommand({
-                SecretId: secret.ARN,
-                Tags: tagsToUpdate,
-            }));
-        }
-    }
-    async getSecretValue(client, secretId) {
-        const result = await client.send(new GetSecretValueCommand({
-            SecretId: secretId,
-        }));
-        if (result.SecretString == null) {
-            throw new Error("Missing SecretString (is it a binary?)");
-        }
-        return result.SecretString;
-    }
-    async handleUpdate(secretGroup, secret) {
-        var _a, _b, _c, _d, _e;
-        const client = this.getSmClient(secretGroup.region);
-        const fullName = this.getFullName(secretGroup, secret);
-        const describeSecret = await this.getSecretDetails(client, fullName);
-        this.reporter.log(`Secret: ${this.reporter.format.greenBright(fullName)}`);
-        if (describeSecret == null) {
-            this.reporter.log("The secret does not already exist and will be created");
-        }
-        else {
-            this.reporter.log("Current value:");
-            this.reporter.log(this.reporter.format.yellowBright((await this.getSecretValue(client, fullName)).replace(/^/gm, "  ")));
-        }
-        this.reporter.log("");
-        let secretValue;
-        if (secret.type === "json") {
-            try {
-                secretValue = await this.handleJsonUpdate(secret);
-            }
-            catch (e) {
-                if (e instanceof Error && e.message === "canceled") {
-                    this.reporter.log("Aborted");
-                    return;
-                }
-                throw e;
-            }
-        }
-        else if (secret.type === "string") {
-            secretValue = await this.handleStringUpdate();
-        }
-        else {
-            throw new Error(`Unsupported type`);
-        }
-        this.reporter.log("Storing secret value:");
-        this.reporter.log(this.reporter.format.yellowBright(secretValue.replace(/^/gm, "  ")));
-        const tags = [
-            {
-                Key: "Source",
-                Value: "load-secrets script",
-            },
-        ];
-        let arn;
-        let version;
-        let newReplicaRegions = [];
-        let removedReplicaRegions = [];
-        if (describeSecret == null) {
-            newReplicaRegions = (_a = secret.replicaRegions) !== null && _a !== void 0 ? _a : [];
-            const createResult = await client.send(new CreateSecretCommand({
-                Name: fullName,
-                AddReplicaRegions: secret.replicaRegions
-                    ? secret.replicaRegions.map((replicaRegion) => ({
-                        Region: replicaRegion,
-                    }))
-                    : undefined,
-                Description: "Created by load-secrets",
-                SecretString: secretValue,
-                Tags: tags,
-            }));
-            if (createResult.VersionId == null) {
-                throw new Error("Expected versionId");
-            }
-            arn = createResult.ARN;
-            version = createResult.VersionId;
-        }
-        else {
-            if (describeSecret.DeletedDate != null) {
-                await client.send(new RestoreSecretCommand({
-                    SecretId: fullName,
-                }));
-            }
-            const updateResult = await client.send(new PutSecretValueCommand({
-                SecretId: fullName,
-                SecretString: secretValue,
-            }));
-            const currentReplicaRegions = (_c = (_b = describeSecret.ReplicationStatus) === null || _b === void 0 ? void 0 : _b.map((replicationStatus) => replicationStatus.Region)) !== null && _c !== void 0 ? _c : [];
-            newReplicaRegions =
-                (_e = (_d = secret.replicaRegions) === null || _d === void 0 ? void 0 : _d.filter((region) => !currentReplicaRegions.includes(region))) !== null && _e !== void 0 ? _e : [];
-            removedReplicaRegions = currentReplicaRegions
-                .filter((region) => !!region && typeof region === "string")
-                .filter((region) => !(secret.replicaRegions || []).includes(region));
-            if (newReplicaRegions.length > 0) {
-                await client.send(new ReplicateSecretToRegionsCommand({
-                    SecretId: fullName,
-                    AddReplicaRegions: newReplicaRegions.map((region) => ({
-                        Region: region,
-                    })),
-                }));
-            }
-            if (removedReplicaRegions.length > 0) {
-                await client.send(new RemoveRegionsFromReplicationCommand({
-                    SecretId: fullName,
-                    RemoveReplicaRegions: removedReplicaRegions,
-                }));
-            }
-            if (updateResult.VersionId == null) {
-                throw new Error("Expected versionId");
-            }
-            await this.syncTags(client, describeSecret, tags);
-            arn = updateResult.ARN;
-            version = updateResult.VersionId;
-        }
-        this.reporter.log("");
-        this.reporter.log("Secret stored:");
-        this.reporter.log(`ARN: ${this.reporter.format.greenBright(arn)}`);
-        this.reporter.log(`Version: ${this.reporter.format.greenBright(version)}`);
-        if (newReplicaRegions.length > 0) {
-            this.reporter.log(`Read replicas added to regions: ${newReplicaRegions
-                .map((r) => this.reporter.format.greenBright(r))
-                .join(", ")}`);
-        }
-        if (removedReplicaRegions.length > 0) {
-            this.reporter.log(`Read replicas removed from regions: ${removedReplicaRegions
-                .map((r) => this.reporter.format.redBright(r))
-                .join(", ")}`);
-        }
-    }
-    checkSecretGroup(secretGroup) {
-        if (!secretGroup.namePrefix.startsWith("/") ||
-            !secretGroup.namePrefix.endsWith("/")) {
-            throw new Error(`namePrefix should start and end with /. Current value: ${secretGroup.namePrefix}`);
-        }
-    }
-    getSecretDescription(details) {
-        var _a, _b;
-        return details == null
-            ? "not yet created"
-            : (details === null || details === void 0 ? void 0 : details.DeletedDate) != null
-                ? `scheduled for deletion ${details.DeletedDate.toISOString()}`
-                : `last changed ${(_b = (_a = details.LastChangedDate) === null || _a === void 0 ? void 0 : _a.toISOString()) !== null && _b !== void 0 ? _b : "unknown"}`;
-    }
-    /**
-     * Returns false if aborted.
-     */
-    async selectAndUpdate(secretGroups) {
-        const secrets = [];
-        this.reporter.log("Select secret to write:");
-        this.reporter.log("");
-        for (const secretGroup of secretGroups) {
-            this.reporter.log(`${secretGroup.description} (prefix: ${secretGroup.namePrefix})`);
-            for (let i = 0; i < secretGroup.secrets.length; i++) {
-                const offset = secrets.length;
-                const secret = secretGroup.secrets[i];
-                secrets.push({
-                    secret: secret,
-                    secretGroup,
-                });
-                const client = this.getSmClient(secretGroup.region);
-                const details = await this.getSecretDetails(client, this.getFullName(secretGroup, secret));
-                const desc = this.getSecretDescription(details);
-                this.reporter.log(`  (${offset}) ${secret.name} (${desc})`);
-            }
-            this.reporter.log("");
-        }
-        let index;
-        try {
-            const answer = await this.getInput({
-                prompt: "Enter index (or enter to quit): ",
-            });
-            if (answer.trim() === "") {
-                return false;
-            }
-            index = parseInt(answer);
-            if (!secrets[index]) {
-                throw new Error();
-            }
-        }
-        catch (e) {
-            this.reporter.warn("Secret not found - aborting");
-            return false;
-        }
-        this.reporter.log("");
-        await this.handleUpdate(secrets[index].secretGroup, secrets[index].secret);
-        this.reporter.log("");
-        return true;
-    }
-    async process(secretGroups) {
-        this.reporter.info("Checking account for current credentials");
-        this.reporter.info("If any error is given, make sure you have valid credentials active");
-        const currentAccount = await this.stsClient.send(new GetCallerIdentityCommand({}));
-        this.reporter.info(`Running for account ${currentAccount.Account}`);
-        this.reporter.log("");
-        const matchedSecretGroups = secretGroups.filter((it) => it.accountId === currentAccount.Account);
-        if (matchedSecretGroups.length === 0) {
-            this.reporter.error(`No secrets specified for this account - aborting`);
-            return;
-        }
-        for (const secretGroup of matchedSecretGroups) {
-            this.checkSecretGroup(secretGroup);
-        }
-        while (await this.selectAndUpdate(matchedSecretGroups)) { }
-    }
-}
-/**
- * Load secrets interactively into Secrets Manager.
- */
-function loadSecretsCli(props) {
-    const loadSecrets = new LoadSecrets({
-        reporter: createReporter({}),
-        // For now we show the secrets, so that we get positive feedback that the value
-        // is correctly entered.
-        silent: false,
-    });
-    loadSecrets.process(props.secretGroups).catch((error) => {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        console.error(error.stack || error.message || error);
-        process.exitCode = 1;
-    });
-}
-
-var index$2 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  loadSecretsCli: loadSecretsCli
-});
-
 class SnykTokenCliProvider {
-    constructor() {
-        this.keyringService = "cals";
-        this.keyringAccount = "snyk-token";
-    }
+    keyringService = "cals";
+    keyringAccount = "snyk-token";
     async getToken() {
         if (process.env.CALS_SNYK_TOKEN) {
             return process.env.CALS_SNYK_TOKEN;
@@ -1496,13 +1158,14 @@ class SnykTokenCliProvider {
 }
 
 class SnykService {
+    config;
+    tokenProvider;
     constructor(props) {
         this.config = props.config;
         this.tokenProvider = props.tokenProvider;
     }
     async getProjects(definition) {
-        var _a;
-        const snykAccountId = (_a = definition.snyk) === null || _a === void 0 ? void 0 : _a.accountId;
+        const snykAccountId = definition.snyk?.accountId;
         if (snykAccountId === undefined) {
             return [];
         }
@@ -1567,7 +1230,7 @@ class SnykService {
                         totalDependencies: project.meta.latest_dependency_total.total,
                         issueCountsBySeverity: project.meta.latest_issue_counts,
                         lastTestedDate: project.meta.latest_dependency_total.updated_at,
-                        browseUrl: `https://app.snyk.io/org/${snykOrgSlugId !== null && snykOrgSlugId !== void 0 ? snykOrgSlugId : "it"}/project/${project.id}`,
+                        browseUrl: `https://app.snyk.io/org/${snykOrgSlugId ?? "it"}/project/${project.id}`,
                     };
                 }),
             ];
@@ -1579,10 +1242,9 @@ class SnykService {
     }
 }
 function createSnykService(props) {
-    var _a;
     return new SnykService({
         config: props.config,
-        tokenProvider: (_a = props.tokenProvider) !== null && _a !== void 0 ? _a : new SnykTokenCliProvider(),
+        tokenProvider: props.tokenProvider ?? new SnykTokenCliProvider(),
     });
 }
 
@@ -1640,6 +1302,8 @@ class SonarCloudTokenCliProvider {
 }
 
 class SonarCloudService {
+    config;
+    tokenProvider;
     constructor(props) {
         this.config = props.config;
         this.tokenProvider = props.tokenProvider;
@@ -1676,10 +1340,9 @@ class SonarCloudService {
     }
 }
 function createSonarCloudService(props) {
-    var _a;
     return new SonarCloudService({
         config: props.config,
-        tokenProvider: (_a = props.tokenProvider) !== null && _a !== void 0 ? _a : new SonarCloudTokenCliProvider(),
+        tokenProvider: props.tokenProvider ?? new SonarCloudTokenCliProvider(),
     });
 }
 
@@ -1691,12 +1354,10 @@ var index = /*#__PURE__*/Object.freeze({
 });
 
 class TestExecutor {
-    constructor() {
-        this.shutdown = false;
-        this.cleanupTask = null;
-        this.usingWithCleanupTasks = false;
-        this.tasks = [];
-    }
+    shutdown = false;
+    cleanupTask = null;
+    usingWithCleanupTasks = false;
+    tasks = [];
     /**
      * Check if we are currently in shutdown state due to user
      * asking to abort (Ctrl+C).
@@ -1878,7 +1539,7 @@ async function pollForCondition({ container, attempts, waitIntervalSec, conditio
             log(`Took ${duration()} seconds for condition`);
             return;
         }
-        catch (e) {
+        catch {
             log("Still waiting...");
             await new Promise((resolve) => setTimeout(resolve, waitIntervalSec * 1000));
         }
@@ -1926,7 +1587,7 @@ async function isRunning(executor, container) {
         await execa("docker", ["inspect", container.name]);
         return true;
     }
-    catch (e) {
+    catch {
         return false;
     }
 }
@@ -1958,16 +1619,19 @@ class OutputPrefixTransform extends Transform {
     }
 }
 function pipeToConsole(result, name) {
-    var _a, _b;
-    (_a = result.stdout) === null || _a === void 0 ? void 0 : _a.pipe(new OutputPrefixTransform(`${name}: `)).pipe(process.stdout);
-    (_b = result.stderr) === null || _b === void 0 ? void 0 : _b.pipe(new OutputPrefixTransform(`${name} (stderr): `)).pipe(process.stderr);
+    result.stdout
+        ?.pipe(new OutputPrefixTransform(`${name}: `))
+        .pipe(process.stdout);
+    result.stderr
+        ?.pipe(new OutputPrefixTransform(`${name} (stderr): `))
+        .pipe(process.stderr);
 }
 function checkPidRunning(pid) {
     try {
         process.kill(pid, 0);
         return true;
     }
-    catch (e) {
+    catch {
         return false;
     }
 }
@@ -1981,7 +1645,7 @@ async function getContainerId({ executor, name, hasFailed, pid, }) {
             result = (await execa("docker", ["inspect", name, "-f", "{{.Id}}"]))
                 .stdout;
         }
-        catch (e) {
+        catch {
             result = null;
         }
         // Debugging to help us solve CALS-366.
@@ -2060,7 +1724,7 @@ async function startContainer({ executor, network, imageId, alias, env, dockerAr
     args.push(imageId);
     console.log(`Starting ${imageId}`);
     const process = execa("docker", args);
-    pipeToConsole(process, alias !== null && alias !== void 0 ? alias : containerName);
+    pipeToConsole(process, alias ?? containerName);
     let failed = false;
     process.catch(() => {
         failed = true;
@@ -2077,7 +1741,7 @@ async function startContainer({ executor, network, imageId, alias, env, dockerAr
     executor.registerCleanupTask(async () => {
         console.log(`Stopping container ${containerName}`);
         const r = execa("docker", ["stop", containerName]);
-        pipeToConsole(r, (alias !== null && alias !== void 0 ? alias : containerName) + " (stop)");
+        pipeToConsole(r, (alias ?? containerName) + " (stop)");
         try {
             await r;
         }
@@ -2098,7 +1762,7 @@ async function startContainer({ executor, network, imageId, alias, env, dockerAr
 }
 async function runNpmRunScript(name, options) {
     const result = execa("npm", ["run", name], {
-        env: options === null || options === void 0 ? void 0 : options.env,
+        env: options?.env,
     });
     pipeToConsole(result, `npm run ${name}`);
     await result;
@@ -2115,13 +1779,12 @@ async function getDockerHostAddress() {
         pipeToConsole(process, "ip route");
         const res = await process;
         try {
-            return (res.stdout
+            return res.stdout
                 .split("\n")
                 .filter((it) => it.includes("default via"))
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                .map((it) => /default via ([\d\.]+) /.exec(it)[1])[0]);
+                .map((it) => /default via ([\d\.]+) /.exec(it)[1])[0];
         }
-        catch (e) {
+        catch {
             throw new Error("Failed to extract docker host address");
         }
     }
@@ -2134,6 +1797,7 @@ async function waitForEnterToContinue(prompt = "Press enter to continue") {
             silent: true,
         }, (err) => {
             if (err) {
+                // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
                 reject(err);
             }
             resolve();
@@ -2143,5 +1807,5 @@ async function waitForEnterToContinue(prompt = "Press enter to continue") {
 
 const VERSION = version;
 
-export { CacheProvider, Config, DefinitionFile, GitHubService, Reporter, TestExecutor, VERSION, createGitHubService, createNetwork, createReporter, createTestExecutor, curl, index$4 as definition, getDockerHostAddress, index$3 as github, index$2 as loadSecrets, pollForCondition, runNpmRunScript, index$1 as snyk, index as sonarCloud, startContainer, waitForEnterToContinue, waitForHttpOk, waitForPostgresAvailable };
+export { CacheProvider, Config, DefinitionFile, GitHubService, Reporter, TestExecutor, VERSION, createGitHubService, createNetwork, createReporter, createTestExecutor, curl, index$3 as definition, getDockerHostAddress, index$2 as github, pollForCondition, runNpmRunScript, index$1 as snyk, index as sonarCloud, startContainer, waitForEnterToContinue, waitForHttpOk, waitForPostgresAvailable };
 //# sourceMappingURL=index.es.js.map