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

fix: Force http in the GAX module when using the GAX fallback and connecting to the emulator #1788

Merged
merged 4 commits into from Oct 17, 2022
Merged

fix: Force http in the GAX module when using the GAX fallback and connecting to the emulator #1788

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f50b07
Force http from GAX module when using GAX fallback and connecting to …
MarkDuckworth Oct 14, 2022
bb79ac0
Found the appropriate type for settings and addressing code comments.
MarkDuckworth Oct 17, 2022
d0ecf32
ClientOptions instead of firestore.Settings
MarkDuckworth Oct 17, 2022
f1aeb9e
Comment cleanup.
MarkDuckworth Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 16 additions & 9 deletions dev/src/index.ts
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@

import * as firestore from '@google-cloud/firestore';

import type {CallOptions} from 'google-gax';
import type {CallOptions, ClientOptions} from 'google-gax';
import type * as googleGax from 'google-gax';
import type * as googleGaxFallback from 'google-gax/build/src/fallback';
import {Duplex, PassThrough, Transform} from 'stream';
Expand Down Expand Up @@ -580,14 +580,21 @@ export class Firestore implements firestore.Firestore {
const grpcModule = this._settings.grpc ?? require('google-gax').grpc;
const sslCreds = grpcModule.credentials.createInsecure();

client = new module.exports.v1(
{
sslCreds,
...this._settings,
fallback: useFallback,
},
gax
);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
MarkDuckworth marked this conversation as resolved.
Show resolved Hide resolved
const settings: ClientOptions = {
sslCreds,
...this._settings,
fallback: useFallback,
};

// If `ssl === false` and we're using the GAX fallback,
MarkDuckworth marked this conversation as resolved.
Show resolved Hide resolved
MarkDuckworth marked this conversation as resolved.
Show resolved Hide resolved
// also set the `protocol` option for GAX fallback to
// force http
if (useFallback) {
settings.protocol = 'http';
}

client = new module.exports.v1(settings, gax);
} else {
client = new module.exports.v1(
{
Expand Down