From c1e7dc58d8ebf4e24867519fc6e1a5e50889fec7 Mon Sep 17 00:00:00 2001 From: Aayush Kadam Date: Mon, 9 Dec 2024 09:22:01 +0000 Subject: [PATCH 1/5] Add samples for Backup Schedule feature. * CreateBackupSchedule * GetBackupSchedule * ListBackupSchedules * UpdateBackupSchedule * DeleteBackupSchedule --- spanner/src/create_backup_schedule.php | 88 +++++++++++ spanner/src/delete_backup_schedule.php | 68 ++++++++ spanner/src/get_backup_schedule.php | 69 +++++++++ spanner/src/list_backup_schedules.php | 65 ++++++++ spanner/src/update_backup_schedule.php | 101 ++++++++++++ spanner/test/spannerBackupScheduleTest.php | 171 +++++++++++++++++++++ 6 files changed, 562 insertions(+) create mode 100644 spanner/src/create_backup_schedule.php create mode 100644 spanner/src/delete_backup_schedule.php create mode 100644 spanner/src/get_backup_schedule.php create mode 100644 spanner/src/list_backup_schedules.php create mode 100644 spanner/src/update_backup_schedule.php create mode 100644 spanner/test/spannerBackupScheduleTest.php diff --git a/spanner/src/create_backup_schedule.php b/spanner/src/create_backup_schedule.php new file mode 100644 index 0000000000..875318466d --- /dev/null +++ b/spanner/src/create_backup_schedule.php @@ -0,0 +1,88 @@ + setEncryptionType(EncryptionType::USE_DATABASE_ENCRYPTION); + $backupSchedule = new BackupSchedule([ + 'full_backup_spec' => new FullBackupSpec(), + 'retention_duration' => (new Duration()) + ->setSeconds(24 * 60 * 60), + 'spec' => new BackupScheduleSpec([ + 'cron_spec' => new CrontabSpec([ + 'text' => '30 12 * * *' + ]), + ]), + 'encryption_config' => $encryptionConfig, + ]); + $request = new CreateBackupScheduleRequest([ + 'parent' => $databaseFullName, + 'backup_schedule_id' => $backupScheduleId, + 'backup_schedule' => $backupSchedule, + ]); + + $operation = $databaseAdminClient->createBackupSchedule($request); + + printf('Created backup scehedule %s' . PHP_EOL, $operation->getName()); +} +// [END spanner_create_backup_schedule] + +// The following 2 lines are only needed to run the samples +require_once __DIR__ . '/../../testing/sample_helpers.php'; +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); + diff --git a/spanner/src/delete_backup_schedule.php b/spanner/src/delete_backup_schedule.php new file mode 100644 index 0000000000..d36c12225d --- /dev/null +++ b/spanner/src/delete_backup_schedule.php @@ -0,0 +1,68 @@ + strval($backupScheduleName), + ]); + + $databaseAdminClient->deleteBackupSchedule($request); + printf('Deleted backup scehedule %s' . PHP_EOL, $backupScheduleName); +} +// [END spanner_delete_backup_schedule] + +// The following 2 lines are only needed to run the samples +require_once __DIR__ . '/../../testing/sample_helpers.php'; +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); \ No newline at end of file diff --git a/spanner/src/get_backup_schedule.php b/spanner/src/get_backup_schedule.php new file mode 100644 index 0000000000..c23e643dd2 --- /dev/null +++ b/spanner/src/get_backup_schedule.php @@ -0,0 +1,69 @@ + $backupScheduleName, + ]); + + $operation = $databaseAdminClient->getBackupSchedule($request); + + printf('Fetched backup scehedule %s' . PHP_EOL, $operation->getName()); +} +// [END spanner_get_backup_schedule] + +// The following 2 lines are only needed to run the samples +require_once __DIR__ . '/../../testing/sample_helpers.php'; +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); \ No newline at end of file diff --git a/spanner/src/list_backup_schedules.php b/spanner/src/list_backup_schedules.php new file mode 100644 index 0000000000..482e5d4c50 --- /dev/null +++ b/spanner/src/list_backup_schedules.php @@ -0,0 +1,65 @@ + $databaseFullName, + ]); + $operation = $databaseAdminClient->listBackupSchedules($request); + + printf("Backup schedules for database %s" . PHP_EOL, $databaseFullName); + foreach($operation as $schedule) { + printf("Backup schedule: %s" . PHP_EOL, $schedule->getName()); + } +} +// [END spanner_list_backup_schedules] + +// The following 2 lines are only needed to run the samples +require_once __DIR__ . '/../../testing/sample_helpers.php'; +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); + diff --git a/spanner/src/update_backup_schedule.php b/spanner/src/update_backup_schedule.php new file mode 100644 index 0000000000..887097361a --- /dev/null +++ b/spanner/src/update_backup_schedule.php @@ -0,0 +1,101 @@ + EncryptionType::USE_DATABASE_ENCRYPTION, + ]); + $backupScheduleName = sprintf( + 'projects/%s/instances/%s/databases/%s/backupSchedules/%s', + $projectId, + $instanceId, + $databaseId, + $backupScheduleId); + $backupSchedule = new BackupSchedule([ + 'name' => $backupScheduleName, + 'full_backup_spec' => new FullBackupSpec(), + 'retention_duration' => (new Duration()) + ->setSeconds(48 * 60 * 60), + 'spec' => new BackupScheduleSpec([ + 'cron_spec' => new CrontabSpec([ + 'text' => '45 15 * * *' + ]), + ]), + 'encryption_config' => $encryptionConfig, + ]); + $fieldMask = (new FieldMask()) + ->setPaths([ + 'retention_duration', + 'spec.cron_spec.text', + 'encryption_config', + ]); + + $request = new UpdateBackupScheduleRequest([ + 'backup_schedule' => $backupSchedule, + 'update_mask' => $fieldMask, + ]); + + $operation = $databaseAdminClient->updateBackupSchedule($request); + + printf('Updated backup scehedule %s' . PHP_EOL, $operation->getName()); +} +// [END spanner_update_backup_schedule] + +// The following 2 lines are only needed to run the samples +require_once __DIR__ . '/../../testing/sample_helpers.php'; +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); + diff --git a/spanner/test/spannerBackupScheduleTest.php b/spanner/test/spannerBackupScheduleTest.php new file mode 100644 index 0000000000..5ceaed4b34 --- /dev/null +++ b/spanner/test/spannerBackupScheduleTest.php @@ -0,0 +1,171 @@ + self::$projectId, + ]); + + self::$databaseId = 'your-database-id'; + self::$backupScheduleId = 'backup-schedule-' . self::$databaseId; + self::$instance = $spanner->instance(self::$instanceId); + } + + /** + * @test + */ + public function testCreateBackupSchedule() + { + $output = $this->runFunctionSnippet('create_backup_schedule', [ + self::$databaseId, + self::$backupScheduleId, + ]); + $this->assertStringContainsString(self::$projectId, $output); + $this->assertStringContainsString(self::$instanceId, $output); + $this->assertStringContainsString(self::$databaseId, $output); + $this->assertStringContainsString(self::$backupScheduleId, $output); + } + + /** + * @test + * @depends testCreateBackupSchedule + */ + public function testGetBackupSchedule() + { + $output = $this->runFunctionSnippet('get_backup_schedule', [ + self::$databaseId, + self::$backupScheduleId, + ]); + $this->assertStringContainsString(self::$projectId, $output); + $this->assertStringContainsString(self::$instanceId, $output); + $this->assertStringContainsString(self::$databaseId, $output); + $this->assertStringContainsString(self::$backupScheduleId, $output); + } + + /** + * @test + * @depends testCreateBackupSchedule + */ + public function testListBackupSchedules() + { + $output = $this->runFunctionSnippet('list_backup_schedules', [ + self::$databaseId, + ]); + $this->assertStringContainsString(self::$projectId, $output); + $this->assertStringContainsString(self::$instanceId, $output); + $this->assertStringContainsString(self::$databaseId, $output); + } + + /** + * @test + * @depends testCreateBackupSchedule + */ + public function testUpdateBackupSchedule() + { + $output = $this->runFunctionSnippet('update_backup_schedule', [ + self::$databaseId, + self::$backupScheduleId, + ]); + $this->assertStringContainsString(self::$projectId, $output); + $this->assertStringContainsString(self::$instanceId, $output); + $this->assertStringContainsString(self::$databaseId, $output); + $this->assertStringContainsString(self::$backupScheduleId, $output); + } + + /** + * @test + * @depends testCreateBackupSchedule + */ + public function testDeleteBackupSchedule() + { + $output = $this->runFunctionSnippet('delete_backup_schedule', [ + self::$databaseId, + self::$backupScheduleId, + ]); + $this->assertStringContainsString(self::$projectId, $output); + $this->assertStringContainsString(self::$instanceId, $output); + $this->assertStringContainsString(self::$databaseId, $output); + $this->assertStringContainsString(self::$backupScheduleId, $output); + } + + private function runFunctionSnippet($sampleName, $params = []) + { + return $this->traitRunFunctionSnippet( + $sampleName, + array_merge([self::$projectId, self::$instanceId], array_values($params)) + ); + } + + public static function tearDownAfterClass(): void + { + if (self::$instance->exists()) { + $backoff = new ExponentialBackoff(3); + + /** @var Database $db */ + foreach (self::$instance->databases() as $db) { + if (false !== strpos($db->name(), self::$databaseId)) { + $backoff->execute(function () use ($db) { + $db->drop(); + }); + } + } + } + } +} From 3d69d156ffe675328a572f0ad65b0615dee38069 Mon Sep 17 00:00:00 2001 From: Aayush Kadam Date: Tue, 10 Dec 2024 04:48:31 +0000 Subject: [PATCH 2/5] Fix lint --- spanner/src/create_backup_schedule.php | 9 ++++----- spanner/src/delete_backup_schedule.php | 5 +++-- spanner/src/get_backup_schedule.php | 5 +++-- spanner/src/list_backup_schedules.php | 5 ++--- spanner/src/update_backup_schedule.php | 12 ++++++------ spanner/test/spannerBackupScheduleTest.php | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/spanner/src/create_backup_schedule.php b/spanner/src/create_backup_schedule.php index 875318466d..3a6ff43ee5 100644 --- a/spanner/src/create_backup_schedule.php +++ b/spanner/src/create_backup_schedule.php @@ -57,8 +57,8 @@ function create_backup_schedule( $databaseFullName = DatabaseAdminClient::databaseName($projectId, $instanceId, $databaseId); printf('%s', $databaseFullName); - $encryptionConfig = ( new CreateBackupEncryptionConfig() ) - -> setEncryptionType(EncryptionType::USE_DATABASE_ENCRYPTION); + $encryptionConfig = (new CreateBackupEncryptionConfig()) + ->setEncryptionType(EncryptionType::USE_DATABASE_ENCRYPTION); $backupSchedule = new BackupSchedule([ 'full_backup_spec' => new FullBackupSpec(), 'retention_duration' => (new Duration()) @@ -78,11 +78,10 @@ function create_backup_schedule( $operation = $databaseAdminClient->createBackupSchedule($request); - printf('Created backup scehedule %s' . PHP_EOL, $operation->getName()); + printf('Created backup scehedule %s' . PHP_EOL, $operation->getName()); } // [END spanner_create_backup_schedule] // The following 2 lines are only needed to run the samples require_once __DIR__ . '/../../testing/sample_helpers.php'; -\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); - +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); \ No newline at end of file diff --git a/spanner/src/delete_backup_schedule.php b/spanner/src/delete_backup_schedule.php index d36c12225d..558e611ecf 100644 --- a/spanner/src/delete_backup_schedule.php +++ b/spanner/src/delete_backup_schedule.php @@ -49,11 +49,12 @@ function delete_backup_schedule( $databaseAdminClient = new DatabaseAdminClient(); $backupScheduleName = sprintf( - 'projects/%s/instances/%s/databases/%s/backupSchedules/%s', + 'projects/%s/instances/%s/databases/%s/backupSchedules/%s', $projectId, $instanceId, $databaseId, - $backupScheduleId); + $backupScheduleId + ); $request = new DeleteBackupScheduleRequest([ 'name' => strval($backupScheduleName), ]); diff --git a/spanner/src/get_backup_schedule.php b/spanner/src/get_backup_schedule.php index c23e643dd2..2ee8a98cb3 100644 --- a/spanner/src/get_backup_schedule.php +++ b/spanner/src/get_backup_schedule.php @@ -49,11 +49,12 @@ function get_backup_schedule( $databaseAdminClient = new DatabaseAdminClient(); $backupScheduleName = sprintf( - 'projects/%s/instances/%s/databases/%s/backupSchedules/%s', + 'projects/%s/instances/%s/databases/%s/backupSchedules/%s', $projectId, $instanceId, $databaseId, - $backupScheduleId); + $backupScheduleId + ); $request = new GetBackupScheduleRequest([ 'name' => $backupScheduleName, ]); diff --git a/spanner/src/list_backup_schedules.php b/spanner/src/list_backup_schedules.php index 482e5d4c50..79282846db 100644 --- a/spanner/src/list_backup_schedules.php +++ b/spanner/src/list_backup_schedules.php @@ -53,7 +53,7 @@ function list_backup_schedules( $operation = $databaseAdminClient->listBackupSchedules($request); printf("Backup schedules for database %s" . PHP_EOL, $databaseFullName); - foreach($operation as $schedule) { + foreach ($operation as $schedule) { printf("Backup schedule: %s" . PHP_EOL, $schedule->getName()); } } @@ -61,5 +61,4 @@ function list_backup_schedules( // The following 2 lines are only needed to run the samples require_once __DIR__ . '/../../testing/sample_helpers.php'; -\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); - +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); \ No newline at end of file diff --git a/spanner/src/update_backup_schedule.php b/spanner/src/update_backup_schedule.php index 887097361a..1d16d4d25f 100644 --- a/spanner/src/update_backup_schedule.php +++ b/spanner/src/update_backup_schedule.php @@ -60,11 +60,12 @@ function update_backup_schedule( 'encryption_type' => EncryptionType::USE_DATABASE_ENCRYPTION, ]); $backupScheduleName = sprintf( - 'projects/%s/instances/%s/databases/%s/backupSchedules/%s', + 'projects/%s/instances/%s/databases/%s/backupSchedules/%s', $projectId, $instanceId, $databaseId, - $backupScheduleId); + $backupScheduleId + ); $backupSchedule = new BackupSchedule([ 'name' => $backupScheduleName, 'full_backup_spec' => new FullBackupSpec(), @@ -82,7 +83,7 @@ function update_backup_schedule( 'retention_duration', 'spec.cron_spec.text', 'encryption_config', - ]); + ]); $request = new UpdateBackupScheduleRequest([ 'backup_schedule' => $backupSchedule, @@ -91,11 +92,10 @@ function update_backup_schedule( $operation = $databaseAdminClient->updateBackupSchedule($request); - printf('Updated backup scehedule %s' . PHP_EOL, $operation->getName()); + printf('Updated backup scehedule %s' . PHP_EOL, $operation->getName()); } // [END spanner_update_backup_schedule] // The following 2 lines are only needed to run the samples require_once __DIR__ . '/../../testing/sample_helpers.php'; -\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); - +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); \ No newline at end of file diff --git a/spanner/test/spannerBackupScheduleTest.php b/spanner/test/spannerBackupScheduleTest.php index 5ceaed4b34..2c99645d87 100644 --- a/spanner/test/spannerBackupScheduleTest.php +++ b/spanner/test/spannerBackupScheduleTest.php @@ -168,4 +168,4 @@ public static function tearDownAfterClass(): void } } } -} +} \ No newline at end of file From a58dde3a5a642535fd62762795d182a8b7482f0c Mon Sep 17 00:00:00 2001 From: Aayush Kadam Date: Wed, 11 Dec 2024 09:31:05 +0000 Subject: [PATCH 3/5] Fix lint --- spanner/src/create_backup_schedule.php | 2 +- spanner/src/delete_backup_schedule.php | 2 +- spanner/src/get_backup_schedule.php | 2 +- spanner/src/list_backup_schedules.php | 6 +++--- spanner/src/update_backup_schedule.php | 2 +- spanner/test/spannerBackupScheduleTest.php | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spanner/src/create_backup_schedule.php b/spanner/src/create_backup_schedule.php index 3a6ff43ee5..99cf3e6377 100644 --- a/spanner/src/create_backup_schedule.php +++ b/spanner/src/create_backup_schedule.php @@ -84,4 +84,4 @@ function create_backup_schedule( // The following 2 lines are only needed to run the samples require_once __DIR__ . '/../../testing/sample_helpers.php'; -\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); \ No newline at end of file +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); diff --git a/spanner/src/delete_backup_schedule.php b/spanner/src/delete_backup_schedule.php index 558e611ecf..309e29ca93 100644 --- a/spanner/src/delete_backup_schedule.php +++ b/spanner/src/delete_backup_schedule.php @@ -66,4 +66,4 @@ function delete_backup_schedule( // The following 2 lines are only needed to run the samples require_once __DIR__ . '/../../testing/sample_helpers.php'; -\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); \ No newline at end of file +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); diff --git a/spanner/src/get_backup_schedule.php b/spanner/src/get_backup_schedule.php index 2ee8a98cb3..59e7619fa8 100644 --- a/spanner/src/get_backup_schedule.php +++ b/spanner/src/get_backup_schedule.php @@ -67,4 +67,4 @@ function get_backup_schedule( // The following 2 lines are only needed to run the samples require_once __DIR__ . '/../../testing/sample_helpers.php'; -\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); \ No newline at end of file +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); diff --git a/spanner/src/list_backup_schedules.php b/spanner/src/list_backup_schedules.php index 79282846db..8536ca3b51 100644 --- a/spanner/src/list_backup_schedules.php +++ b/spanner/src/list_backup_schedules.php @@ -52,13 +52,13 @@ function list_backup_schedules( ]); $operation = $databaseAdminClient->listBackupSchedules($request); - printf("Backup schedules for database %s" . PHP_EOL, $databaseFullName); + printf('Backup schedules for database %s' . PHP_EOL, $databaseFullName); foreach ($operation as $schedule) { - printf("Backup schedule: %s" . PHP_EOL, $schedule->getName()); + printf('Backup schedule: %s' . PHP_EOL, $schedule->getName()); } } // [END spanner_list_backup_schedules] // The following 2 lines are only needed to run the samples require_once __DIR__ . '/../../testing/sample_helpers.php'; -\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); \ No newline at end of file +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); diff --git a/spanner/src/update_backup_schedule.php b/spanner/src/update_backup_schedule.php index 1d16d4d25f..dbc43363d0 100644 --- a/spanner/src/update_backup_schedule.php +++ b/spanner/src/update_backup_schedule.php @@ -98,4 +98,4 @@ function update_backup_schedule( // The following 2 lines are only needed to run the samples require_once __DIR__ . '/../../testing/sample_helpers.php'; -\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); \ No newline at end of file +\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv); diff --git a/spanner/test/spannerBackupScheduleTest.php b/spanner/test/spannerBackupScheduleTest.php index 2c99645d87..5ceaed4b34 100644 --- a/spanner/test/spannerBackupScheduleTest.php +++ b/spanner/test/spannerBackupScheduleTest.php @@ -168,4 +168,4 @@ public static function tearDownAfterClass(): void } } } -} \ No newline at end of file +} From 4d6584a98fd9796be64bdc1ff7209223f465551f Mon Sep 17 00:00:00 2001 From: Aayush Kadam Date: Thu, 12 Dec 2024 10:40:23 +0000 Subject: [PATCH 4/5] Fix variable names --- spanner/src/create_backup_schedule.php | 4 ++-- spanner/src/get_backup_schedule.php | 4 ++-- spanner/src/list_backup_schedules.php | 4 ++-- spanner/src/update_backup_schedule.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spanner/src/create_backup_schedule.php b/spanner/src/create_backup_schedule.php index 99cf3e6377..bd9971405e 100644 --- a/spanner/src/create_backup_schedule.php +++ b/spanner/src/create_backup_schedule.php @@ -76,9 +76,9 @@ function create_backup_schedule( 'backup_schedule' => $backupSchedule, ]); - $operation = $databaseAdminClient->createBackupSchedule($request); + $created_backup_schedule = $databaseAdminClient->createBackupSchedule($request); - printf('Created backup scehedule %s' . PHP_EOL, $operation->getName()); + printf('Created backup scehedule %s' . PHP_EOL, $created_backup_schedule->getName()); } // [END spanner_create_backup_schedule] diff --git a/spanner/src/get_backup_schedule.php b/spanner/src/get_backup_schedule.php index 59e7619fa8..4e1e381360 100644 --- a/spanner/src/get_backup_schedule.php +++ b/spanner/src/get_backup_schedule.php @@ -59,9 +59,9 @@ function get_backup_schedule( 'name' => $backupScheduleName, ]); - $operation = $databaseAdminClient->getBackupSchedule($request); + $backup_schedule = $databaseAdminClient->getBackupSchedule($request); - printf('Fetched backup scehedule %s' . PHP_EOL, $operation->getName()); + printf('Fetched backup scehedule %s' . PHP_EOL, $backup_schedule->getName()); } // [END spanner_get_backup_schedule] diff --git a/spanner/src/list_backup_schedules.php b/spanner/src/list_backup_schedules.php index 8536ca3b51..9e6a2caa7e 100644 --- a/spanner/src/list_backup_schedules.php +++ b/spanner/src/list_backup_schedules.php @@ -50,10 +50,10 @@ function list_backup_schedules( $request = new ListBackupSchedulesRequest([ 'parent' => $databaseFullName, ]); - $operation = $databaseAdminClient->listBackupSchedules($request); + $backup_schedules = $databaseAdminClient->listBackupSchedules($request); printf('Backup schedules for database %s' . PHP_EOL, $databaseFullName); - foreach ($operation as $schedule) { + foreach ($backup_schedules as $schedule) { printf('Backup schedule: %s' . PHP_EOL, $schedule->getName()); } } diff --git a/spanner/src/update_backup_schedule.php b/spanner/src/update_backup_schedule.php index dbc43363d0..9b366e7c82 100644 --- a/spanner/src/update_backup_schedule.php +++ b/spanner/src/update_backup_schedule.php @@ -90,9 +90,9 @@ function update_backup_schedule( 'update_mask' => $fieldMask, ]); - $operation = $databaseAdminClient->updateBackupSchedule($request); + $updated_backup_schedule = $databaseAdminClient->updateBackupSchedule($request); - printf('Updated backup scehedule %s' . PHP_EOL, $operation->getName()); + printf('Updated backup scehedule %s' . PHP_EOL, $updated_backup_schedule->getName()); } // [END spanner_update_backup_schedule] From 3e52e23dbb4067a6df524bfee1bcab6f4bcf78b6 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Tue, 17 Dec 2024 12:33:13 -0800 Subject: [PATCH 5/5] remove hardcodeed database id --- spanner/test/spannerBackupScheduleTest.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spanner/test/spannerBackupScheduleTest.php b/spanner/test/spannerBackupScheduleTest.php index 5ceaed4b34..d71589a331 100644 --- a/spanner/test/spannerBackupScheduleTest.php +++ b/spanner/test/spannerBackupScheduleTest.php @@ -54,16 +54,13 @@ public static function setUpBeforeClass(): void if (!extension_loaded('grpc')) { self::markTestSkipped('Must enable grpc extension.'); } - if ('true' !== getenv('GOOGLE_SPANNER_RUN_BACKUP_SCHEDULE_TESTS')) { - self::markTestSkipped('Skipping backup schedule tests.'); - } self::$instanceId = self::requireEnv('GOOGLE_SPANNER_INSTANCE_ID'); $spanner = new SpannerClient([ 'projectId' => self::$projectId, ]); - self::$databaseId = 'your-database-id'; + self::$databaseId = self::requireEnv('GOOGLE_SPANNER_DATABASE_ID'); self::$backupScheduleId = 'backup-schedule-' . self::$databaseId; self::$instance = $spanner->instance(self::$instanceId); }