diff --git a/Memorystore/metadata/V1/Memorystore.php b/Memorystore/metadata/V1/Memorystore.php index 9a1d645866f5..6f5848a70614 100644 Binary files a/Memorystore/metadata/V1/Memorystore.php and b/Memorystore/metadata/V1/Memorystore.php differ diff --git a/Memorystore/src/V1/Backup.php b/Memorystore/src/V1/Backup.php index 2044ebba3574..05ea814abe4e 100644 --- a/Memorystore/src/V1/Backup.php +++ b/Memorystore/src/V1/Backup.php @@ -96,6 +96,12 @@ class Backup extends \Google\Protobuf\Internal\Message * Generated from protobuf field .google.cloud.memorystore.v1.Backup.State state = 13 [(.google.api.field_behavior) = OUTPUT_ONLY]; */ protected $state = 0; + /** + * Output only. Encryption information of the backup. + * + * Generated from protobuf field .google.cloud.memorystore.v1.EncryptionInfo encryption_info = 14 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $encryption_info = null; /** * Output only. System assigned unique identifier of the backup. * @@ -138,6 +144,8 @@ class Backup extends \Google\Protobuf\Internal\Message * Output only. Type of the backup. * @type int $state * Output only. State of the backup. + * @type \Google\Cloud\Memorystore\V1\EncryptionInfo $encryption_info + * Output only. Encryption information of the backup. * @type string $uid * Output only. System assigned unique identifier of the backup. * } @@ -511,6 +519,42 @@ public function setState($var) return $this; } + /** + * Output only. Encryption information of the backup. + * + * Generated from protobuf field .google.cloud.memorystore.v1.EncryptionInfo encryption_info = 14 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return \Google\Cloud\Memorystore\V1\EncryptionInfo|null + */ + public function getEncryptionInfo() + { + return $this->encryption_info; + } + + public function hasEncryptionInfo() + { + return isset($this->encryption_info); + } + + public function clearEncryptionInfo() + { + unset($this->encryption_info); + } + + /** + * Output only. Encryption information of the backup. + * + * Generated from protobuf field .google.cloud.memorystore.v1.EncryptionInfo encryption_info = 14 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param \Google\Cloud\Memorystore\V1\EncryptionInfo $var + * @return $this + */ + public function setEncryptionInfo($var) + { + GPBUtil::checkMessage($var, \Google\Cloud\Memorystore\V1\EncryptionInfo::class); + $this->encryption_info = $var; + + return $this; + } + /** * Output only. System assigned unique identifier of the backup. * diff --git a/Memorystore/src/V1/BackupCollection.php b/Memorystore/src/V1/BackupCollection.php index 23e258a6c62f..bdeee3965f0f 100644 --- a/Memorystore/src/V1/BackupCollection.php +++ b/Memorystore/src/V1/BackupCollection.php @@ -54,6 +54,24 @@ class BackupCollection extends \Google\Protobuf\Internal\Message * Generated from protobuf field .google.protobuf.Timestamp create_time = 7 [(.google.api.field_behavior) = OUTPUT_ONLY]; */ protected $create_time = null; + /** + * Output only. Total size of all backups in the backup collection. + * + * Generated from protobuf field int64 total_backup_size_bytes = 8 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $total_backup_size_bytes = 0; + /** + * Output only. Total number of backups in the backup collection. + * + * Generated from protobuf field int64 total_backup_count = 10 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $total_backup_count = 0; + /** + * Output only. The last time a backup was created in the backup collection. + * + * Generated from protobuf field .google.protobuf.Timestamp last_backup_time = 11 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $last_backup_time = null; /** * Constructor. @@ -76,6 +94,12 @@ class BackupCollection extends \Google\Protobuf\Internal\Message * Output only. System assigned unique identifier of the backup collection. * @type \Google\Protobuf\Timestamp $create_time * Output only. The time when the backup collection was created. + * @type int|string $total_backup_size_bytes + * Output only. Total size of all backups in the backup collection. + * @type int|string $total_backup_count + * Output only. Total number of backups in the backup collection. + * @type \Google\Protobuf\Timestamp $last_backup_time + * Output only. The last time a backup was created in the backup collection. * } */ public function __construct($data = NULL) { @@ -255,5 +279,93 @@ public function setCreateTime($var) return $this; } + /** + * Output only. Total size of all backups in the backup collection. + * + * Generated from protobuf field int64 total_backup_size_bytes = 8 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return int|string + */ + public function getTotalBackupSizeBytes() + { + return $this->total_backup_size_bytes; + } + + /** + * Output only. Total size of all backups in the backup collection. + * + * Generated from protobuf field int64 total_backup_size_bytes = 8 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param int|string $var + * @return $this + */ + public function setTotalBackupSizeBytes($var) + { + GPBUtil::checkInt64($var); + $this->total_backup_size_bytes = $var; + + return $this; + } + + /** + * Output only. Total number of backups in the backup collection. + * + * Generated from protobuf field int64 total_backup_count = 10 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return int|string + */ + public function getTotalBackupCount() + { + return $this->total_backup_count; + } + + /** + * Output only. Total number of backups in the backup collection. + * + * Generated from protobuf field int64 total_backup_count = 10 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param int|string $var + * @return $this + */ + public function setTotalBackupCount($var) + { + GPBUtil::checkInt64($var); + $this->total_backup_count = $var; + + return $this; + } + + /** + * Output only. The last time a backup was created in the backup collection. + * + * Generated from protobuf field .google.protobuf.Timestamp last_backup_time = 11 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return \Google\Protobuf\Timestamp|null + */ + public function getLastBackupTime() + { + return $this->last_backup_time; + } + + public function hasLastBackupTime() + { + return isset($this->last_backup_time); + } + + public function clearLastBackupTime() + { + unset($this->last_backup_time); + } + + /** + * Output only. The last time a backup was created in the backup collection. + * + * Generated from protobuf field .google.protobuf.Timestamp last_backup_time = 11 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param \Google\Protobuf\Timestamp $var + * @return $this + */ + public function setLastBackupTime($var) + { + GPBUtil::checkMessage($var, \Google\Protobuf\Timestamp::class); + $this->last_backup_time = $var; + + return $this; + } + } diff --git a/Memorystore/src/V1/Client/MemorystoreClient.php b/Memorystore/src/V1/Client/MemorystoreClient.php index fc82d10b9fdf..3475cb2b5563 100644 --- a/Memorystore/src/V1/Client/MemorystoreClient.php +++ b/Memorystore/src/V1/Client/MemorystoreClient.php @@ -241,6 +241,55 @@ public static function backupCollectionName(string $project, string $location, s ]); } + /** + * Formats a string containing the fully-qualified path to represent a crypto_key + * resource. + * + * @param string $project + * @param string $location + * @param string $keyRing + * @param string $cryptoKey + * + * @return string The formatted crypto_key resource. + */ + public static function cryptoKeyName(string $project, string $location, string $keyRing, string $cryptoKey): string + { + return self::getPathTemplate('cryptoKey')->render([ + 'project' => $project, + 'location' => $location, + 'key_ring' => $keyRing, + 'crypto_key' => $cryptoKey, + ]); + } + + /** + * Formats a string containing the fully-qualified path to represent a + * crypto_key_version resource. + * + * @param string $project + * @param string $location + * @param string $keyRing + * @param string $cryptoKey + * @param string $cryptoKeyVersion + * + * @return string The formatted crypto_key_version resource. + */ + public static function cryptoKeyVersionName( + string $project, + string $location, + string $keyRing, + string $cryptoKey, + string $cryptoKeyVersion + ): string { + return self::getPathTemplate('cryptoKeyVersion')->render([ + 'project' => $project, + 'location' => $location, + 'key_ring' => $keyRing, + 'crypto_key' => $cryptoKey, + 'crypto_key_version' => $cryptoKeyVersion, + ]); + } + /** * Formats a string containing the fully-qualified path to represent a * forwarding_rule resource. @@ -338,6 +387,8 @@ public static function serviceAttachmentName(string $project, string $region, st * Template: Pattern * - backup: projects/{project}/locations/{location}/backupCollections/{backup_collection}/backups/{backup} * - backupCollection: projects/{project}/locations/{location}/backupCollections/{backup_collection} + * - cryptoKey: projects/{project}/locations/{location}/keyRings/{key_ring}/cryptoKeys/{crypto_key} + * - cryptoKeyVersion: projects/{project}/locations/{location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}/cryptoKeyVersions/{crypto_key_version} * - forwardingRule: projects/{project}/regions/{region}/forwardingRules/{forwarding_rule} * - instance: projects/{project}/locations/{location}/instances/{instance} * - location: projects/{project}/locations/{location} diff --git a/Memorystore/src/V1/EncryptionInfo.php b/Memorystore/src/V1/EncryptionInfo.php new file mode 100644 index 000000000000..5d1e434a5a9e --- /dev/null +++ b/Memorystore/src/V1/EncryptionInfo.php @@ -0,0 +1,187 @@ +google.cloud.memorystore.v1.EncryptionInfo + */ +class EncryptionInfo extends \Google\Protobuf\Internal\Message +{ + /** + * Output only. Type of encryption. + * + * Generated from protobuf field .google.cloud.memorystore.v1.EncryptionInfo.Type encryption_type = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $encryption_type = 0; + /** + * Output only. KMS key versions that are being used to protect the data + * at-rest. + * + * Generated from protobuf field repeated string kms_key_versions = 2 [(.google.api.field_behavior) = OUTPUT_ONLY, (.google.api.resource_reference) = { + */ + private $kms_key_versions; + /** + * Output only. The state of the primary version of the KMS key perceived by + * the system. This field is not populated in backups. + * + * Generated from protobuf field .google.cloud.memorystore.v1.EncryptionInfo.KmsKeyState kms_key_primary_state = 3 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $kms_key_primary_state = 0; + /** + * Output only. The most recent time when the encryption info was updated. + * + * Generated from protobuf field .google.protobuf.Timestamp last_update_time = 4 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $last_update_time = null; + + /** + * Constructor. + * + * @param array $data { + * Optional. Data for populating the Message object. + * + * @type int $encryption_type + * Output only. Type of encryption. + * @type array|\Google\Protobuf\Internal\RepeatedField $kms_key_versions + * Output only. KMS key versions that are being used to protect the data + * at-rest. + * @type int $kms_key_primary_state + * Output only. The state of the primary version of the KMS key perceived by + * the system. This field is not populated in backups. + * @type \Google\Protobuf\Timestamp $last_update_time + * Output only. The most recent time when the encryption info was updated. + * } + */ + public function __construct($data = NULL) { + \GPBMetadata\Google\Cloud\Memorystore\V1\Memorystore::initOnce(); + parent::__construct($data); + } + + /** + * Output only. Type of encryption. + * + * Generated from protobuf field .google.cloud.memorystore.v1.EncryptionInfo.Type encryption_type = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return int + */ + public function getEncryptionType() + { + return $this->encryption_type; + } + + /** + * Output only. Type of encryption. + * + * Generated from protobuf field .google.cloud.memorystore.v1.EncryptionInfo.Type encryption_type = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param int $var + * @return $this + */ + public function setEncryptionType($var) + { + GPBUtil::checkEnum($var, \Google\Cloud\Memorystore\V1\EncryptionInfo\Type::class); + $this->encryption_type = $var; + + return $this; + } + + /** + * Output only. KMS key versions that are being used to protect the data + * at-rest. + * + * Generated from protobuf field repeated string kms_key_versions = 2 [(.google.api.field_behavior) = OUTPUT_ONLY, (.google.api.resource_reference) = { + * @return \Google\Protobuf\Internal\RepeatedField + */ + public function getKmsKeyVersions() + { + return $this->kms_key_versions; + } + + /** + * Output only. KMS key versions that are being used to protect the data + * at-rest. + * + * Generated from protobuf field repeated string kms_key_versions = 2 [(.google.api.field_behavior) = OUTPUT_ONLY, (.google.api.resource_reference) = { + * @param array|\Google\Protobuf\Internal\RepeatedField $var + * @return $this + */ + public function setKmsKeyVersions($var) + { + $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING); + $this->kms_key_versions = $arr; + + return $this; + } + + /** + * Output only. The state of the primary version of the KMS key perceived by + * the system. This field is not populated in backups. + * + * Generated from protobuf field .google.cloud.memorystore.v1.EncryptionInfo.KmsKeyState kms_key_primary_state = 3 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return int + */ + public function getKmsKeyPrimaryState() + { + return $this->kms_key_primary_state; + } + + /** + * Output only. The state of the primary version of the KMS key perceived by + * the system. This field is not populated in backups. + * + * Generated from protobuf field .google.cloud.memorystore.v1.EncryptionInfo.KmsKeyState kms_key_primary_state = 3 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param int $var + * @return $this + */ + public function setKmsKeyPrimaryState($var) + { + GPBUtil::checkEnum($var, \Google\Cloud\Memorystore\V1\EncryptionInfo\KmsKeyState::class); + $this->kms_key_primary_state = $var; + + return $this; + } + + /** + * Output only. The most recent time when the encryption info was updated. + * + * Generated from protobuf field .google.protobuf.Timestamp last_update_time = 4 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return \Google\Protobuf\Timestamp|null + */ + public function getLastUpdateTime() + { + return $this->last_update_time; + } + + public function hasLastUpdateTime() + { + return isset($this->last_update_time); + } + + public function clearLastUpdateTime() + { + unset($this->last_update_time); + } + + /** + * Output only. The most recent time when the encryption info was updated. + * + * Generated from protobuf field .google.protobuf.Timestamp last_update_time = 4 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param \Google\Protobuf\Timestamp $var + * @return $this + */ + public function setLastUpdateTime($var) + { + GPBUtil::checkMessage($var, \Google\Protobuf\Timestamp::class); + $this->last_update_time = $var; + + return $this; + } + +} + diff --git a/Memorystore/src/V1/EncryptionInfo/KmsKeyState.php b/Memorystore/src/V1/EncryptionInfo/KmsKeyState.php new file mode 100644 index 000000000000..69f8affd0818 --- /dev/null +++ b/Memorystore/src/V1/EncryptionInfo/KmsKeyState.php @@ -0,0 +1,105 @@ +google.cloud.memorystore.v1.EncryptionInfo.KmsKeyState + */ +class KmsKeyState +{ + /** + * The default value. This value is unused. + * + * Generated from protobuf enum KMS_KEY_STATE_UNSPECIFIED = 0; + */ + const KMS_KEY_STATE_UNSPECIFIED = 0; + /** + * The KMS key is enabled and correctly configured. + * + * Generated from protobuf enum ENABLED = 1; + */ + const ENABLED = 1; + /** + * Permission denied on the KMS key. + * + * Generated from protobuf enum PERMISSION_DENIED = 2; + */ + const PERMISSION_DENIED = 2; + /** + * The KMS key is disabled. + * + * Generated from protobuf enum DISABLED = 3; + */ + const DISABLED = 3; + /** + * The KMS key is destroyed. + * + * Generated from protobuf enum DESTROYED = 4; + */ + const DESTROYED = 4; + /** + * The KMS key is scheduled to be destroyed. + * + * Generated from protobuf enum DESTROY_SCHEDULED = 5; + */ + const DESTROY_SCHEDULED = 5; + /** + * The EKM key is unreachable. + * + * Generated from protobuf enum EKM_KEY_UNREACHABLE_DETECTED = 6; + */ + const EKM_KEY_UNREACHABLE_DETECTED = 6; + /** + * Billing is disabled for the project. + * + * Generated from protobuf enum BILLING_DISABLED = 7; + */ + const BILLING_DISABLED = 7; + /** + * All other unknown failures. + * + * Generated from protobuf enum UNKNOWN_FAILURE = 8; + */ + const UNKNOWN_FAILURE = 8; + + private static $valueToName = [ + self::KMS_KEY_STATE_UNSPECIFIED => 'KMS_KEY_STATE_UNSPECIFIED', + self::ENABLED => 'ENABLED', + self::PERMISSION_DENIED => 'PERMISSION_DENIED', + self::DISABLED => 'DISABLED', + self::DESTROYED => 'DESTROYED', + self::DESTROY_SCHEDULED => 'DESTROY_SCHEDULED', + self::EKM_KEY_UNREACHABLE_DETECTED => 'EKM_KEY_UNREACHABLE_DETECTED', + self::BILLING_DISABLED => 'BILLING_DISABLED', + self::UNKNOWN_FAILURE => 'UNKNOWN_FAILURE', + ]; + + public static function name($value) + { + if (!isset(self::$valueToName[$value])) { + throw new UnexpectedValueException(sprintf( + 'Enum %s has no name defined for value %s', __CLASS__, $value)); + } + return self::$valueToName[$value]; + } + + + public static function value($name) + { + $const = __CLASS__ . '::' . strtoupper($name); + if (!defined($const)) { + throw new UnexpectedValueException(sprintf( + 'Enum %s has no value defined for name %s', __CLASS__, $name)); + } + return constant($const); + } +} + + diff --git a/Memorystore/src/V1/EncryptionInfo/Type.php b/Memorystore/src/V1/EncryptionInfo/Type.php new file mode 100644 index 000000000000..c2ded5f86e7b --- /dev/null +++ b/Memorystore/src/V1/EncryptionInfo/Type.php @@ -0,0 +1,64 @@ +google.cloud.memorystore.v1.EncryptionInfo.Type + */ +class Type +{ + /** + * Encryption type not specified. Defaults to GOOGLE_DEFAULT_ENCRYPTION. + * + * Generated from protobuf enum TYPE_UNSPECIFIED = 0; + */ + const TYPE_UNSPECIFIED = 0; + /** + * The data is encrypted at rest with a key that is fully managed by Google. + * No key version will be populated. This is the default state. + * + * Generated from protobuf enum GOOGLE_DEFAULT_ENCRYPTION = 1; + */ + const GOOGLE_DEFAULT_ENCRYPTION = 1; + /** + * The data is encrypted at rest with a key that is managed by the customer. + * KMS key versions will be populated. + * + * Generated from protobuf enum CUSTOMER_MANAGED_ENCRYPTION = 2; + */ + const CUSTOMER_MANAGED_ENCRYPTION = 2; + + private static $valueToName = [ + self::TYPE_UNSPECIFIED => 'TYPE_UNSPECIFIED', + self::GOOGLE_DEFAULT_ENCRYPTION => 'GOOGLE_DEFAULT_ENCRYPTION', + self::CUSTOMER_MANAGED_ENCRYPTION => 'CUSTOMER_MANAGED_ENCRYPTION', + ]; + + public static function name($value) + { + if (!isset(self::$valueToName[$value])) { + throw new UnexpectedValueException(sprintf( + 'Enum %s has no name defined for value %s', __CLASS__, $value)); + } + return self::$valueToName[$value]; + } + + + public static function value($name) + { + $const = __CLASS__ . '::' . strtoupper($name); + if (!defined($const)) { + throw new UnexpectedValueException(sprintf( + 'Enum %s has no value defined for name %s', __CLASS__, $name)); + } + return constant($const); + } +} + + diff --git a/Memorystore/src/V1/Instance.php b/Memorystore/src/V1/Instance.php index 684c12e7feda..67d9082ed62c 100644 --- a/Memorystore/src/V1/Instance.php +++ b/Memorystore/src/V1/Instance.php @@ -84,8 +84,12 @@ class Instance extends \Google\Protobuf\Internal\Message */ protected $shard_count = 0; /** - * Output only. Deprecated: Use the endpoints.connections.psc_auto_connection - * or endpoints.connections.psc_connection values instead. + * Output only. Deprecated: The discovery_endpoints parameter is deprecated. + * As a result, it will not be populated if the connections are created using + * endpoints parameter. Instead of this parameter, for discovery, use + * endpoints.connections.pscConnection and + * endpoints.connections.pscAutoConnection + * with connectionType CONNECTION_TYPE_DISCOVERY. * * Generated from protobuf field repeated .google.cloud.memorystore.v1.DiscoveryEndpoint discovery_endpoints = 12 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY]; * @deprecated @@ -160,12 +164,31 @@ class Instance extends \Google\Protobuf\Internal\Message * Generated from protobuf field .google.cloud.memorystore.v1.Instance.Mode mode = 26 [(.google.api.field_behavior) = OPTIONAL]; */ protected $mode = 0; + /** + * Optional. Input only. Simulate a maintenance event. + * + * Generated from protobuf field optional bool simulate_maintenance_event = 27 [(.google.api.field_behavior) = OPTIONAL, (.google.api.field_behavior) = INPUT_ONLY]; + */ + protected $simulate_maintenance_event = null; /** * Optional. Input only. Ondemand maintenance for the instance. * - * Generated from protobuf field optional bool ondemand_maintenance = 28 [(.google.api.field_behavior) = OPTIONAL, (.google.api.field_behavior) = INPUT_ONLY]; + * Generated from protobuf field optional bool ondemand_maintenance = 28 [deprecated = true, (.google.api.field_behavior) = OPTIONAL, (.google.api.field_behavior) = INPUT_ONLY]; + * @deprecated */ protected $ondemand_maintenance = null; + /** + * Optional. Output only. Reserved for future use. + * + * Generated from protobuf field optional bool satisfies_pzs = 29 [(.google.api.field_behavior) = OUTPUT_ONLY, (.google.api.field_behavior) = OPTIONAL]; + */ + protected $satisfies_pzs = null; + /** + * Optional. Output only. Reserved for future use. + * + * Generated from protobuf field optional bool satisfies_pzi = 30 [(.google.api.field_behavior) = OUTPUT_ONLY, (.google.api.field_behavior) = OPTIONAL]; + */ + protected $satisfies_pzi = null; /** * Optional. The maintenance policy for the instance. If not provided, * the maintenance event will be performed based on Memorystore @@ -195,6 +218,18 @@ class Instance extends \Google\Protobuf\Internal\Message * Generated from protobuf field optional bool async_instance_endpoints_deletion_enabled = 44 [(.google.api.field_behavior) = OPTIONAL]; */ protected $async_instance_endpoints_deletion_enabled = null; + /** + * Optional. The KMS key used to encrypt the at-rest data of the cluster. + * + * Generated from protobuf field optional string kms_key = 45 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { + */ + protected $kms_key = null; + /** + * Output only. Encryption information of the data at rest of the cluster. + * + * Generated from protobuf field .google.cloud.memorystore.v1.EncryptionInfo encryption_info = 46 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $encryption_info = null; /** * Output only. The backup collection full resource name. Example: * projects/{project}/locations/{location}/backupCollections/{collection} @@ -208,6 +243,35 @@ class Instance extends \Google\Protobuf\Internal\Message * Generated from protobuf field .google.cloud.memorystore.v1.AutomatedBackupConfig automated_backup_config = 48 [(.google.api.field_behavior) = OPTIONAL]; */ protected $automated_backup_config = null; + /** + * Optional. This field can be used to trigger self service update to indicate + * the desired maintenance version. The input to this field can be determined + * by the available_maintenance_versions field. + * + * Generated from protobuf field optional string maintenance_version = 49 [(.google.api.field_behavior) = OPTIONAL]; + */ + protected $maintenance_version = null; + /** + * Output only. This field represents the actual maintenance version of the + * instance. + * + * Generated from protobuf field optional string effective_maintenance_version = 50 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $effective_maintenance_version = null; + /** + * Output only. This field is used to determine the available maintenance + * versions for the self service update. + * + * Generated from protobuf field repeated string available_maintenance_versions = 51 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + private $available_maintenance_versions; + /** + * Optional. Immutable. Deprecated, do not use. + * + * Generated from protobuf field bool allow_fewer_zones_deployment = 54 [deprecated = true, (.google.api.field_behavior) = OPTIONAL, (.google.api.field_behavior) = IMMUTABLE]; + * @deprecated + */ + protected $allow_fewer_zones_deployment = false; protected $import_sources; /** @@ -249,8 +313,12 @@ class Instance extends \Google\Protobuf\Internal\Message * @type int $shard_count * Optional. Number of shards for the instance. * @type array<\Google\Cloud\Memorystore\V1\DiscoveryEndpoint>|\Google\Protobuf\Internal\RepeatedField $discovery_endpoints - * Output only. Deprecated: Use the endpoints.connections.psc_auto_connection - * or endpoints.connections.psc_connection values instead. + * Output only. Deprecated: The discovery_endpoints parameter is deprecated. + * As a result, it will not be populated if the connections are created using + * endpoints parameter. Instead of this parameter, for discovery, use + * endpoints.connections.pscConnection and + * endpoints.connections.pscAutoConnection + * with connectionType CONNECTION_TYPE_DISCOVERY. * @type int $node_type * Optional. Machine type for individual nodes of the instance. * @type \Google\Cloud\Memorystore\V1\PersistenceConfig $persistence_config @@ -275,8 +343,14 @@ class Instance extends \Google\Protobuf\Internal\Message * Optional. Endpoints for the instance. * @type int $mode * Optional. The mode config for the instance. + * @type bool $simulate_maintenance_event + * Optional. Input only. Simulate a maintenance event. * @type bool $ondemand_maintenance * Optional. Input only. Ondemand maintenance for the instance. + * @type bool $satisfies_pzs + * Optional. Output only. Reserved for future use. + * @type bool $satisfies_pzi + * Optional. Output only. Reserved for future use. * @type \Google\Cloud\Memorystore\V1\MaintenancePolicy $maintenance_policy * Optional. The maintenance policy for the instance. If not provided, * the maintenance event will be performed based on Memorystore @@ -290,11 +364,27 @@ class Instance extends \Google\Protobuf\Internal\Message * customers can be deleted asynchronously. That is, such an instance endpoint * can be de-registered before the forwarding rules in the instance endpoint * are deleted. + * @type string $kms_key + * Optional. The KMS key used to encrypt the at-rest data of the cluster. + * @type \Google\Cloud\Memorystore\V1\EncryptionInfo $encryption_info + * Output only. Encryption information of the data at rest of the cluster. * @type string $backup_collection * Output only. The backup collection full resource name. Example: * projects/{project}/locations/{location}/backupCollections/{collection} * @type \Google\Cloud\Memorystore\V1\AutomatedBackupConfig $automated_backup_config * Optional. The automated backup config for the instance. + * @type string $maintenance_version + * Optional. This field can be used to trigger self service update to indicate + * the desired maintenance version. The input to this field can be determined + * by the available_maintenance_versions field. + * @type string $effective_maintenance_version + * Output only. This field represents the actual maintenance version of the + * instance. + * @type array|\Google\Protobuf\Internal\RepeatedField $available_maintenance_versions + * Output only. This field is used to determine the available maintenance + * versions for the self service update. + * @type bool $allow_fewer_zones_deployment + * Optional. Immutable. Deprecated, do not use. * } */ public function __construct($data = NULL) { @@ -703,8 +793,12 @@ public function setShardCount($var) } /** - * Output only. Deprecated: Use the endpoints.connections.psc_auto_connection - * or endpoints.connections.psc_connection values instead. + * Output only. Deprecated: The discovery_endpoints parameter is deprecated. + * As a result, it will not be populated if the connections are created using + * endpoints parameter. Instead of this parameter, for discovery, use + * endpoints.connections.pscConnection and + * endpoints.connections.pscAutoConnection + * with connectionType CONNECTION_TYPE_DISCOVERY. * * Generated from protobuf field repeated .google.cloud.memorystore.v1.DiscoveryEndpoint discovery_endpoints = 12 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY]; * @return \Google\Protobuf\Internal\RepeatedField @@ -719,8 +813,12 @@ public function getDiscoveryEndpoints() } /** - * Output only. Deprecated: Use the endpoints.connections.psc_auto_connection - * or endpoints.connections.psc_connection values instead. + * Output only. Deprecated: The discovery_endpoints parameter is deprecated. + * As a result, it will not be populated if the connections are created using + * endpoints parameter. Instead of this parameter, for discovery, use + * endpoints.connections.pscConnection and + * endpoints.connections.pscAutoConnection + * with connectionType CONNECTION_TYPE_DISCOVERY. * * Generated from protobuf field repeated .google.cloud.memorystore.v1.DiscoveryEndpoint discovery_endpoints = 12 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY]; * @param array<\Google\Cloud\Memorystore\V1\DiscoveryEndpoint>|\Google\Protobuf\Internal\RepeatedField $var @@ -1076,42 +1174,160 @@ public function setMode($var) return $this; } + /** + * Optional. Input only. Simulate a maintenance event. + * + * Generated from protobuf field optional bool simulate_maintenance_event = 27 [(.google.api.field_behavior) = OPTIONAL, (.google.api.field_behavior) = INPUT_ONLY]; + * @return bool + */ + public function getSimulateMaintenanceEvent() + { + return isset($this->simulate_maintenance_event) ? $this->simulate_maintenance_event : false; + } + + public function hasSimulateMaintenanceEvent() + { + return isset($this->simulate_maintenance_event); + } + + public function clearSimulateMaintenanceEvent() + { + unset($this->simulate_maintenance_event); + } + + /** + * Optional. Input only. Simulate a maintenance event. + * + * Generated from protobuf field optional bool simulate_maintenance_event = 27 [(.google.api.field_behavior) = OPTIONAL, (.google.api.field_behavior) = INPUT_ONLY]; + * @param bool $var + * @return $this + */ + public function setSimulateMaintenanceEvent($var) + { + GPBUtil::checkBool($var); + $this->simulate_maintenance_event = $var; + + return $this; + } + /** * Optional. Input only. Ondemand maintenance for the instance. * - * Generated from protobuf field optional bool ondemand_maintenance = 28 [(.google.api.field_behavior) = OPTIONAL, (.google.api.field_behavior) = INPUT_ONLY]; + * Generated from protobuf field optional bool ondemand_maintenance = 28 [deprecated = true, (.google.api.field_behavior) = OPTIONAL, (.google.api.field_behavior) = INPUT_ONLY]; * @return bool + * @deprecated */ public function getOndemandMaintenance() { + if (isset($this->ondemand_maintenance)) { + @trigger_error('ondemand_maintenance is deprecated.', E_USER_DEPRECATED); + } return isset($this->ondemand_maintenance) ? $this->ondemand_maintenance : false; } public function hasOndemandMaintenance() { + if (isset($this->ondemand_maintenance)) { + @trigger_error('ondemand_maintenance is deprecated.', E_USER_DEPRECATED); + } return isset($this->ondemand_maintenance); } public function clearOndemandMaintenance() { + @trigger_error('ondemand_maintenance is deprecated.', E_USER_DEPRECATED); unset($this->ondemand_maintenance); } /** * Optional. Input only. Ondemand maintenance for the instance. * - * Generated from protobuf field optional bool ondemand_maintenance = 28 [(.google.api.field_behavior) = OPTIONAL, (.google.api.field_behavior) = INPUT_ONLY]; + * Generated from protobuf field optional bool ondemand_maintenance = 28 [deprecated = true, (.google.api.field_behavior) = OPTIONAL, (.google.api.field_behavior) = INPUT_ONLY]; * @param bool $var * @return $this + * @deprecated */ public function setOndemandMaintenance($var) { + @trigger_error('ondemand_maintenance is deprecated.', E_USER_DEPRECATED); GPBUtil::checkBool($var); $this->ondemand_maintenance = $var; return $this; } + /** + * Optional. Output only. Reserved for future use. + * + * Generated from protobuf field optional bool satisfies_pzs = 29 [(.google.api.field_behavior) = OUTPUT_ONLY, (.google.api.field_behavior) = OPTIONAL]; + * @return bool + */ + public function getSatisfiesPzs() + { + return isset($this->satisfies_pzs) ? $this->satisfies_pzs : false; + } + + public function hasSatisfiesPzs() + { + return isset($this->satisfies_pzs); + } + + public function clearSatisfiesPzs() + { + unset($this->satisfies_pzs); + } + + /** + * Optional. Output only. Reserved for future use. + * + * Generated from protobuf field optional bool satisfies_pzs = 29 [(.google.api.field_behavior) = OUTPUT_ONLY, (.google.api.field_behavior) = OPTIONAL]; + * @param bool $var + * @return $this + */ + public function setSatisfiesPzs($var) + { + GPBUtil::checkBool($var); + $this->satisfies_pzs = $var; + + return $this; + } + + /** + * Optional. Output only. Reserved for future use. + * + * Generated from protobuf field optional bool satisfies_pzi = 30 [(.google.api.field_behavior) = OUTPUT_ONLY, (.google.api.field_behavior) = OPTIONAL]; + * @return bool + */ + public function getSatisfiesPzi() + { + return isset($this->satisfies_pzi) ? $this->satisfies_pzi : false; + } + + public function hasSatisfiesPzi() + { + return isset($this->satisfies_pzi); + } + + public function clearSatisfiesPzi() + { + unset($this->satisfies_pzi); + } + + /** + * Optional. Output only. Reserved for future use. + * + * Generated from protobuf field optional bool satisfies_pzi = 30 [(.google.api.field_behavior) = OUTPUT_ONLY, (.google.api.field_behavior) = OPTIONAL]; + * @param bool $var + * @return $this + */ + public function setSatisfiesPzi($var) + { + GPBUtil::checkBool($var); + $this->satisfies_pzi = $var; + + return $this; + } + /** * Optional. The maintenance policy for the instance. If not provided, * the maintenance event will be performed based on Memorystore @@ -1266,6 +1482,78 @@ public function setAsyncInstanceEndpointsDeletionEnabled($var) return $this; } + /** + * Optional. The KMS key used to encrypt the at-rest data of the cluster. + * + * Generated from protobuf field optional string kms_key = 45 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { + * @return string + */ + public function getKmsKey() + { + return isset($this->kms_key) ? $this->kms_key : ''; + } + + public function hasKmsKey() + { + return isset($this->kms_key); + } + + public function clearKmsKey() + { + unset($this->kms_key); + } + + /** + * Optional. The KMS key used to encrypt the at-rest data of the cluster. + * + * Generated from protobuf field optional string kms_key = 45 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { + * @param string $var + * @return $this + */ + public function setKmsKey($var) + { + GPBUtil::checkString($var, True); + $this->kms_key = $var; + + return $this; + } + + /** + * Output only. Encryption information of the data at rest of the cluster. + * + * Generated from protobuf field .google.cloud.memorystore.v1.EncryptionInfo encryption_info = 46 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return \Google\Cloud\Memorystore\V1\EncryptionInfo|null + */ + public function getEncryptionInfo() + { + return $this->encryption_info; + } + + public function hasEncryptionInfo() + { + return isset($this->encryption_info); + } + + public function clearEncryptionInfo() + { + unset($this->encryption_info); + } + + /** + * Output only. Encryption information of the data at rest of the cluster. + * + * Generated from protobuf field .google.cloud.memorystore.v1.EncryptionInfo encryption_info = 46 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param \Google\Cloud\Memorystore\V1\EncryptionInfo $var + * @return $this + */ + public function setEncryptionInfo($var) + { + GPBUtil::checkMessage($var, \Google\Cloud\Memorystore\V1\EncryptionInfo::class); + $this->encryption_info = $var; + + return $this; + } + /** * Output only. The backup collection full resource name. Example: * projects/{project}/locations/{location}/backupCollections/{collection} @@ -1340,6 +1628,144 @@ public function setAutomatedBackupConfig($var) return $this; } + /** + * Optional. This field can be used to trigger self service update to indicate + * the desired maintenance version. The input to this field can be determined + * by the available_maintenance_versions field. + * + * Generated from protobuf field optional string maintenance_version = 49 [(.google.api.field_behavior) = OPTIONAL]; + * @return string + */ + public function getMaintenanceVersion() + { + return isset($this->maintenance_version) ? $this->maintenance_version : ''; + } + + public function hasMaintenanceVersion() + { + return isset($this->maintenance_version); + } + + public function clearMaintenanceVersion() + { + unset($this->maintenance_version); + } + + /** + * Optional. This field can be used to trigger self service update to indicate + * the desired maintenance version. The input to this field can be determined + * by the available_maintenance_versions field. + * + * Generated from protobuf field optional string maintenance_version = 49 [(.google.api.field_behavior) = OPTIONAL]; + * @param string $var + * @return $this + */ + public function setMaintenanceVersion($var) + { + GPBUtil::checkString($var, True); + $this->maintenance_version = $var; + + return $this; + } + + /** + * Output only. This field represents the actual maintenance version of the + * instance. + * + * Generated from protobuf field optional string effective_maintenance_version = 50 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return string + */ + public function getEffectiveMaintenanceVersion() + { + return isset($this->effective_maintenance_version) ? $this->effective_maintenance_version : ''; + } + + public function hasEffectiveMaintenanceVersion() + { + return isset($this->effective_maintenance_version); + } + + public function clearEffectiveMaintenanceVersion() + { + unset($this->effective_maintenance_version); + } + + /** + * Output only. This field represents the actual maintenance version of the + * instance. + * + * Generated from protobuf field optional string effective_maintenance_version = 50 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param string $var + * @return $this + */ + public function setEffectiveMaintenanceVersion($var) + { + GPBUtil::checkString($var, True); + $this->effective_maintenance_version = $var; + + return $this; + } + + /** + * Output only. This field is used to determine the available maintenance + * versions for the self service update. + * + * Generated from protobuf field repeated string available_maintenance_versions = 51 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return \Google\Protobuf\Internal\RepeatedField + */ + public function getAvailableMaintenanceVersions() + { + return $this->available_maintenance_versions; + } + + /** + * Output only. This field is used to determine the available maintenance + * versions for the self service update. + * + * Generated from protobuf field repeated string available_maintenance_versions = 51 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param array|\Google\Protobuf\Internal\RepeatedField $var + * @return $this + */ + public function setAvailableMaintenanceVersions($var) + { + $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING); + $this->available_maintenance_versions = $arr; + + return $this; + } + + /** + * Optional. Immutable. Deprecated, do not use. + * + * Generated from protobuf field bool allow_fewer_zones_deployment = 54 [deprecated = true, (.google.api.field_behavior) = OPTIONAL, (.google.api.field_behavior) = IMMUTABLE]; + * @return bool + * @deprecated + */ + public function getAllowFewerZonesDeployment() + { + if ($this->allow_fewer_zones_deployment !== false) { + @trigger_error('allow_fewer_zones_deployment is deprecated.', E_USER_DEPRECATED); + } + return $this->allow_fewer_zones_deployment; + } + + /** + * Optional. Immutable. Deprecated, do not use. + * + * Generated from protobuf field bool allow_fewer_zones_deployment = 54 [deprecated = true, (.google.api.field_behavior) = OPTIONAL, (.google.api.field_behavior) = IMMUTABLE]; + * @param bool $var + * @return $this + * @deprecated + */ + public function setAllowFewerZonesDeployment($var) + { + @trigger_error('allow_fewer_zones_deployment is deprecated.', E_USER_DEPRECATED); + GPBUtil::checkBool($var); + $this->allow_fewer_zones_deployment = $var; + + return $this; + } + /** * @return string */ diff --git a/Memorystore/src/V1/resources/memorystore_descriptor_config.php b/Memorystore/src/V1/resources/memorystore_descriptor_config.php index edc33ac8f96a..53fddcdc41df 100644 --- a/Memorystore/src/V1/resources/memorystore_descriptor_config.php +++ b/Memorystore/src/V1/resources/memorystore_descriptor_config.php @@ -302,6 +302,8 @@ 'templateMap' => [ 'backup' => 'projects/{project}/locations/{location}/backupCollections/{backup_collection}/backups/{backup}', 'backupCollection' => 'projects/{project}/locations/{location}/backupCollections/{backup_collection}', + 'cryptoKey' => 'projects/{project}/locations/{location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}', + 'cryptoKeyVersion' => 'projects/{project}/locations/{location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}/cryptoKeyVersions/{crypto_key_version}', 'forwardingRule' => 'projects/{project}/regions/{region}/forwardingRules/{forwarding_rule}', 'instance' => 'projects/{project}/locations/{location}/instances/{instance}', 'location' => 'projects/{project}/locations/{location}', diff --git a/Memorystore/tests/Unit/V1/Client/MemorystoreClientTest.php b/Memorystore/tests/Unit/V1/Client/MemorystoreClientTest.php index 2df68882be41..8ad219c42b57 100644 --- a/Memorystore/tests/Unit/V1/Client/MemorystoreClientTest.php +++ b/Memorystore/tests/Unit/V1/Client/MemorystoreClientTest.php @@ -118,9 +118,16 @@ public function backupInstanceTest() $shardCount = 495377042; $engineVersion = 'engineVersion-618177573'; $deletionProtectionEnabled = true; + $simulateMaintenanceEvent = false; $ondemandMaintenance = true; + $satisfiesPzs = false; + $satisfiesPzi = false; $asyncInstanceEndpointsDeletionEnabled = true; + $kmsKey = 'kmsKey-591635343'; $backupCollection = 'backupCollection-1182285509'; + $maintenanceVersion = 'maintenanceVersion-588975188'; + $effectiveMaintenanceVersion = 'effectiveMaintenanceVersion1518555412'; + $allowFewerZonesDeployment = false; $expectedResponse = new Instance(); $expectedResponse->setName($name2); $expectedResponse->setUid($uid); @@ -128,9 +135,16 @@ public function backupInstanceTest() $expectedResponse->setShardCount($shardCount); $expectedResponse->setEngineVersion($engineVersion); $expectedResponse->setDeletionProtectionEnabled($deletionProtectionEnabled); + $expectedResponse->setSimulateMaintenanceEvent($simulateMaintenanceEvent); $expectedResponse->setOndemandMaintenance($ondemandMaintenance); + $expectedResponse->setSatisfiesPzs($satisfiesPzs); + $expectedResponse->setSatisfiesPzi($satisfiesPzi); $expectedResponse->setAsyncInstanceEndpointsDeletionEnabled($asyncInstanceEndpointsDeletionEnabled); + $expectedResponse->setKmsKey($kmsKey); $expectedResponse->setBackupCollection($backupCollection); + $expectedResponse->setMaintenanceVersion($maintenanceVersion); + $expectedResponse->setEffectiveMaintenanceVersion($effectiveMaintenanceVersion); + $expectedResponse->setAllowFewerZonesDeployment($allowFewerZonesDeployment); $anyResponse = new Any(); $anyResponse->setValue($expectedResponse->serializeToString()); $completeOperation = new Operation(); @@ -258,9 +272,16 @@ public function createInstanceTest() $shardCount = 495377042; $engineVersion = 'engineVersion-618177573'; $deletionProtectionEnabled = true; + $simulateMaintenanceEvent = false; $ondemandMaintenance = true; + $satisfiesPzs = false; + $satisfiesPzi = false; $asyncInstanceEndpointsDeletionEnabled = true; + $kmsKey = 'kmsKey-591635343'; $backupCollection = 'backupCollection-1182285509'; + $maintenanceVersion = 'maintenanceVersion-588975188'; + $effectiveMaintenanceVersion = 'effectiveMaintenanceVersion1518555412'; + $allowFewerZonesDeployment = false; $expectedResponse = new Instance(); $expectedResponse->setName($name); $expectedResponse->setUid($uid); @@ -268,9 +289,16 @@ public function createInstanceTest() $expectedResponse->setShardCount($shardCount); $expectedResponse->setEngineVersion($engineVersion); $expectedResponse->setDeletionProtectionEnabled($deletionProtectionEnabled); + $expectedResponse->setSimulateMaintenanceEvent($simulateMaintenanceEvent); $expectedResponse->setOndemandMaintenance($ondemandMaintenance); + $expectedResponse->setSatisfiesPzs($satisfiesPzs); + $expectedResponse->setSatisfiesPzi($satisfiesPzi); $expectedResponse->setAsyncInstanceEndpointsDeletionEnabled($asyncInstanceEndpointsDeletionEnabled); + $expectedResponse->setKmsKey($kmsKey); $expectedResponse->setBackupCollection($backupCollection); + $expectedResponse->setMaintenanceVersion($maintenanceVersion); + $expectedResponse->setEffectiveMaintenanceVersion($effectiveMaintenanceVersion); + $expectedResponse->setAllowFewerZonesDeployment($allowFewerZonesDeployment); $anyResponse = new Any(); $anyResponse->setValue($expectedResponse->serializeToString()); $completeOperation = new Operation(); @@ -860,12 +888,16 @@ public function getBackupCollectionTest() $instance = 'instance555127957'; $kmsKey = 'kmsKey-591635343'; $uid = 'uid115792'; + $totalBackupSizeBytes = 665105137; + $totalBackupCount = 775900525; $expectedResponse = new BackupCollection(); $expectedResponse->setName($name2); $expectedResponse->setInstanceUid($instanceUid); $expectedResponse->setInstance($instance); $expectedResponse->setKmsKey($kmsKey); $expectedResponse->setUid($uid); + $expectedResponse->setTotalBackupSizeBytes($totalBackupSizeBytes); + $expectedResponse->setTotalBackupCount($totalBackupCount); $transport->addResponse($expectedResponse); // Mock request $formattedName = $gapicClient->backupCollectionName('[PROJECT]', '[LOCATION]', '[BACKUP_COLLECTION]'); @@ -999,9 +1031,16 @@ public function getInstanceTest() $shardCount = 495377042; $engineVersion = 'engineVersion-618177573'; $deletionProtectionEnabled = true; + $simulateMaintenanceEvent = false; $ondemandMaintenance = true; + $satisfiesPzs = false; + $satisfiesPzi = false; $asyncInstanceEndpointsDeletionEnabled = true; + $kmsKey = 'kmsKey-591635343'; $backupCollection = 'backupCollection-1182285509'; + $maintenanceVersion = 'maintenanceVersion-588975188'; + $effectiveMaintenanceVersion = 'effectiveMaintenanceVersion1518555412'; + $allowFewerZonesDeployment = false; $expectedResponse = new Instance(); $expectedResponse->setName($name2); $expectedResponse->setUid($uid); @@ -1009,9 +1048,16 @@ public function getInstanceTest() $expectedResponse->setShardCount($shardCount); $expectedResponse->setEngineVersion($engineVersion); $expectedResponse->setDeletionProtectionEnabled($deletionProtectionEnabled); + $expectedResponse->setSimulateMaintenanceEvent($simulateMaintenanceEvent); $expectedResponse->setOndemandMaintenance($ondemandMaintenance); + $expectedResponse->setSatisfiesPzs($satisfiesPzs); + $expectedResponse->setSatisfiesPzi($satisfiesPzi); $expectedResponse->setAsyncInstanceEndpointsDeletionEnabled($asyncInstanceEndpointsDeletionEnabled); + $expectedResponse->setKmsKey($kmsKey); $expectedResponse->setBackupCollection($backupCollection); + $expectedResponse->setMaintenanceVersion($maintenanceVersion); + $expectedResponse->setEffectiveMaintenanceVersion($effectiveMaintenanceVersion); + $expectedResponse->setAllowFewerZonesDeployment($allowFewerZonesDeployment); $transport->addResponse($expectedResponse); // Mock request $formattedName = $gapicClient->instanceName('[PROJECT]', '[LOCATION]', '[INSTANCE]'); @@ -1305,9 +1351,16 @@ public function rescheduleMaintenanceTest() $shardCount = 495377042; $engineVersion = 'engineVersion-618177573'; $deletionProtectionEnabled = true; + $simulateMaintenanceEvent = false; $ondemandMaintenance = true; + $satisfiesPzs = false; + $satisfiesPzi = false; $asyncInstanceEndpointsDeletionEnabled = true; + $kmsKey = 'kmsKey-591635343'; $backupCollection = 'backupCollection-1182285509'; + $maintenanceVersion = 'maintenanceVersion-588975188'; + $effectiveMaintenanceVersion = 'effectiveMaintenanceVersion1518555412'; + $allowFewerZonesDeployment = false; $expectedResponse = new Instance(); $expectedResponse->setName($name2); $expectedResponse->setUid($uid); @@ -1315,9 +1368,16 @@ public function rescheduleMaintenanceTest() $expectedResponse->setShardCount($shardCount); $expectedResponse->setEngineVersion($engineVersion); $expectedResponse->setDeletionProtectionEnabled($deletionProtectionEnabled); + $expectedResponse->setSimulateMaintenanceEvent($simulateMaintenanceEvent); $expectedResponse->setOndemandMaintenance($ondemandMaintenance); + $expectedResponse->setSatisfiesPzs($satisfiesPzs); + $expectedResponse->setSatisfiesPzi($satisfiesPzi); $expectedResponse->setAsyncInstanceEndpointsDeletionEnabled($asyncInstanceEndpointsDeletionEnabled); + $expectedResponse->setKmsKey($kmsKey); $expectedResponse->setBackupCollection($backupCollection); + $expectedResponse->setMaintenanceVersion($maintenanceVersion); + $expectedResponse->setEffectiveMaintenanceVersion($effectiveMaintenanceVersion); + $expectedResponse->setAllowFewerZonesDeployment($allowFewerZonesDeployment); $anyResponse = new Any(); $anyResponse->setValue($expectedResponse->serializeToString()); $completeOperation = new Operation(); @@ -1449,9 +1509,16 @@ public function updateInstanceTest() $shardCount = 495377042; $engineVersion = 'engineVersion-618177573'; $deletionProtectionEnabled = true; + $simulateMaintenanceEvent = false; $ondemandMaintenance = true; + $satisfiesPzs = false; + $satisfiesPzi = false; $asyncInstanceEndpointsDeletionEnabled = true; + $kmsKey = 'kmsKey-591635343'; $backupCollection = 'backupCollection-1182285509'; + $maintenanceVersion = 'maintenanceVersion-588975188'; + $effectiveMaintenanceVersion = 'effectiveMaintenanceVersion1518555412'; + $allowFewerZonesDeployment = false; $expectedResponse = new Instance(); $expectedResponse->setName($name); $expectedResponse->setUid($uid); @@ -1459,9 +1526,16 @@ public function updateInstanceTest() $expectedResponse->setShardCount($shardCount); $expectedResponse->setEngineVersion($engineVersion); $expectedResponse->setDeletionProtectionEnabled($deletionProtectionEnabled); + $expectedResponse->setSimulateMaintenanceEvent($simulateMaintenanceEvent); $expectedResponse->setOndemandMaintenance($ondemandMaintenance); + $expectedResponse->setSatisfiesPzs($satisfiesPzs); + $expectedResponse->setSatisfiesPzi($satisfiesPzi); $expectedResponse->setAsyncInstanceEndpointsDeletionEnabled($asyncInstanceEndpointsDeletionEnabled); + $expectedResponse->setKmsKey($kmsKey); $expectedResponse->setBackupCollection($backupCollection); + $expectedResponse->setMaintenanceVersion($maintenanceVersion); + $expectedResponse->setEffectiveMaintenanceVersion($effectiveMaintenanceVersion); + $expectedResponse->setAllowFewerZonesDeployment($allowFewerZonesDeployment); $anyResponse = new Any(); $anyResponse->setValue($expectedResponse->serializeToString()); $completeOperation = new Operation(); @@ -1717,9 +1791,16 @@ public function backupInstanceAsyncTest() $shardCount = 495377042; $engineVersion = 'engineVersion-618177573'; $deletionProtectionEnabled = true; + $simulateMaintenanceEvent = false; $ondemandMaintenance = true; + $satisfiesPzs = false; + $satisfiesPzi = false; $asyncInstanceEndpointsDeletionEnabled = true; + $kmsKey = 'kmsKey-591635343'; $backupCollection = 'backupCollection-1182285509'; + $maintenanceVersion = 'maintenanceVersion-588975188'; + $effectiveMaintenanceVersion = 'effectiveMaintenanceVersion1518555412'; + $allowFewerZonesDeployment = false; $expectedResponse = new Instance(); $expectedResponse->setName($name2); $expectedResponse->setUid($uid); @@ -1727,9 +1808,16 @@ public function backupInstanceAsyncTest() $expectedResponse->setShardCount($shardCount); $expectedResponse->setEngineVersion($engineVersion); $expectedResponse->setDeletionProtectionEnabled($deletionProtectionEnabled); + $expectedResponse->setSimulateMaintenanceEvent($simulateMaintenanceEvent); $expectedResponse->setOndemandMaintenance($ondemandMaintenance); + $expectedResponse->setSatisfiesPzs($satisfiesPzs); + $expectedResponse->setSatisfiesPzi($satisfiesPzi); $expectedResponse->setAsyncInstanceEndpointsDeletionEnabled($asyncInstanceEndpointsDeletionEnabled); + $expectedResponse->setKmsKey($kmsKey); $expectedResponse->setBackupCollection($backupCollection); + $expectedResponse->setMaintenanceVersion($maintenanceVersion); + $expectedResponse->setEffectiveMaintenanceVersion($effectiveMaintenanceVersion); + $expectedResponse->setAllowFewerZonesDeployment($allowFewerZonesDeployment); $anyResponse = new Any(); $anyResponse->setValue($expectedResponse->serializeToString()); $completeOperation = new Operation();