chore: bump lines to 100, standardize linting (#301)

Author: sethvargo

.eslintrc.js

@@ -15,13 +15,13 @@
  */
 
 module.exports = {
-    root: true,
-    parser: '@typescript-eslint/parser',
-    plugins: ['@typescript-eslint'],
-    extends: [
-      'eslint:recommended',
-      'plugin:@typescript-eslint/eslint-recommended',
-      'plugin:@typescript-eslint/recommended',
-      'plugin:prettier/recommended',
-    ],
-  };
+  root: true,
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint'],
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:prettier/recommended',
+  ],
+};

.prettierrc.js

@@ -19,7 +19,7 @@ module.exports = {
   bracketSpacing: true,
   endOfLine: 'auto',
   jsxSingleQuote: true,
-  printWidth: 80,
+  printWidth: 100,
   quoteProps: 'consistent',
   semi: true,
   singleQuote: true,

src/client.ts

@@ -20,16 +20,8 @@ import fs from 'fs';
 import * as path from 'path';
 import { tmpdir } from 'os';
 
-import {
-  CredentialBody,
-  ExternalAccountClientOptions,
-  GoogleAuth,
-} from 'google-auth-library';
-import {
-  errorMessage,
-  request,
-  removeFile,
-} from '@google-github-actions/actions-utils';
+import { CredentialBody, ExternalAccountClientOptions, GoogleAuth } from 'google-auth-library';
+import { errorMessage, request, removeFile } from '@google-github-actions/actions-utils';
 
 import { zipDir, ZipOptions } from './util';
 
@@ -321,10 +313,7 @@ export class CloudFunctionsClient {
    *
    * @param cf Cloud Function to deploy.
    */
-  async create(
-    cf: CloudFunction,
-    opts?: CreateOptions,
-  ): Promise<CloudFunctionResponse> {
+  async create(cf: CloudFunction, opts?: CreateOptions): Promise<CloudFunctionResponse> {
     const timeout = opts?.timeout || defaultTimeout;
 
     const resourceName = this.fullResourceName(cf.name);
@@ -394,10 +383,7 @@ export class CloudFunctionsClient {
    *
    * @param cf Cloud Function to patch
    */
-  async patch(
-    cf: CloudFunction,
-    opts?: PatchOptions,
-  ): Promise<CloudFunctionResponse> {
+  async patch(cf: CloudFunction, opts?: PatchOptions): Promise<CloudFunctionResponse> {
     const timeout = opts?.timeout || defaultTimeout;
 
     // fieldMasks are used if we are overwriting only specific fields of the
@@ -555,9 +541,7 @@ export class CloudFunctionsClient {
 
     const projectID = this.#projectID;
     if (!projectID) {
-      throw new Error(
-        `Failed to get project ID to build resource name. Try setting 'project_id'.`,
-      );
+      throw new Error(`Failed to get project ID to build resource name. Try setting 'project_id'.`);
     }
 
     const location = this.#location;

src/main.ts

@@ -37,12 +37,7 @@ import {
   presence,
 } from '@google-github-actions/actions-utils';
 
-import {
-  CloudFunction,
-  CloudFunctionsClient,
-  SecretEnvVar,
-  SecretVolume,
-} from './client';
+import { CloudFunction, CloudFunctionsClient, SecretEnvVar, SecretVolume } from './client';
 import { SecretName } from './secret';
 import { formatEntry } from './util';
 
@@ -61,17 +56,13 @@ async function run(): Promise<void> {
     const entryPoint = presence(getInput('entry_point'));
     const sourceDir = presence(getInput('source_dir'));
     const vpcConnector = presence(getInput('vpc_connector'));
-    const vpcConnectorEgressSettings = presence(
-      getInput('vpc_connector_egress_settings'),
-    );
+    const vpcConnectorEgressSettings = presence(getInput('vpc_connector_egress_settings'));
     const ingressSettings = presence(getInput('ingress_settings'));
     const serviceAccountEmail = presence(getInput('service_account_email'));
     const timeout = parseDuration(getInput('timeout'));
     const maxInstances = presence(getInput('max_instances'));
     const minInstances = presence(getInput('min_instances'));
-    const httpsTriggerSecurityLevel = presence(
-      getInput('https_trigger_security_level'),
-    );
+    const httpsTriggerSecurityLevel = presence(getInput('https_trigger_security_level'));
     const eventTriggerType = presence(getInput('event_trigger_type'));
     const eventTriggerResource = presence(getInput('event_trigger_resource'));
     const eventTriggerService = presence(getInput('event_trigger_service'));
@@ -80,14 +71,10 @@ async function run(): Promise<void> {
     const labels = parseKVString(getInput('labels'));
 
     const buildEnvVars = presence(getInput('build_environment_variables'));
-    const buildEnvVarsFile = presence(
-      getInput('build_environment_variables_file'),
-    );
+    const buildEnvVarsFile = presence(getInput('build_environment_variables_file'));
     const buildWorkerPool = presence(getInput('build_worker_pool'));
 
-    const secretEnvVars = parseKVString(
-      getInput('secret_environment_variables'),
-    );
+    const secretEnvVars = parseKVString(getInput('secret_environment_variables'));
     const secretVols = parseKVString(getInput('secret_volumes'));
 
     const dockerRepository = presence(getInput('docker_repository'));
@@ -123,8 +110,7 @@ async function run(): Promise<void> {
       eventTriggerType
     ) {
       throw new Error(
-        `Only one of 'https_trigger_security_level' or 'event_trigger_type' ` +
-          `may be specified.`,
+        `Only one of 'https_trigger_security_level' or 'event_trigger_type' ` + `may be specified.`,
       );
     }
     if (!sourceDir) {
@@ -147,16 +133,11 @@ async function run(): Promise<void> {
       }
     }
     if (timeout <= 0) {
-      throw new Error(
-        `The 'timeout' parameter must be > 0 seconds (got ${timeout})`,
-      );
+      throw new Error(`The 'timeout' parameter must be > 0 seconds (got ${timeout})`);
     }
 
     // Build environment variables.
-    const buildEnvironmentVariables = parseKVStringAndFile(
-      buildEnvVars,
-      buildEnvVarsFile,
-    );
+    const buildEnvironmentVariables = parseKVStringAndFile(buildEnvVars, buildEnvVarsFile);
     const environmentVariables = parseKVStringAndFile(envVars, envVarsFile);
 
     // Build secret environment variables.
@@ -241,11 +222,7 @@ async function run(): Promise<void> {
           retry: {},
         };
       }
-    } else if (
-      eventTriggerType ||
-      eventTriggerResource ||
-      eventTriggerService
-    ) {
+    } else if (eventTriggerType || eventTriggerResource || eventTriggerService) {
       throw new Error(
         `Event triggered functions must define 'event_trigger_type' and 'event_trigger_resource'`,
       );
@@ -309,9 +286,7 @@ async function run(): Promise<void> {
     setOutput('runtime', resp.runtime);
   } catch (err) {
     const msg = errorMessage(err);
-    setFailed(
-      `google-github-actions/deploy-cloud-functions failed with: ${msg}`,
-    );
+    setFailed(`google-github-actions/deploy-cloud-functions failed with: ${msg}`);
   }
 }
 

src/util.ts

@@ -73,9 +73,7 @@ export function zipDir(
     let gIgnoreF = undefined;
     if (getGcloudIgnores(dirPath).length > 0) {
       const gIgnore = ignore().add(getGcloudIgnores(dirPath));
-      gIgnoreF = function (
-        file: Archiver.EntryData,
-      ): false | Archiver.EntryData {
+      gIgnoreF = function (file: Archiver.EntryData): false | Archiver.EntryData {
         return !gIgnore.ignores(file.name) ? file : false;
       };
     }

tests/client.test.ts

@@ -54,10 +54,7 @@ describe('CloudFunctionsClient', () => {
         credentials: credentials,
       });
 
-      const outputPath = path.join(
-        os.tmpdir(),
-        crypto.randomBytes(12).toString('hex'),
-      );
+      const outputPath = path.join(os.tmpdir(), crypto.randomBytes(12).toString('hex'));
       const zipPath = await zipDir(testNodeFuncDir, outputPath);
 
       // Generate upload URL

tests/env-var-files/test.good.yaml

@@ -1,4 +1,3 @@
  KEY1: VALUE1
  KEY2: VALUE2
  JSONKEY: '{"bar":"baz"}'
- 

tsconfig.json

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- {
+{
   "compilerOptions": {
+    "alwaysStrict": true,
     "target": "es6",
     "module": "commonjs",
     "lib": [