lineup with master

CHANGELOG.md

@@ -1,3 +1 @@
-- Fixes a bug that disallowed setting customClaims and/or sessionClaims in blocking functions (#1199).
-- Add v2 Schedule Triggers (#1177).
 - Add performance monitoring triggers to v2 alerts (#1223).

spec/runtime/manifest.spec.ts

@@ -1,5 +1,5 @@
+import { stackToWire, ManifestStack } from '../../src/runtime/manifest';
 import { expect } from 'chai';
-import { ManifestStack, stackToWire } from '../../src/runtime/manifest';
 import * as params from '../../src/v2/params';
 
 describe('stackToWire', () => {

src/runtime/manifest.ts

@@ -102,8 +102,8 @@ export interface ManifestStack {
  * @internal
  */
 export function stackToWire(stack: ManifestStack): Object {
-  const wireStack = stack as any;
-  const traverse = function traverse(obj: Object) {
+  let wireStack = stack as any;
+  let traverse = function traverse(obj: Object) {
     for (const [key, val] of Object.entries(obj)) {
       if (val instanceof Expression) {
         obj[key] = val.toCEL();

src/v2/params/index.ts

@@ -27,14 +27,14 @@
 
 import {
   BooleanParam,
-  Expression,
   FloatParam,
   IntParam,
   ListParam,
   Param,
   ParamOptions,
-  SecretParam,
   StringParam,
+  SecretParam,
+  Expression,
 } from './types';
 
 export { ParamOptions, Expression };

src/v2/params/types.ts

@@ -46,7 +46,7 @@ export abstract class Expression<
 function quoteIfString<T extends string | number | boolean | string[]>(
   literal: T
 ): T {
-  // TODO(vsfan@): CEL's string escape semantics are slightly different than Javascript's, what do we do here?
+  //TODO(vsfan@): CEL's string escape semantics are slightly different than Javascript's, what do we do here?
   return typeof literal === 'string' ? (`"${literal}"` as T) : literal;
 }
 
@@ -171,14 +171,14 @@ export interface SelectOptions<T = unknown> {
   value: T;
 }
 
-export interface ParamSpec<T = unknown> {
+export type ParamSpec<T = unknown> = {
   name: string;
   default?: T;
   label?: string;
   description?: string;
   type: ParamValueType;
   input?: ParamInput<T>;
-}
+};
 
 export type ParamOptions<T = unknown> = Omit<ParamSpec<T>, 'name' | 'type'>;
 
@@ -219,8 +219,8 @@ export abstract class Param<
 }
 
 export class SecretParam {
-  static type: ParamValueType = 'secret';
   name: string;
+  static type: ParamValueType = 'secret';
 
   constructor(name: string) {
     this.name = name;

src/v2/providers/tasks.ts

@@ -38,8 +38,8 @@ import {
   RetryConfig,
 } from '../../common/providers/tasks';
 import * as options from '../options';
-import { Expression } from '../params';
 import { HttpsFunction } from './https';
+import { Expression } from '../params';
 
 export { AuthData, Request };