Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change type from number to integer for the emulator ports. #7953

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Change type from number to integer for the emulator ports. #7953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27d60e9
Change type from number to integer for the emulator ports.
jfbenckhuijsen Nov 15, 2024
026fa9c
Merge branch 'master' into feature/firebase-schema-number-to-integer
jfbenckhuijsen Nov 22, 2024
3c45eba
Specify TJS Schema types for numbers to be integers
jfbenckhuijsen Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions schema/firebase-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"properties": {
"concurrency": {
"description": "Number of requests a function can serve at once.",
"type": "number"
"type": "integer"
},
"cors": {
"description": "If true, allows CORS on requests to this function.\nIf this is a `string` or `RegExp`, allows requests from domains that match the provided value.\nIf this is an `Array`, allows requests from domains matching at least one entry of the array.\nDefaults to true for {@link https.CallableFunction} and false otherwise.",
Expand Down Expand Up @@ -60,7 +60,7 @@
},
"maxInstances": {
"description": "Max number of instances to be running in parallel.",
"type": "number"
"type": "integer"
},
"memory": {
"description": "Amount of memory to allocate to a function.",
Expand All @@ -79,7 +79,7 @@
},
"minInstances": {
"description": "Min number of actual instances to be running at a given time.",
"type": "number"
"type": "integer"
},
"omit": {
"description": "If true, do not deploy or emulate this function.",
Expand All @@ -105,7 +105,7 @@
},
"timeoutSeconds": {
"description": "Timeout for the function in seconds, possible values are 0 to 540.\nHTTPS functions can specify a higher timeout.",
"type": "number"
"type": "integer"
},
"vpcConnector": {
"description": "Connect cloud function to specified VPC connector.",
Expand Down Expand Up @@ -364,7 +364,7 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
},
"rootDirectory": {
"type": "string"
Expand All @@ -382,7 +382,7 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
}
},
"type": "object"
Expand All @@ -394,7 +394,7 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
}
},
"type": "object"
Expand All @@ -409,13 +409,13 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
},
"postgresHost": {
"type": "string"
},
"postgresPort": {
"type": "number"
"type": "integer"
}
},
"type": "object"
Expand All @@ -427,7 +427,7 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
}
},
"type": "object"
Expand All @@ -444,10 +444,10 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
},
"websocketPort": {
"type": "number"
"type": "integer"
}
},
"type": "object"
Expand All @@ -459,7 +459,7 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
}
},
"type": "object"
Expand All @@ -471,7 +471,7 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
}
},
"type": "object"
Expand All @@ -483,7 +483,7 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
}
},
"type": "object"
Expand All @@ -495,7 +495,7 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
}
},
"type": "object"
Expand All @@ -507,7 +507,7 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
}
},
"type": "object"
Expand All @@ -522,7 +522,7 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
}
},
"type": "object"
Expand All @@ -534,7 +534,7 @@
"type": "string"
},
"port": {
"type": "number"
"type": "integer"
}
},
"type": "object"
Expand Down
19 changes: 19 additions & 0 deletions src/firebaseConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,13 @@ interface FrameworksBackendOptions extends HttpsOptions {
omit?: boolean;
cors?: string | boolean;
memory?: MemoryOption;
/** @TJS-type integer */
timeoutSeconds?: number;
/** @TJS-type integer */
minInstances?: number;
/** @TJS-type integer */
maxInstances?: number;
/** @TJS-type integer */
concurrency?: number;
vpcConnector?: string;
vpcConnectorEgressSettings?: VpcEgressSetting;
Expand Down Expand Up @@ -184,45 +188,56 @@ export type RemoteConfigConfig = {
export type EmulatorsConfig = {
auth?: {
host?: string;
/** @TJS-type integer */
port?: number;
};
database?: {
host?: string;
/** @TJS-type integer */
port?: number;
};
firestore?: {
host?: string;
/** @TJS-type integer */
port?: number;
/** @TJS-type integer */
websocketPort?: number;
};
functions?: {
host?: string;
/** @TJS-type integer */
port?: number;
};
hosting?: {
host?: string;
/** @TJS-type integer */
port?: number;
};
apphosting?: {
host?: string;
/** @TJS-type integer */
port?: number;
startCommandOverride?: string;
rootDirectory?: string;
};
pubsub?: {
host?: string;
/** @TJS-type integer */
port?: number;
};
storage?: {
host?: string;
/** @TJS-type integer */
port?: number;
};
logging?: {
host?: string;
/** @TJS-type integer */
port?: number;
};
hub?: {
host?: string;
/** @TJS-type integer */
port?: number;
};
ui?: {
Expand All @@ -233,18 +248,22 @@ export type EmulatorsConfig = {
extensions?: {};
eventarc?: {
host?: string;
/** @TJS-type integer */
port?: number;
};
singleProjectMode?: boolean;
dataconnect?: {
host?: string;
/** @TJS-type integer */
port?: number;
postgresHost?: string;
/** @TJS-type integer */
postgresPort?: number;
dataDir?: string;
};
tasks?: {
host?: string;
/** @TJS-type integer */
port?: number;
};
};
Expand Down