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.

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

chore!: promote OrgPolicy to v1 #7402

Merged
merged 1 commit into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .repo-metadata-full.json
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@
"OrgPolicy": {
"language": "php",
"distribution_name": "google/cloud-org-policy",
"release_level": "preview",
"release_level": "stable",
"client_documentation": "https://cloud.google.com/php/docs/reference/cloud-org-policy/latest",
"library_type": "GAPIC_AUTO",
"api_shortname": "orgpolicy"
Expand Down
5 changes: 2 additions & 3 deletions OrgPolicy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ on authenticating your client. Once authenticated, you'll be ready to start maki

### Version

This component is considered beta. As such, it should be expected to be mostly
stable and we're working towards a release candidate. We will address issues
and requests with a higher priority.
This component is considered GA (generally available). As such, it will not introduce backwards-incompatible changes in
any minor or patch releases. We will address issues and requests with the highest priority.

### Next Steps

Expand Down
53 changes: 22 additions & 31 deletions OrgPolicy/owlbot.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -32,34 +32,25 @@

php.owlbot_main(src=src, dest=dest)

# Change the wording for the deprecation warning.
# remove class_alias code
s.replace(
'src/*/*_*.php',
r'will be removed in the next major release',
'will be removed in a future release')

### [START] protoc backwards compatibility fixes

# roll back to private properties.
s.replace(
"src/**/V*/**/*.php",
r"Generated from protobuf field ([^\n]{0,})\n\s{5}\*/\n\s{4}protected \$",
r"""Generated from protobuf field \1
*/
private $""")

# Replace "Unwrapped" with "Value" for method names.
s.replace(
"src/**/V*/**/*.php",
r"public function ([s|g]\w{3,})Unwrapped",
r"public function \1Value"
)

### [END] protoc backwards compatibility fixes

# fix relative cloud.google.com links
s.replace(
"src/**/V*/**/*.php",
r"(.{0,})\]\((/.{0,})\)",
r"\1](https://cloud.google.com\2)"
)
"src/V*/**/*.php",
r"^// Adding a class alias for backwards compatibility with the previous class name.$"
+ "\n"
+ r"^class_alias\(.*\);$"
+ "\n",
'')

# format generated clients
subprocess.run([
'npm',
'exec',
'--yes',
'--package=@prettier/plugin-php@^0.16',
'--',
'prettier',
'**/Client/*',
'--write',
'--parser=php',
'--single-quote',
'--print-width=120'])
4 changes: 2 additions & 2 deletions OrgPolicy/src/V2/AlternatePolicySpec.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions OrgPolicy/src/V2/Client/OrgPolicyClient.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/*
* Copyright 2023 Google LLC
* Copyright 2024 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -117,9 +117,7 @@ final class OrgPolicyClient
private const CODEGEN_NAME = 'gapic';

/** The default scopes required by the service. */
public static $serviceScopes = [
'https://www.googleapis.com/auth/cloud-platform',
];
public static $serviceScopes = ['https://www.googleapis.com/auth/cloud-platform'];

private static function getClientDefaults()
{
Expand Down Expand Up @@ -398,8 +396,10 @@ public function __call($method, $args)
*
* @throws ApiException Thrown if the API call fails.
*/
public function createCustomConstraint(CreateCustomConstraintRequest $request, array $callOptions = []): CustomConstraint
{
public function createCustomConstraint(
CreateCustomConstraintRequest $request,
array $callOptions = []
): CustomConstraint {
return $this->startApiCall('CreateCustomConstraint', $request, $callOptions)->wait();
}

Expand Down Expand Up @@ -626,8 +626,10 @@ public function listConstraints(ListConstraintsRequest $request, array $callOpti
*
* @throws ApiException Thrown if the API call fails.
*/
public function listCustomConstraints(ListCustomConstraintsRequest $request, array $callOptions = []): PagedListResponse
{
public function listCustomConstraints(
ListCustomConstraintsRequest $request,
array $callOptions = []
): PagedListResponse {
return $this->startApiCall('ListCustomConstraints', $request, $callOptions);
}

Expand Down Expand Up @@ -684,8 +686,10 @@ public function listPolicies(ListPoliciesRequest $request, array $callOptions =
*
* @throws ApiException Thrown if the API call fails.
*/
public function updateCustomConstraint(UpdateCustomConstraintRequest $request, array $callOptions = []): CustomConstraint
{
public function updateCustomConstraint(
UpdateCustomConstraintRequest $request,
array $callOptions = []
): CustomConstraint {
return $this->startApiCall('UpdateCustomConstraint', $request, $callOptions)->wait();
}

Expand Down
10 changes: 5 additions & 5 deletions OrgPolicy/src/V2/Constraint.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions OrgPolicy/src/V2/Constraint/BooleanConstraint.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions OrgPolicy/src/V2/Constraint/ConstraintDefault.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions OrgPolicy/src/V2/Constraint/ListConstraint.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions OrgPolicy/src/V2/Constraint_BooleanConstraint.php

This file was deleted.

16 changes: 0 additions & 16 deletions OrgPolicy/src/V2/Constraint_ConstraintDefault.php

This file was deleted.

16 changes: 0 additions & 16 deletions OrgPolicy/src/V2/Constraint_ListConstraint.php

This file was deleted.

4 changes: 2 additions & 2 deletions OrgPolicy/src/V2/CreateCustomConstraintRequest.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions OrgPolicy/src/V2/CreatePolicyRequest.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions OrgPolicy/src/V2/CustomConstraint.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions OrgPolicy/src/V2/CustomConstraint/ActionType.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions OrgPolicy/src/V2/CustomConstraint/MethodType.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion OrgPolicy/src/V2/DeleteCustomConstraintRequest.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading