Skip to content

feat: [Many APIs] add several fields to manage state of database encryption update #5187

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

Merged
danielbankhead merged 4 commits into from
Mar 29, 2024
Merged

feat: [Many APIs] add several fields to manage state of database encryption update #5187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
512f9a4
feat: add several fields to manage state of database encryption update
gcf-owl-bot[bot] Mar 26, 2024
35d5b46
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 26, 2024
af8d718
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 27, 2024
0343a5e
Merge branch 'owl-bot-copy-abc4690badc919b4b25c' of https://github.co…
gcf-owl-bot[bot] Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
786 changes: 770 additions & 16 deletions packages/google-cloud-bigquery-reservation/protos/protos.d.ts
View file
Open in desktop

Large diffs are not rendered by default.

3,026 changes: 2,860 additions & 166 deletions packages/google-cloud-bigquery-reservation/protos/protos.js
View file
Open in desktop

Large diffs are not rendered by default.

364 changes: 348 additions & 16 deletions packages/google-cloud-bigquery-reservation/protos/protos.json
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 11 additions & 4 deletions packages/google-cloud-bigquery-reservation/src/v1/reservation_service_client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,15 @@ export class ReservationServiceClient {
'Please set either universe_domain or universeDomain, but not both.'
);
}
const universeDomainEnvVar =
typeof process === 'object' && typeof process.env === 'object'
? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']
: undefined;
this._universeDomain =
opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com';
opts?.universeDomain ??
opts?.universe_domain ??
universeDomainEnvVar ??
'googleapis.com';
this._servicePath = 'bigqueryreservation.' + this._universeDomain;
const servicePath =
opts?.servicePath || opts?.apiEndpoint || this._servicePath;
Expand Down Expand Up @@ -186,7 +193,7 @@ export class ReservationServiceClient {

// Determine the client header string.
const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`];
if (typeof process !== 'undefined' && 'versions' in process) {
if (typeof process === 'object' && 'versions' in process) {
clientHeader.push(`gl-node/${process.versions.node}`);
} else {
clientHeader.push(`gl-web/${this._gaxModule.version}`);
Expand Down Expand Up @@ -366,7 +373,7 @@ export class ReservationServiceClient {
*/
static get servicePath() {
if (
typeof process !== undefined &&
typeof process === 'object' &&
typeof process.emitWarning === 'function'
) {
process.emitWarning(
Expand All @@ -384,7 +391,7 @@ export class ReservationServiceClient {
*/
static get apiEndpoint() {
if (
typeof process !== undefined &&
typeof process === 'object' &&
typeof process.emitWarning === 'function'
) {
process.emitWarning(
Expand Down
135 changes: 86 additions & 49 deletions packages/google-cloud-bigquery-reservation/test/gapic_reservation_service_v1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ describe('v1.ReservationServiceClient', () => {
});

if (
typeof process !== 'undefined' &&
typeof process === 'object' &&
typeof process.emitWarning === 'function'
) {
it('throws DeprecationWarning if static servicePath is used', () => {
Expand Down Expand Up @@ -178,6 +178,43 @@ describe('v1.ReservationServiceClient', () => {
const servicePath = client.apiEndpoint;
assert.strictEqual(servicePath, 'bigqueryreservation.example.com');
});

if (typeof process === 'object' && 'env' in process) {
describe('GOOGLE_CLOUD_UNIVERSE_DOMAIN environment variable', () => {
it('sets apiEndpoint from environment variable', () => {
const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com';
const client =
new reservationserviceModule.v1.ReservationServiceClient();
const servicePath = client.apiEndpoint;
assert.strictEqual(servicePath, 'bigqueryreservation.example.com');
if (saved) {
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved;
} else {
delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
}
});

it('value configured in code has priority over environment variable', () => {
const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com';
const client =
new reservationserviceModule.v1.ReservationServiceClient({
universeDomain: 'configured.example.com',
});
const servicePath = client.apiEndpoint;
assert.strictEqual(
servicePath,
'bigqueryreservation.configured.example.com'
);
if (saved) {
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved;
} else {
delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
}
});
});
}
it('does not allow setting both universeDomain and universe_domain', () => {
assert.throws(() => {
new reservationserviceModule.v1.ReservationServiceClient({
Expand Down Expand Up @@ -2597,9 +2634,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.listReservations.createStream as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});

Expand Down Expand Up @@ -2649,9 +2686,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.listReservations.createStream as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});

Expand Down Expand Up @@ -2699,9 +2736,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.listReservations.asyncIterate as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});

Expand Down Expand Up @@ -2740,9 +2777,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.listReservations.asyncIterate as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});
});
Expand Down Expand Up @@ -3291,9 +3328,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.listAssignments.createStream as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});

Expand Down Expand Up @@ -3343,9 +3380,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.listAssignments.createStream as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});

Expand Down Expand Up @@ -3393,9 +3430,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.listAssignments.asyncIterate as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});

Expand Down Expand Up @@ -3434,9 +3471,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.listAssignments.asyncIterate as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});
});
Expand Down Expand Up @@ -3634,9 +3671,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.searchAssignments.createStream as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});

Expand Down Expand Up @@ -3688,9 +3725,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.searchAssignments.createStream as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});

Expand Down Expand Up @@ -3740,9 +3777,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.searchAssignments.asyncIterate as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});

Expand Down Expand Up @@ -3783,9 +3820,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.searchAssignments.asyncIterate as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});
});
Expand Down Expand Up @@ -3976,9 +4013,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.searchAllAssignments.createStream as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});

Expand Down Expand Up @@ -4028,9 +4065,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.searchAllAssignments.createStream as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});

Expand Down Expand Up @@ -4078,9 +4115,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.searchAllAssignments.asyncIterate as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});

Expand Down Expand Up @@ -4119,9 +4156,9 @@ describe('v1.ReservationServiceClient', () => {
assert(
(client.descriptors.page.searchAllAssignments.asyncIterate as SinonStub)
.getCall(0)
.args[2].otherArgs.headers['x-goog-request-params'].includes(
expectedHeaderRequestParams
)
.args[2].otherArgs.headers[
'x-goog-request-params'
].includes(expectedHeaderRequestParams)
);
});
});
Expand Down
Loading