Skip to content

Commit

Permalink
Address formatting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Remco Vermeulen committed Jul 31, 2024
1 parent 060c11b commit 7ff117d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
8 changes: 5 additions & 3 deletions src/config-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -881,11 +881,13 @@ function parseRegistries(
}
}

export function parseRegistriesWithoutCredentials(registriesInput?: string) : RegistryConfigNoCredentials[] | undefined {
export function parseRegistriesWithoutCredentials(
registriesInput?: string,
): RegistryConfigNoCredentials[] | undefined {
return parseRegistries(registriesInput)?.map((r) => {
const {token:_, ...registryWithoutCredentials} = r;
const { token: _, ...registryWithoutCredentials } = r;
return registryWithoutCredentials;
})
});
}

function isLocal(configPath: string): boolean {
Expand Down
19 changes: 14 additions & 5 deletions src/init-action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ interface InitWithConfigStatusReport extends InitStatusReport {
trap_cache_download_size_bytes: number;
/** Time taken to download TRAP caches, in milliseconds. */
trap_cache_download_duration_ms: number;
/** Stringified JSON array of registry configuration objects, from the 'registries' config field or workflow input. **/
/** Stringified JSON array of registry configuration objects, from the 'registries' config field
or workflow input. **/
registries: string;
/** Stringified JSON object representing a query-filters, from the 'query-filters' config field. **/
query_filters: string;
Expand Down Expand Up @@ -181,8 +182,10 @@ async function sendCompletedStatusReport(
}

let packs: Record<string, string[]> = {};
if ((config.augmentationProperties.packsInputCombines || !config.augmentationProperties.packsInput)
&& config.originalUserInput.packs
if (
(config.augmentationProperties.packsInputCombines ||
!config.augmentationProperties.packsInput) &&
config.originalUserInput.packs
) {
// If it is an array, then assume there is only a single language being analyzed.
if (Array.isArray(config.originalUserInput.packs)) {
Expand All @@ -194,7 +197,9 @@ async function sendCompletedStatusReport(

if (config.augmentationProperties.packsInput) {
packs[config.languages[0]] ??= [];
packs[config.languages[0]].push(...config.augmentationProperties.packsInput);
packs[config.languages[0]].push(
...config.augmentationProperties.packsInput,
);
}

// Append fields that are dependent on `config`
Expand All @@ -211,7 +216,11 @@ async function sendCompletedStatusReport(
),
trap_cache_download_duration_ms: Math.round(config.trapCacheDownloadTime),
query_filters: JSON.stringify(config.originalUserInput["query-filters"]),
registries: JSON.stringify(configUtils.parseRegistriesWithoutCredentials(getOptionalInput("registries"))),
registries: JSON.stringify(
configUtils.parseRegistriesWithoutCredentials(
getOptionalInput("registries"),
),
),
};
await sendStatusReport({
...initWithConfigStatusReport,
Expand Down

0 comments on commit 7ff117d

Please sign in to comment.