Skip to content

Commit f1e4315

Browse files
committed
lineup with master
1 parent 0872c0e commit f1e4315

File tree

6 files changed

+10
-12
lines changed

6 files changed

+10
-12
lines changed

CHANGELOG.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
- Fixes a bug that disallowed setting customClaims and/or sessionClaims in blocking functions (#1199).
2-
- Add v2 Schedule Triggers (#1177).
31
- Add performance monitoring triggers to v2 alerts (#1223).

spec/runtime/manifest.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { stackToWire, ManifestStack } from '../../src/runtime/manifest';
12
import { expect } from 'chai';
2-
import { ManifestStack, stackToWire } from '../../src/runtime/manifest';
33
import * as params from '../../src/v2/params';
44

55
describe('stackToWire', () => {

src/runtime/manifest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ export interface ManifestStack {
102102
* @internal
103103
*/
104104
export function stackToWire(stack: ManifestStack): Object {
105-
const wireStack = stack as any;
106-
const traverse = function traverse(obj: Object) {
105+
let wireStack = stack as any;
106+
let traverse = function traverse(obj: Object) {
107107
for (const [key, val] of Object.entries(obj)) {
108108
if (val instanceof Expression) {
109109
obj[key] = val.toCEL();

src/v2/params/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727

2828
import {
2929
BooleanParam,
30-
Expression,
3130
FloatParam,
3231
IntParam,
3332
ListParam,
3433
Param,
3534
ParamOptions,
36-
SecretParam,
3735
StringParam,
36+
SecretParam,
37+
Expression,
3838
} from './types';
3939

4040
export { ParamOptions, Expression };

src/v2/params/types.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export abstract class Expression<
4646
function quoteIfString<T extends string | number | boolean | string[]>(
4747
literal: T
4848
): T {
49-
// TODO(vsfan@): CEL's string escape semantics are slightly different than Javascript's, what do we do here?
49+
//TODO(vsfan@): CEL's string escape semantics are slightly different than Javascript's, what do we do here?
5050
return typeof literal === 'string' ? (`"${literal}"` as T) : literal;
5151
}
5252

@@ -171,14 +171,14 @@ export interface SelectOptions<T = unknown> {
171171
value: T;
172172
}
173173

174-
export interface ParamSpec<T = unknown> {
174+
export type ParamSpec<T = unknown> = {
175175
name: string;
176176
default?: T;
177177
label?: string;
178178
description?: string;
179179
type: ParamValueType;
180180
input?: ParamInput<T>;
181-
}
181+
};
182182

183183
export type ParamOptions<T = unknown> = Omit<ParamSpec<T>, 'name' | 'type'>;
184184

@@ -219,8 +219,8 @@ export abstract class Param<
219219
}
220220

221221
export class SecretParam {
222-
static type: ParamValueType = 'secret';
223222
name: string;
223+
static type: ParamValueType = 'secret';
224224

225225
constructor(name: string) {
226226
this.name = name;

src/v2/providers/tasks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ import {
3838
RetryConfig,
3939
} from '../../common/providers/tasks';
4040
import * as options from '../options';
41-
import { Expression } from '../params';
4241
import { HttpsFunction } from './https';
42+
import { Expression } from '../params';
4343

4444
export { AuthData, Request };
4545

0 commit comments

Comments
 (0)