From 72534af311cb00c90f1f63618912cb5145c1301b Mon Sep 17 00:00:00 2001 From: Nara Kasbergen Kwon <855115+xiehan@users.noreply.github.com> Date: Thu, 21 Dec 2023 15:26:08 +0100 Subject: [PATCH] chore: run prettier (#256) --- .github/lib/collect-changes.js | 16 +++++----- .github/lib/copy-codeowners-file.js | 6 ++-- .github/lib/create-projen-files.js | 11 +++---- lib/secrets.ts | 22 ++++++------- lib/unique-id-override.ts | 2 +- main.ts | 48 ++++++++++++++--------------- 6 files changed, 52 insertions(+), 53 deletions(-) diff --git a/.github/lib/collect-changes.js b/.github/lib/collect-changes.js index 39fd036..6189a55 100644 --- a/.github/lib/collect-changes.js +++ b/.github/lib/collect-changes.js @@ -61,14 +61,14 @@ module.exports = async ({ core, exec }) => { const { before, after } = await getBeforeAndAfterFiles( exec, providerDirectory, - ".projenrc.js" + ".projenrc.js", ); const { before: beforeVersion, after: afterVersion } = await getBeforeAndAfterFiles( exec, providerDirectory, path.join("src", "version.json"), - true + true, ); const providerVersions = { before: before[Object.keys(beforeVersion)[0]], @@ -96,11 +96,11 @@ module.exports = async ({ core, exec }) => { })); const hasBreakingChanges = [...results, ...providerNameChanged].some( - (res) => res.breaking + (res) => res.breaking, ); console.log( - hasBreakingChanges ? "Found breaking changes!" : "No breaking changes." + hasBreakingChanges ? "Found breaking changes!" : "No breaking changes.", ); let prefix = `chore(deps)${hasBreakingChanges ? "!" : ""}: update `; @@ -112,7 +112,7 @@ module.exports = async ({ core, exec }) => { console.log( `${res.key}: ${res.before} => ${res.after} (${ res.breaking ? "breaking" : "non-breaking" - })` + })`, ); if (res.before === res.after) { @@ -149,13 +149,13 @@ module.exports = async ({ core, exec }) => { if (providerNameChanged.before !== providerNameChanged.after) { commitMessageParts.push( - `provider name to \`${providerNameChanged.after}\`` + `provider name to \`${providerNameChanged.after}\``, ); } if (providerVersions.before !== providerVersions.after) { commitMessageParts.push( - `provider version to \`${providerVersions.after}\`` + `provider version to \`${providerVersions.after}\``, ); } @@ -182,6 +182,6 @@ module.exports = async ({ core, exec }) => { core.setOutput( "commit_message", - `${prefix} ${commitMessageParts.join(", ")}`.trim() + `${prefix} ${commitMessageParts.join(", ")}`.trim(), ); }; diff --git a/.github/lib/copy-codeowners-file.js b/.github/lib/copy-codeowners-file.js index 033b424..7aa62c0 100644 --- a/.github/lib/copy-codeowners-file.js +++ b/.github/lib/copy-codeowners-file.js @@ -9,7 +9,7 @@ module.exports = () => { const mainFolder = path.join(process.env.GITHUB_WORKSPACE, "main"); const codeownersFile = fs.readFileSync( path.join(mainFolder, ".github", "CODEOWNERS"), - "utf-8" + "utf-8", ); fs.mkdirSync(path.join(process.env.GITHUB_WORKSPACE, "provider", ".github"), { @@ -21,8 +21,8 @@ module.exports = () => { process.env.GITHUB_WORKSPACE, "provider", ".github", - "CODEOWNERS" + "CODEOWNERS", ), - codeownersFile + codeownersFile, ); }; diff --git a/.github/lib/create-projen-files.js b/.github/lib/create-projen-files.js index f0039f0..8181c7f 100644 --- a/.github/lib/create-projen-files.js +++ b/.github/lib/create-projen-files.js @@ -9,21 +9,20 @@ module.exports = ({ providerName }) => { const mainFolder = path.join(process.env.GITHUB_WORKSPACE, "main"); const provider = require(path.join(mainFolder, "provider.json")); const providerVersion = provider[providerName]; - const providersWithCustomRunners = require(path.join( - mainFolder, - "providersWithCustomRunners.json" - )); + const providersWithCustomRunners = require( + path.join(mainFolder, "providersWithCustomRunners.json"), + ); const useCustomGithubRunner = providersWithCustomRunners.includes(providerName); const template = fs.readFileSync( path.join(mainFolder, "projenrc.template.js"), - "utf-8" + "utf-8", ); const projenrc = template .replace("__PROVIDER__", providerVersion) .replace("__CUSTOM_RUNNER__", useCustomGithubRunner); fs.writeFileSync( path.join(process.env.GITHUB_WORKSPACE, "provider", ".projenrc.js"), - projenrc + projenrc, ); }; diff --git a/lib/secrets.ts b/lib/secrets.ts index 5d46f86..1a8d507 100644 --- a/lib/secrets.ts +++ b/lib/secrets.ts @@ -36,7 +36,7 @@ export class SecretFromVariable extends Construct { public for( repository: Repository | DataGithubRepository, - ghProvider: GithubProvider + ghProvider: GithubProvider, ) { const secret = setOldId( new ActionsSecret(repository, `secret-${this.name}`, { @@ -44,7 +44,7 @@ export class SecretFromVariable extends Construct { secretName: constantCase(this.name), repository: repository.name, provider: ghProvider, - }) + }), ); this.secretNames.forEach((name) => { @@ -54,7 +54,7 @@ export class SecretFromVariable extends Construct { secretName: constantCase(name), repository: repository.name, provider: ghProvider, - }) + }), ); }); @@ -98,7 +98,7 @@ export class PublishingSecretSet extends Construct { public forAllLanguages( repository: Repository | DataGithubRepository, - ghProvider: GithubProvider + ghProvider: GithubProvider, ) { this.secrets.forEach((secret) => secret.for(repository, ghProvider)); } @@ -106,7 +106,7 @@ export class PublishingSecretSet extends Construct { private forPrefixedSecrets( repository: Repository | DataGithubRepository, ghProvider: GithubProvider, - prefix: string + prefix: string, ) { this.secrets .filter((secret) => secret.name.startsWith(prefix)) @@ -115,35 +115,35 @@ export class PublishingSecretSet extends Construct { public forGitHub( repository: Repository | DataGithubRepository, - ghProvider: GithubProvider + ghProvider: GithubProvider, ) { this.forPrefixedSecrets(repository, ghProvider, "gh-"); } public forTypescript( repository: Repository | DataGithubRepository, - ghProvider: GithubProvider + ghProvider: GithubProvider, ) { this.forPrefixedSecrets(repository, ghProvider, "npm-"); } public forPython( repository: Repository | DataGithubRepository, - ghProvider: GithubProvider + ghProvider: GithubProvider, ) { this.forPrefixedSecrets(repository, ghProvider, "twine-"); } public forCsharp( repository: Repository | DataGithubRepository, - ghProvider: GithubProvider + ghProvider: GithubProvider, ) { this.forPrefixedSecrets(repository, ghProvider, "nuget-"); } public forJava( repository: Repository | DataGithubRepository, - ghProvider: GithubProvider + ghProvider: GithubProvider, ) { this.forPrefixedSecrets(repository, ghProvider, "maven-"); } @@ -152,7 +152,7 @@ export class PublishingSecretSet extends Construct { // eslint-disable-next-line @typescript-eslint/no-unused-vars _repository: Repository | DataGithubRepository, // eslint-disable-next-line @typescript-eslint/no-unused-vars - _ghProvider: GithubProvider + _ghProvider: GithubProvider, ) { // No additional go secrets required, this method exists for consistency } diff --git a/lib/unique-id-override.ts b/lib/unique-id-override.ts index 63e8863..76e4203 100644 --- a/lib/unique-id-override.ts +++ b/lib/unique-id-override.ts @@ -43,7 +43,7 @@ export function makeUniqueId(components: string[], allowSepChars: boolean) { if (components.length === 0) { throw new Error( - "Unable to calculate a unique id for an empty set of components" + "Unable to calculate a unique id for an empty set of components", ); } diff --git a/main.ts b/main.ts index e16c21f..9c5b8fa 100644 --- a/main.ts +++ b/main.ts @@ -36,11 +36,11 @@ type StackShards = { }; const allProviders: Record = JSON.parse( - fs.readFileSync(path.join(__dirname, "provider.json"), "utf8") + fs.readFileSync(path.join(__dirname, "provider.json"), "utf8"), ); const shardedStacks: StackShards = JSON.parse( - fs.readFileSync(path.join(__dirname, "sharded-stacks.json"), "utf8") + fs.readFileSync(path.join(__dirname, "sharded-stacks.json"), "utf8"), ); interface GitUrls { @@ -60,8 +60,8 @@ function getShardedStackProviders(name: string): Record { return Object.fromEntries( Object.entries(allProviders).filter(([key]) => - stackProvidersList.includes(key) - ) + stackProvidersList.includes(key), + ), ); } @@ -100,13 +100,13 @@ class TerraformCdkProviderStack extends TerraformStack { this.createRepositoryManagerRepo( slackWebhook, githubProvider, - githubTeam + githubTeam, ); this.createProviderProjectRepo( slackWebhook, secrets.npmSecret, githubProvider, - githubTeam + githubTeam, ); } @@ -157,7 +157,7 @@ class TerraformCdkProviderStack extends TerraformStack { slackWebhook: TerraformVariable, npmSecret: SecretFromVariable, githubProvider: GithubProvider, - githubTeam: DataGithubTeam + githubTeam: DataGithubTeam, ) { const templateRepository = new GithubRepository( this, @@ -166,7 +166,7 @@ class TerraformCdkProviderStack extends TerraformStack { team: githubTeam, webhookUrl: slackWebhook.stringValue, provider: githubProvider, - } + }, ); npmSecret.for(templateRepository.resource, githubProvider); @@ -179,7 +179,7 @@ class TerraformCdkProviderStack extends TerraformStack { private createRepositoryManagerRepo( slackWebhook: TerraformVariable, githubProvider: GithubProvider, - githubTeam: DataGithubTeam + githubTeam: DataGithubTeam, ) { const selfTokens = [ new SecretFromVariable(this, "tf-cloud-token"), @@ -202,13 +202,13 @@ class TerraformCdkProviderStack extends TerraformStack { private validateProviderNames(providers: Record) { // validate that providers contain only valid names (-go suffix is forbidden) const goSuffixProviders = Object.keys(providers).filter((key) => - key.endsWith("-go") + key.endsWith("-go"), ); if (goSuffixProviders.length > 0) { Annotations.of(this).addError( `Providers contain a provider key with a suffix -go which is not allowed due to conflicts with go package repositories. Please remove the -go suffix from these provider keys ${goSuffixProviders.join( - ", " - )}` + ", ", + )}`, ); } @@ -222,13 +222,13 @@ class TerraformCdkProviderStack extends TerraformStack { const sanitizedProviderName = providerName.replace(/-/g, ""); return key !== sanitizedProviderName; - } + }, ); if (notMatchingProviders.length > 0) { Annotations.of(this).addError( `Provider name and provider key do not match for ${notMatchingProviders.join( - ", " - )}. This leads to issues when deploying go packages. Please rename the provider key to match the provider name.` + ", ", + )}. This leads to issues when deploying go packages. Please rename the provider key to match the provider name.`, ); } } @@ -242,7 +242,7 @@ class CustomConstructsStack extends TerraformStack { name: string; languages: ("typescript" | "python" | "csharp" | "java" | "go")[]; topics?: string[]; - }[] + }[], ) { super(scope, name); const githubProvider = new GithubProvider(this, "github-provider-cdktf", { @@ -275,10 +275,10 @@ class CustomConstructsStack extends TerraformStack { language === "typescript" ? "js" : language === "csharp" - ? "dotnet" - : language + ? "dotnet" + : language }`; - }) + }), ); const repo = new GithubRepositoryFromExistingRepository( @@ -291,7 +291,7 @@ class CustomConstructsStack extends TerraformStack { provider: githubProvider, protectMain: true, protectMainChecks, - } + }, ); secrets.forGitHub(repo.resource, githubProvider); @@ -337,10 +337,10 @@ const allProviderNames = Object.keys(allProviders); const shardProviderSet = new Set(allProvidersInShards); const allProviderSet = new Set(allProviderNames); const missingProvidersInShards = new Set( - [...allProviderSet].filter((provider) => !shardProviderSet.has(provider)) + [...allProviderSet].filter((provider) => !shardProviderSet.has(provider)), ); const missingProvidersInAllProviders = new Set( - [...shardProviderSet].filter((provider) => !allProviderSet.has(provider)) + [...shardProviderSet].filter((provider) => !allProviderSet.has(provider)), ); if (shardProviderSet.size < allProvidersInShards.length) { @@ -351,7 +351,7 @@ if (missingProvidersInShards.size > 0) { throw new Error( `One or more providers present in provider.json are missing in sharded-stacks.json: ${[ ...missingProvidersInShards, - ]}` + ]}`, ); } @@ -359,7 +359,7 @@ if (missingProvidersInAllProviders.size > 0) { throw new Error( `One or more providers present in sharded-stacks.json are missing in provider.json: ${[ ...missingProvidersInAllProviders, - ]}` + ]}`, ); }