Revert Remove __trigger #1274
Merged
Revert Remove __trigger #1274
+1,526
−345
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit resolves faulty merge-conflicted code that did not take into account the changes from #1153.
taeold
reviewed
Oct 25, 2022
spec/v2/providers/fixtures.ts
Outdated
Comment on lines
6
to
25
| export const MINIMAL_V2_ENDPOINT: ManifestEndpoint = { | ||
| availableMemoryMb: RESET_VALUE, | ||
| concurrency: RESET_VALUE, | ||
| ingressSettings: RESET_VALUE, | ||
| maxInstances: RESET_VALUE, | ||
| minInstances: RESET_VALUE, | ||
| serviceAccountEmail: RESET_VALUE, | ||
| timeoutSeconds: RESET_VALUE, | ||
| vpc: RESET_VALUE, | ||
| }; | ||
|
|
||
| export const MINIMAL_V1_ENDPOINT: ManifestEndpoint = { | ||
| availableMemoryMb: RESET_VALUE, | ||
| ingressSettings: RESET_VALUE, | ||
| maxInstances: RESET_VALUE, | ||
| minInstances: RESET_VALUE, | ||
| serviceAccountEmail: RESET_VALUE, | ||
| timeoutSeconds: RESET_VALUE, | ||
| vpc: RESET_VALUE, | ||
| }; |
There was a problem hiding this comment.
Unneeded? These are defined in https://github.com/firebase/firebase-functions/blob/master/spec/fixtures.ts#L25 instead.
There was a problem hiding this comment.
Oof, didn't see they were moved during conflict resolution.
Are you ok with:
export { MINIMAL_V1_ENDPOINT, MINIMAL_V2_ENDPOINT } from "../../fixtures";
There was a problem hiding this comment.
I'd prefer we fix import statements, but given the size of this PR that is fine w/ me.
taeold
approved these changes
Oct 27, 2022
spec/v2/providers/fixtures.ts
Outdated
Comment on lines
6
to
25
| export const MINIMAL_V2_ENDPOINT: ManifestEndpoint = { | ||
| availableMemoryMb: RESET_VALUE, | ||
| concurrency: RESET_VALUE, | ||
| ingressSettings: RESET_VALUE, | ||
| maxInstances: RESET_VALUE, | ||
| minInstances: RESET_VALUE, | ||
| serviceAccountEmail: RESET_VALUE, | ||
| timeoutSeconds: RESET_VALUE, | ||
| vpc: RESET_VALUE, | ||
| }; | ||
|
|
||
| export const MINIMAL_V1_ENDPOINT: ManifestEndpoint = { | ||
| availableMemoryMb: RESET_VALUE, | ||
| ingressSettings: RESET_VALUE, | ||
| maxInstances: RESET_VALUE, | ||
| minInstances: RESET_VALUE, | ||
| serviceAccountEmail: RESET_VALUE, | ||
| timeoutSeconds: RESET_VALUE, | ||
| vpc: RESET_VALUE, | ||
| }; |
There was a problem hiding this comment.
I'd prefer we fix import statements, but given the size of this PR that is fine w/ me.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Code sample