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: Patch for releasing Admin Directoyr V1 #2773

Merged
merged 1 commit into from
Jun 17, 2024
Merged

fix: Patch for releasing Admin Directoyr V1 #2773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions DiscoveryJson/admin_directory_v1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3967,12 +3967,12 @@
"type": "string"
},
"customer": {
"description": "The unique ID for the customer's Google Workspace account. In case of a multi-domain account, to fetch all users for a customer, use this field instead of `domain`. You can also use the `my_customer` alias to represent your account's `customerId`. The `customerId` is also returned as part of the [Users](/admin-sdk/directory/v1/reference/users) resource. You must provide either the `customer` or the `domain` parameter.",
"description": "The unique ID for the customer's Google Workspace account. In case of a multi-domain account, to fetch all groups for a customer, use this field instead of `domain`. You can also use the `my_customer` alias to represent your account's `customerId`. The `customerId` is also returned as part of the [Users](/admin-sdk/directory/v1/reference/users) resource. You must provide either the `customer` or the `domain` parameter.",
"location": "query",
"type": "string"
},
"domain": {
"description": "The domain name. Use this field to get users from only one domain. To return all domains for a customer account, use the `customer` query parameter instead. Either the `customer` or the `domain` parameter must be provided.",
"description": "The domain name. Use this field to get groups from only one domain. To return all domains for a customer account, use the `customer` query parameter instead. Either the `customer` or the `domain` parameter must be provided.",
"location": "query",
"type": "string"
},
Expand Down Expand Up @@ -4671,7 +4671,7 @@
}
}
},
"revision": "20240612",
"revision": "20240603",
"rootUrl": "https://admin.googleapis.com/",
"schemas": {
"Alias": {
Expand Down
6 changes: 3 additions & 3 deletions DiscoveryJson/admin_directory_v1.json.original
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3967,12 +3967,12 @@
"type": "string"
},
"customer": {
"description": "The unique ID for the customer's Google Workspace account. In case of a multi-domain account, to fetch all users for a customer, use this field instead of `domain`. You can also use the `my_customer` alias to represent your account's `customerId`. The `customerId` is also returned as part of the [Users](/admin-sdk/directory/v1/reference/users) resource. You must provide either the `customer` or the `domain` parameter.",
"description": "The unique ID for the customer's Google Workspace account. In case of a multi-domain account, to fetch all groups for a customer, use this field instead of `domain`. You can also use the `my_customer` alias to represent your account's `customerId`. The `customerId` is also returned as part of the [Users](/admin-sdk/directory/v1/reference/users) resource. You must provide either the `customer` or the `domain` parameter.",
"location": "query",
"type": "string"
},
"domain": {
"description": "The domain name. Use this field to get users from only one domain. To return all domains for a customer account, use the `customer` query parameter instead. Either the `customer` or the `domain` parameter must be provided.",
"description": "The domain name. Use this field to get groups from only one domain. To return all domains for a customer account, use the `customer` query parameter instead. Either the `customer` or the `domain` parameter must be provided.",
"location": "query",
"type": "string"
},
Expand Down Expand Up @@ -4671,7 +4671,7 @@
}
}
},
"revision": "20240611",
"revision": "20240603",
"rootUrl": "https://admin.googleapis.com/",
"schemas": {
"Alias": {
Expand Down
2 changes: 1 addition & 1 deletion Src/Tools/DiscoveryDocUpdater/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void MaybeAddNewOrUpdated(string targetFile)
// list of new or updated discoveries as that will mean we will generate the library twice, both from the original
// unpatched discovery and the patched discovery. We'll keep the library for whatever file we found last.
// Note the patched discovery is indeed included.
if (Path.GetExtension(targetFile) != "original")
if (Path.GetExtension(targetFile) != ".original")
{
newOrUpdated.Add(targetFile);
}
Expand Down