Skip to content

Commit f57c139

Browse files
fix: [Many APIs] Add client library version to headers (#5077)
* fix: Add client library version to headers fix: Allow bundlers to bundle JSON files correctly for ESM deps: Update dependency google-gax to ^4.3.1 fix: Export types from protos in ESM PiperOrigin-RevId: 609821360 Source-Link: googleapis/googleapis@5c5ecf0 Source-Link: googleapis/googleapis-gen@b875fcd Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFpLWdlbmVyYXRpdmVsYW5ndWFnZS8uT3dsQm90LnlhbWwiLCJoIjoiYjg3NWZjZGQxNGI0ZGVmNjUyMTgyOTMwMDNkOWJlYzRiODQyZWNhNyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFuYWx5dGljcy1hZG1pbi8uT3dsQm90LnlhbWwiLCJoIjoiYjg3NWZjZGQxNGI0ZGVmNjUyMTgyOTMwMDNkOWJlYzRiODQyZWNhNyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFuYWx5dGljcy1kYXRhLy5Pd2xCb3QueWFtbCIsImgiOiJiODc1ZmNkZDE0YjRkZWY2NTIxODI5MzAwM2Q5YmVjNGI4NDJlY2E3In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1hcGlrZXlzLy5Pd2xCb3QueWFtbCIsImgiOiJiODc1ZmNkZDE0YjRkZWY2NTIxODI5MzAwM2Q5YmVjNGI4NDJlY2E3In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1jbG91ZHF1b3Rhcy8uT3dsQm90LnlhbWwiLCJoIjoiYjg3NWZjZGQxNGI0ZGVmNjUyMTgyOTMwMDNkOWJlYzRiODQyZWNhNyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1zZXJ2aWNlY29udHJvbC8uT3dsQm90LnlhbWwiLCJoIjoiYjg3NWZjZGQxNGI0ZGVmNjUyMTgyOTMwMDNkOWJlYzRiODQyZWNhNyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1zZXJ2aWNlbWFuYWdlbWVudC8uT3dsQm90LnlhbWwiLCJoIjoiYjg3NWZjZGQxNGI0ZGVmNjUyMTgyOTMwMDNkOWJlYzRiODQyZWNhNyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1zZXJ2aWNldXNhZ2UvLk93bEJvdC55YW1sIiwiaCI6ImI4NzVmY2RkMTRiNGRlZjY1MjE4MjkzMDAzZDliZWM0Yjg0MmVjYTcifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwcGVuZ2luZS8uT3dsQm90LnlhbWwiLCJoIjoiYjg3NWZjZGQxNGI0ZGVmNjUyMTgyOTMwMDNkOWJlYzRiODQyZWNhNyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwcHMtbWVldC8uT3dsQm90LnlhbWwiLCJoIjoiYjg3NWZjZGQxNGI0ZGVmNjUyMTgyOTMwMDNkOWJlYzRiODQyZWNhNyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFyZWExMjAtdGFibGVzLy5Pd2xCb3QueWFtbCIsImgiOiJiODc1ZmNkZDE0YjRkZWY2NTIxODI5MzAwM2Q5YmVjNGI4NDJlY2E3In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFjY2Vzc2FwcHJvdmFsLy5Pd2xCb3QueWFtbCIsImgiOiJiODc1ZmNkZDE0YjRkZWY2NTIxODI5MzAwM2Q5YmVjNGI4NDJlY2E3In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFkdmlzb3J5bm90aWZpY2F0aW9ucy8uT3dsQm90LnlhbWwiLCJoIjoiYjg3NWZjZGQxNGI0ZGVmNjUyMTgyOTMwMDNkOWJlYzRiODQyZWNhNyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFpcGxhdGZvcm0vLk93bEJvdC55YW1sIiwiaCI6ImI4NzVmY2RkMTRiNGRlZjY1MjE4MjkzMDAzZDliZWM0Yjg0MmVjYTcifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFsbG95ZGIvLk93bEJvdC55YW1sIiwiaCI6ImI4NzVmY2RkMTRiNGRlZjY1MjE4MjkzMDAzZDliZWM0Yjg0MmVjYTcifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaWdhdGV3YXkvLk93bEJvdC55YW1sIiwiaCI6ImI4NzVmY2RkMTRiNGRlZjY1MjE4MjkzMDAzZDliZWM0Yjg0MmVjYTcifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaWdlZWNvbm5lY3QvLk93bEJvdC55YW1sIiwiaCI6ImI4NzVmY2RkMTRiNGRlZjY1MjE4MjkzMDAzZDliZWM0Yjg0MmVjYTcifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaWdlZXJlZ2lzdHJ5Ly5Pd2xCb3QueWFtbCIsImgiOiJiODc1ZmNkZDE0YjRkZWY2NTIxODI5MzAwM2Q5YmVjNGI4NDJlY2E3In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFzc2V0Ly5Pd2xCb3QueWFtbCIsImgiOiJiODc1ZmNkZDE0YjRkZWY2NTIxODI5MzAwM2Q5YmVjNGI4NDJlY2E3In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFzc3VyZWR3b3JrbG9hZHMvLk93bEJvdC55YW1sIiwiaCI6ImI4NzVmY2RkMTRiNGRlZjY1MjE4MjkzMDAzZDliZWM0Yjg0MmVjYTcifQ== * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * change @gogle-cloud/meet to google-apps/meet --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: sofisl <[email protected]> Co-authored-by: Sofia Leon <[email protected]>
1 parent 9062cfa commit f57c139

12 files changed

Lines changed: 48 additions & 96 deletions

packages/google-apps-meet/protos/google/apps/meet/v2/service.proto

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ option ruby_package = "Google::Apps::Meet::V2";
3535
// REST API for services dealing with spaces.
3636
service SpacesService {
3737
option (google.api.default_host) = "meet.googleapis.com";
38+
option (google.api.oauth_scopes) =
39+
"https://www.googleapis.com/auth/meetings.space.created,"
40+
"https://www.googleapis.com/auth/meetings.space.readonly";
3841

3942
// Creates a space.
4043
rpc CreateSpace(CreateSpaceRequest) returns (Space) {
@@ -76,6 +79,9 @@ service SpacesService {
7679
// REST API for services dealing with conference records.
7780
service ConferenceRecordsService {
7881
option (google.api.default_host) = "meet.googleapis.com";
82+
option (google.api.oauth_scopes) =
83+
"https://www.googleapis.com/auth/meetings.space.created,"
84+
"https://www.googleapis.com/auth/meetings.space.readonly";
7985

8086
// Gets a conference record by conference ID.
8187
rpc GetConferenceRecord(GetConferenceRecordRequest)

packages/google-apps-meet/protos/protos.json

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/google-apps-meet/samples/generated/v2/conference_records_service.list_participants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function main(parent) {
5656
// const filter = 'abc123'
5757

5858
// Imports the Meet library
59-
const {ConferenceRecordsServiceClient} = require('@google-apps/meet).v2;
59+
const {ConferenceRecordsServiceClient} = require('@google-apps/meet').v2;
6060

6161
// Instantiates a client
6262
const meetClient = new ConferenceRecordsServiceClient();

packages/google-apps-meet/samples/generated/v2beta/conference_records_service.list_recordings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function main(parent) {
4646
// const pageToken = 'abc123'
4747

4848
// Imports the Meet library
49-
const {ConferenceRecordsServiceClient} = require('@google-apps/meet').v2beta;
49+
const {ConferenceRecordsServiceClient} = require('@google-apps/meet).v2beta;
5050

5151
// Instantiates a client
5252
const meetClient = new ConferenceRecordsServiceClient();

packages/google-apps-meet/src/v2/conference_records_service_client.ts

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ export class ConferenceRecordsServiceClient {
344344

345345
/**
346346
* The DNS address for this API service.
347-
* @deprecated
347+
* @deprecated Use the apiEndpoint method of the client instance.
348348
* @returns {string} The DNS address for this service.
349349
*/
350350
static get servicePath() {
@@ -361,9 +361,8 @@ export class ConferenceRecordsServiceClient {
361361
}
362362

363363
/**
364-
* The DNS address for this API service - same as servicePath,
365-
* exists for compatibility reasons.
366-
* @deprecated
364+
* The DNS address for this API service - same as servicePath.
365+
* @deprecated Use the apiEndpoint method of the client instance.
367366
* @returns {string} The DNS address for this service.
368367
*/
369368
static get apiEndpoint() {
@@ -383,14 +382,6 @@ export class ConferenceRecordsServiceClient {
383382
* The DNS address for this API service.
384383
* @returns {string} The DNS address for this service.
385384
*/
386-
get servicePath() {
387-
return this._servicePath;
388-
}
389-
390-
/**
391-
* The DNS address for this API service - same as servicePath().
392-
* @returns {string} The DNS address for this service.
393-
*/
394385
get apiEndpoint() {
395386
return this._servicePath;
396387
}
@@ -413,7 +404,10 @@ export class ConferenceRecordsServiceClient {
413404
* @returns {string[]} List of default scopes.
414405
*/
415406
static get scopes() {
416-
return [];
407+
return [
408+
'https://www.googleapis.com/auth/meetings.space.created',
409+
'https://www.googleapis.com/auth/meetings.space.readonly',
410+
];
417411
}
418412

419413
getProjectId(): Promise<string>;

packages/google-apps-meet/src/v2/spaces_service_client.ts

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ export class SpacesServiceClient {
297297

298298
/**
299299
* The DNS address for this API service.
300-
* @deprecated
300+
* @deprecated Use the apiEndpoint method of the client instance.
301301
* @returns {string} The DNS address for this service.
302302
*/
303303
static get servicePath() {
@@ -314,9 +314,8 @@ export class SpacesServiceClient {
314314
}
315315

316316
/**
317-
* The DNS address for this API service - same as servicePath,
318-
* exists for compatibility reasons.
319-
* @deprecated
317+
* The DNS address for this API service - same as servicePath.
318+
* @deprecated Use the apiEndpoint method of the client instance.
320319
* @returns {string} The DNS address for this service.
321320
*/
322321
static get apiEndpoint() {
@@ -336,14 +335,6 @@ export class SpacesServiceClient {
336335
* The DNS address for this API service.
337336
* @returns {string} The DNS address for this service.
338337
*/
339-
get servicePath() {
340-
return this._servicePath;
341-
}
342-
343-
/**
344-
* The DNS address for this API service - same as servicePath().
345-
* @returns {string} The DNS address for this service.
346-
*/
347338
get apiEndpoint() {
348339
return this._servicePath;
349340
}
@@ -366,7 +357,10 @@ export class SpacesServiceClient {
366357
* @returns {string[]} List of default scopes.
367358
*/
368359
static get scopes() {
369-
return [];
360+
return [
361+
'https://www.googleapis.com/auth/meetings.space.created',
362+
'https://www.googleapis.com/auth/meetings.space.readonly',
363+
];
370364
}
371365

372366
getProjectId(): Promise<string>;

packages/google-apps-meet/src/v2beta/conference_records_service_client.ts

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ export class ConferenceRecordsServiceClient {
345345

346346
/**
347347
* The DNS address for this API service.
348-
* @deprecated
348+
* @deprecated Use the apiEndpoint method of the client instance.
349349
* @returns {string} The DNS address for this service.
350350
*/
351351
static get servicePath() {
@@ -362,9 +362,8 @@ export class ConferenceRecordsServiceClient {
362362
}
363363

364364
/**
365-
* The DNS address for this API service - same as servicePath,
366-
* exists for compatibility reasons.
367-
* @deprecated
365+
* The DNS address for this API service - same as servicePath.
366+
* @deprecated Use the apiEndpoint method of the client instance.
368367
* @returns {string} The DNS address for this service.
369368
*/
370369
static get apiEndpoint() {
@@ -384,14 +383,6 @@ export class ConferenceRecordsServiceClient {
384383
* The DNS address for this API service.
385384
* @returns {string} The DNS address for this service.
386385
*/
387-
get servicePath() {
388-
return this._servicePath;
389-
}
390-
391-
/**
392-
* The DNS address for this API service - same as servicePath().
393-
* @returns {string} The DNS address for this service.
394-
*/
395386
get apiEndpoint() {
396387
return this._servicePath;
397388
}

packages/google-apps-meet/src/v2beta/spaces_service_client.ts

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ export class SpacesServiceClient {
297297

298298
/**
299299
* The DNS address for this API service.
300-
* @deprecated
300+
* @deprecated Use the apiEndpoint method of the client instance.
301301
* @returns {string} The DNS address for this service.
302302
*/
303303
static get servicePath() {
@@ -314,9 +314,8 @@ export class SpacesServiceClient {
314314
}
315315

316316
/**
317-
* The DNS address for this API service - same as servicePath,
318-
* exists for compatibility reasons.
319-
* @deprecated
317+
* The DNS address for this API service - same as servicePath.
318+
* @deprecated Use the apiEndpoint method of the client instance.
320319
* @returns {string} The DNS address for this service.
321320
*/
322321
static get apiEndpoint() {
@@ -336,14 +335,6 @@ export class SpacesServiceClient {
336335
* The DNS address for this API service.
337336
* @returns {string} The DNS address for this service.
338337
*/
339-
get servicePath() {
340-
return this._servicePath;
341-
}
342-
343-
/**
344-
* The DNS address for this API service - same as servicePath().
345-
* @returns {string} The DNS address for this service.
346-
*/
347338
get apiEndpoint() {
348339
return this._servicePath;
349340
}

packages/google-apps-meet/test/gapic_conference_records_service_v2.ts

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,6 @@ function stubAsyncIterationCall<ResponseType>(
129129

130130
describe('v2.ConferenceRecordsServiceClient', () => {
131131
describe('Common methods', () => {
132-
it('has servicePath', () => {
133-
const client =
134-
new conferencerecordsserviceModule.v2.ConferenceRecordsServiceClient();
135-
const servicePath = client.servicePath;
136-
assert.strictEqual(servicePath, 'meet.googleapis.com');
137-
});
138-
139132
it('has apiEndpoint', () => {
140133
const client =
141134
new conferencerecordsserviceModule.v2.ConferenceRecordsServiceClient();
@@ -174,21 +167,21 @@ describe('v2.ConferenceRecordsServiceClient', () => {
174167
stub.restore();
175168
});
176169
}
177-
it('sets servicePath according to universe domain camelCase', () => {
170+
it('sets apiEndpoint according to universe domain camelCase', () => {
178171
const client =
179172
new conferencerecordsserviceModule.v2.ConferenceRecordsServiceClient({
180173
universeDomain: 'example.com',
181174
});
182-
const servicePath = client.servicePath;
175+
const servicePath = client.apiEndpoint;
183176
assert.strictEqual(servicePath, 'meet.example.com');
184177
});
185178

186-
it('sets servicePath according to universe domain snakeCase', () => {
179+
it('sets apiEndpoint according to universe domain snakeCase', () => {
187180
const client =
188181
new conferencerecordsserviceModule.v2.ConferenceRecordsServiceClient({
189182
universe_domain: 'example.com',
190183
});
191-
const servicePath = client.servicePath;
184+
const servicePath = client.apiEndpoint;
192185
assert.strictEqual(servicePath, 'meet.example.com');
193186
});
194187
it('does not allow setting both universeDomain and universe_domain', () => {

packages/google-apps-meet/test/gapic_conference_records_service_v2beta.ts

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,6 @@ function stubAsyncIterationCall<ResponseType>(
129129

130130
describe('v2beta.ConferenceRecordsServiceClient', () => {
131131
describe('Common methods', () => {
132-
it('has servicePath', () => {
133-
const client =
134-
new conferencerecordsserviceModule.v2beta.ConferenceRecordsServiceClient();
135-
const servicePath = client.servicePath;
136-
assert.strictEqual(servicePath, 'meet.googleapis.com');
137-
});
138-
139132
it('has apiEndpoint', () => {
140133
const client =
141134
new conferencerecordsserviceModule.v2beta.ConferenceRecordsServiceClient();
@@ -174,21 +167,21 @@ describe('v2beta.ConferenceRecordsServiceClient', () => {
174167
stub.restore();
175168
});
176169
}
177-
it('sets servicePath according to universe domain camelCase', () => {
170+
it('sets apiEndpoint according to universe domain camelCase', () => {
178171
const client =
179172
new conferencerecordsserviceModule.v2beta.ConferenceRecordsServiceClient(
180173
{universeDomain: 'example.com'}
181174
);
182-
const servicePath = client.servicePath;
175+
const servicePath = client.apiEndpoint;
183176
assert.strictEqual(servicePath, 'meet.example.com');
184177
});
185178

186-
it('sets servicePath according to universe domain snakeCase', () => {
179+
it('sets apiEndpoint according to universe domain snakeCase', () => {
187180
const client =
188181
new conferencerecordsserviceModule.v2beta.ConferenceRecordsServiceClient(
189182
{universe_domain: 'example.com'}
190183
);
191-
const servicePath = client.servicePath;
184+
const servicePath = client.apiEndpoint;
192185
assert.strictEqual(servicePath, 'meet.example.com');
193186
});
194187
it('does not allow setting both universeDomain and universe_domain', () => {

0 commit comments

Comments
 (0)