diff --git a/OrgPolicy/metadata/V2/Orgpolicy.php b/OrgPolicy/metadata/V2/Orgpolicy.php
index e6950cd1856..b780dccee0f 100644
Binary files a/OrgPolicy/metadata/V2/Orgpolicy.php and b/OrgPolicy/metadata/V2/Orgpolicy.php differ
diff --git a/OrgPolicy/src/V2/Constraint.php b/OrgPolicy/src/V2/Constraint.php
index 0bcb2544796..00de094c292 100644
--- a/OrgPolicy/src/V2/Constraint.php
+++ b/OrgPolicy/src/V2/Constraint.php
@@ -13,11 +13,11 @@
* example, you could enforce a constraint that controls which cloud services
* can be activated across an organization, or whether a Compute Engine instance
* can have serial port connections established. `Constraints` can be configured
- * by the organization's policy adminstrator to fit the needs of the organzation
- * by setting a `policy` that includes `constraints` at different locations in
- * the organization's resource hierarchy. Policies are inherited down the
- * resource hierarchy from higher levels, but can also be overridden. For
- * details about the inheritance rules please read about
+ * by the organization's policy administrator to fit the needs of the
+ * organization by setting a `policy` that includes `constraints` at different
+ * locations in the organization's resource hierarchy. Policies are inherited
+ * down the resource hierarchy from higher levels, but can also be overridden.
+ * For details about the inheritance rules please read about
* [`policies`][google.cloud.OrgPolicy.v2.Policy].
* `Constraints` have a default behavior determined by the `constraint_default`
* field, which is the enforcement behavior that is used in the absence of a
diff --git a/OrgPolicy/src/V2/Policy.php b/OrgPolicy/src/V2/Policy.php
index 849112ddbae..3920c510323 100644
--- a/OrgPolicy/src/V2/Policy.php
+++ b/OrgPolicy/src/V2/Policy.php
@@ -38,14 +38,12 @@ class Policy extends \Google\Protobuf\Internal\Message
*/
private $spec = null;
/**
- * An alternate policy configuration that will be used instead of the baseline
- * policy configurations as determined by the launch.
- * Currently the only way the launch can trigger the alternate configuration
- * is via dry-run/darklaunch.
+ * Deprecated.
*
- * Generated from protobuf field .google.cloud.orgpolicy.v2.AlternatePolicySpec alternate = 3;
+ * Generated from protobuf field .google.cloud.orgpolicy.v2.AlternatePolicySpec alternate = 3 [deprecated = true];
+ * @deprecated
*/
- private $alternate = null;
+ protected $alternate = null;
/**
* Constructor.
@@ -67,10 +65,7 @@ class Policy extends \Google\Protobuf\Internal\Message
* @type \Google\Cloud\OrgPolicy\V2\PolicySpec $spec
* Basic information about the Organization Policy.
* @type \Google\Cloud\OrgPolicy\V2\AlternatePolicySpec $alternate
- * An alternate policy configuration that will be used instead of the baseline
- * policy configurations as determined by the launch.
- * Currently the only way the launch can trigger the alternate configuration
- * is via dry-run/darklaunch.
+ * Deprecated.
* }
*/
public function __construct($data = NULL) {
@@ -159,41 +154,41 @@ public function setSpec($var)
}
/**
- * An alternate policy configuration that will be used instead of the baseline
- * policy configurations as determined by the launch.
- * Currently the only way the launch can trigger the alternate configuration
- * is via dry-run/darklaunch.
+ * Deprecated.
*
- * Generated from protobuf field .google.cloud.orgpolicy.v2.AlternatePolicySpec alternate = 3;
+ * Generated from protobuf field .google.cloud.orgpolicy.v2.AlternatePolicySpec alternate = 3 [deprecated = true];
* @return \Google\Cloud\OrgPolicy\V2\AlternatePolicySpec|null
+ * @deprecated
*/
public function getAlternate()
{
+ @trigger_error('alternate is deprecated.', E_USER_DEPRECATED);
return $this->alternate;
}
public function hasAlternate()
{
+ @trigger_error('alternate is deprecated.', E_USER_DEPRECATED);
return isset($this->alternate);
}
public function clearAlternate()
{
+ @trigger_error('alternate is deprecated.', E_USER_DEPRECATED);
unset($this->alternate);
}
/**
- * An alternate policy configuration that will be used instead of the baseline
- * policy configurations as determined by the launch.
- * Currently the only way the launch can trigger the alternate configuration
- * is via dry-run/darklaunch.
+ * Deprecated.
*
- * Generated from protobuf field .google.cloud.orgpolicy.v2.AlternatePolicySpec alternate = 3;
+ * Generated from protobuf field .google.cloud.orgpolicy.v2.AlternatePolicySpec alternate = 3 [deprecated = true];
* @param \Google\Cloud\OrgPolicy\V2\AlternatePolicySpec $var
* @return $this
+ * @deprecated
*/
public function setAlternate($var)
{
+ @trigger_error('alternate is deprecated.', E_USER_DEPRECATED);
GPBUtil::checkMessage($var, \Google\Cloud\OrgPolicy\V2\AlternatePolicySpec::class);
$this->alternate = $var;
diff --git a/OrgPolicy/src/V2/PolicySpec/PolicyRule.php b/OrgPolicy/src/V2/PolicySpec/PolicyRule.php
index 1d2a3f37bf6..5f1611e7278 100644
--- a/OrgPolicy/src/V2/PolicySpec/PolicyRule.php
+++ b/OrgPolicy/src/V2/PolicySpec/PolicyRule.php
@@ -20,11 +20,14 @@ class PolicyRule extends \Google\Protobuf\Internal\Message
* in the evaluation of the policy. When set, the `expression` field in
* the `Expr' must include from 1 to 10 subexpressions, joined by the "||"
* or "&&" operators. Each subexpression must be of the form
- * "resource.matchLabels(key_name, value_name)",
- * where key_name and value_name are the resource names for Label Keys
- * and Values. These names are available from the Label Manager Service. An
- * example expression is:
- * "resource.matchLabels('labelKeys/123, 'labelValues/456')".
+ * "resource.matchTag('/tag_key_short_name,
+ * 'tag_value_short_name')". or "resource.matchTagId('tagKeys/key_id',
+ * 'tagValues/value_id')". where key_name and value_name are the resource
+ * names for Label Keys and Values. These names are available from the Tag
+ * Manager Service. An example expression is:
+ * "resource.matchTag('123456789/environment,
+ * 'prod')". or "resource.matchTagId('tagKeys/123',
+ * 'tagValues/456')".
*
* Generated from protobuf field .google.type.Expr condition = 5;
*/
@@ -55,11 +58,14 @@ class PolicyRule extends \Google\Protobuf\Internal\Message
* in the evaluation of the policy. When set, the `expression` field in
* the `Expr' must include from 1 to 10 subexpressions, joined by the "||"
* or "&&" operators. Each subexpression must be of the form
- * "resource.matchLabels(key_name, value_name)",
- * where key_name and value_name are the resource names for Label Keys
- * and Values. These names are available from the Label Manager Service. An
- * example expression is:
- * "resource.matchLabels('labelKeys/123, 'labelValues/456')".
+ * "resource.matchTag('/tag_key_short_name,
+ * 'tag_value_short_name')". or "resource.matchTagId('tagKeys/key_id',
+ * 'tagValues/value_id')". where key_name and value_name are the resource
+ * names for Label Keys and Values. These names are available from the Tag
+ * Manager Service. An example expression is:
+ * "resource.matchTag('123456789/environment,
+ * 'prod')". or "resource.matchTagId('tagKeys/123',
+ * 'tagValues/456')".
* }
*/
public function __construct($data = NULL) {
@@ -206,11 +212,14 @@ public function setEnforce($var)
* in the evaluation of the policy. When set, the `expression` field in
* the `Expr' must include from 1 to 10 subexpressions, joined by the "||"
* or "&&" operators. Each subexpression must be of the form
- * "resource.matchLabels(key_name, value_name)",
- * where key_name and value_name are the resource names for Label Keys
- * and Values. These names are available from the Label Manager Service. An
- * example expression is:
- * "resource.matchLabels('labelKeys/123, 'labelValues/456')".
+ * "resource.matchTag('/tag_key_short_name,
+ * 'tag_value_short_name')". or "resource.matchTagId('tagKeys/key_id',
+ * 'tagValues/value_id')". where key_name and value_name are the resource
+ * names for Label Keys and Values. These names are available from the Tag
+ * Manager Service. An example expression is:
+ * "resource.matchTag('123456789/environment,
+ * 'prod')". or "resource.matchTagId('tagKeys/123',
+ * 'tagValues/456')".
*
* Generated from protobuf field .google.type.Expr condition = 5;
* @return \Google\Type\Expr|null
@@ -235,11 +244,14 @@ public function clearCondition()
* in the evaluation of the policy. When set, the `expression` field in
* the `Expr' must include from 1 to 10 subexpressions, joined by the "||"
* or "&&" operators. Each subexpression must be of the form
- * "resource.matchLabels(key_name, value_name)",
- * where key_name and value_name are the resource names for Label Keys
- * and Values. These names are available from the Label Manager Service. An
- * example expression is:
- * "resource.matchLabels('labelKeys/123, 'labelValues/456')".
+ * "resource.matchTag('/tag_key_short_name,
+ * 'tag_value_short_name')". or "resource.matchTagId('tagKeys/key_id',
+ * 'tagValues/value_id')". where key_name and value_name are the resource
+ * names for Label Keys and Values. These names are available from the Tag
+ * Manager Service. An example expression is:
+ * "resource.matchTag('123456789/environment,
+ * 'prod')". or "resource.matchTagId('tagKeys/123',
+ * 'tagValues/456')".
*
* Generated from protobuf field .google.type.Expr condition = 5;
* @param \Google\Type\Expr $var