chore: fix PgSpannerSample sample and test.

samples/snippets/src/main/java/com/example/spanner/admin/generated/PgSpannerSample.java

@@ -22,9 +22,6 @@
 import com.google.cloud.Timestamp;
 import com.google.cloud.spanner.DatabaseClient;
 import com.google.cloud.spanner.DatabaseId;
-import com.google.cloud.spanner.Instance;
-import com.google.cloud.spanner.InstanceAdminClient;
-import com.google.cloud.spanner.InstanceId;
 import com.google.cloud.spanner.Key;
 import com.google.cloud.spanner.KeyRange;
 import com.google.cloud.spanner.KeySet;
@@ -42,14 +39,20 @@
 import com.google.cloud.spanner.TimestampBound;
 import com.google.cloud.spanner.Value;
 import com.google.cloud.spanner.admin.database.v1.DatabaseAdminClient;
+import com.google.cloud.spanner.admin.database.v1.DatabaseAdminClient.ListBackupOperationsPagedResponse;
+import com.google.cloud.spanner.admin.database.v1.DatabaseAdminClient.ListDatabaseOperationsPagedResponse;
 import com.google.common.io.BaseEncoding;
 import com.google.longrunning.Operation;
 import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.spanner.admin.database.v1.BackupName;
+import com.google.spanner.admin.database.v1.CopyBackupMetadata;
 import com.google.spanner.admin.database.v1.CreateBackupMetadata;
 import com.google.spanner.admin.database.v1.CreateDatabaseRequest;
 import com.google.spanner.admin.database.v1.Database;
 import com.google.spanner.admin.database.v1.DatabaseDialect;
 import com.google.spanner.admin.database.v1.DatabaseName;
+import com.google.spanner.admin.database.v1.ListBackupOperationsRequest;
+import com.google.spanner.admin.database.v1.ListDatabaseOperationsRequest;
 import com.google.spanner.admin.database.v1.OptimizeRestoredDatabaseMetadata;
 import com.google.spanner.admin.instance.v1.InstanceName;
 import com.google.spanner.v1.ExecuteSqlRequest;
@@ -1240,22 +1243,25 @@ static void queryWithQueryOptions(DatabaseClient dbClient) {
   // [END spanner_postgresql_query_with_query_options]
 
   // [START spanner_postgresql_list_backup_operations]
-  static void listBackupOperations(InstanceAdminClient instanceAdminClient, DatabaseId databaseId) {
-    Instance instance = instanceAdminClient.getInstance(databaseId.getInstanceId().getInstance());
-    // Get create backup operations for the sample database.
-    Timestamp last24Hours = Timestamp.ofTimeSecondsAndNanos(TimeUnit.SECONDS.convert(
-        TimeUnit.HOURS.convert(Timestamp.now().getSeconds(), TimeUnit.SECONDS) - 24,
-        TimeUnit.HOURS), 0);
+  static void listBackupOperations(
+      DatabaseAdminClient databaseAdminClient,
+      String projectId, String instanceId,
+      String databaseId, String backupId) {
+    com.google.spanner.admin.database.v1.InstanceName instanceName = com.google.spanner.admin.database.v1.InstanceName.of(projectId, instanceId);
+    // Get 'CreateBackup' operations for the sample database.
     String filter =
         String.format(
-            "(metadata.database:%s) AND "
-                + "(metadata.@type:type.googleapis.com/"
-                + "google.spanner.admin.database.v1.CreateBackupMetadata) AND "
-                + "(metadata.progress.start_time > \"%s\")",
-            databaseId.getName(), last24Hours);
-    Page<Operation> operations = instance
-        .listBackupOperations(Options.filter(filter));
-    for (Operation op : operations.iterateAll()) {
+            "(metadata.@type:type.googleapis.com/"
+                + "google.spanner.admin.database.v1.CreateBackupMetadata) "
+                + "AND (metadata.database:%s)",
+            DatabaseName.of(projectId, instanceId, databaseId).toString());
+    ListBackupOperationsRequest listBackupOperationsRequest =
+        ListBackupOperationsRequest.newBuilder()
+            .setParent(instanceName.toString()).setFilter(filter).build();
+    ListBackupOperationsPagedResponse createBackupOperations
+        = databaseAdminClient.listBackupOperations(listBackupOperationsRequest);
+    System.out.println("Create Backup Operations:");
+    for (Operation op : createBackupOperations.iterateAll()) {
       try {
         CreateBackupMetadata metadata = op.getMetadata().unpack(CreateBackupMetadata.class);
         System.out.println(
@@ -1269,23 +1275,53 @@ static void listBackupOperations(InstanceAdminClient instanceAdminClient, Databa
         System.err.println(e.getMessage());
       }
     }
+    // Get copy backup operations for the sample database.
+    filter = String.format(
+        "(metadata.@type:type.googleapis.com/"
+            + "google.spanner.admin.database.v1.CopyBackupMetadata) "
+            + "AND (metadata.source_backup:%s)",
+        BackupName.of(projectId, instanceId, backupId).toString());
+    listBackupOperationsRequest =
+        ListBackupOperationsRequest.newBuilder()
+            .setParent(instanceName.toString()).setFilter(filter).build();
+    ListBackupOperationsPagedResponse copyBackupOperations =
+        databaseAdminClient.listBackupOperations(listBackupOperationsRequest);
+    System.out.println("Copy Backup Operations:");
+    for (Operation op : copyBackupOperations.iterateAll()) {
+      try {
+        CopyBackupMetadata copyBackupMetadata =
+            op.getMetadata().unpack(CopyBackupMetadata.class);
+        System.out.println(
+            String.format(
+                "Copy Backup %s on backup %s pending: %d%% complete",
+                copyBackupMetadata.getName(),
+                copyBackupMetadata.getSourceBackup(),
+                copyBackupMetadata.getProgress().getProgressPercent()));
+      } catch (InvalidProtocolBufferException e) {
+        // The returned operation does not contain CopyBackupMetadata.
+        System.err.println(e.getMessage());
+      }
+    }
   }
   // [END spanner_postgresql_list_backup_operations]
 
   // [START spanner_postgresql_list_database_operations]
   static void listDatabaseOperations(
-      InstanceAdminClient instanceAdminClient,
-      DatabaseAdminClient dbAdminClient,
-      InstanceId instanceId) {
-    Instance instance = instanceAdminClient.getInstance(instanceId.getInstance());
+      DatabaseAdminClient dbAdminClient, String projectId, String instanceId) {
     // Get optimize restored database operations.
-    Timestamp last24Hours = Timestamp.ofTimeSecondsAndNanos(TimeUnit.SECONDS.convert(
-        TimeUnit.HOURS.convert(Timestamp.now().getSeconds(), TimeUnit.SECONDS) - 24,
+    com.google.cloud.Timestamp last24Hours = com.google.cloud.Timestamp.ofTimeSecondsAndNanos(TimeUnit.SECONDS.convert(
+        TimeUnit.HOURS.convert(com.google.cloud.Timestamp.now().getSeconds(), TimeUnit.SECONDS) - 24,
         TimeUnit.HOURS), 0);
     String filter = String.format("(metadata.@type:type.googleapis.com/"
         + "google.spanner.admin.database.v1.OptimizeRestoredDatabaseMetadata) AND "
         + "(metadata.progress.start_time > \"%s\")", last24Hours);
-    for (Operation op : instance.listDatabaseOperations(Options.filter(filter)).iterateAll()) {
+    ListDatabaseOperationsRequest listDatabaseOperationsRequest =
+        ListDatabaseOperationsRequest.newBuilder()
+            .setParent(com.google.spanner.admin.instance.v1.InstanceName.of(
+                projectId, instanceId).toString()).setFilter(filter).build();
+    ListDatabaseOperationsPagedResponse pagedResponse
+        = dbAdminClient.listDatabaseOperations(listDatabaseOperationsRequest);
+    for (Operation op : pagedResponse.iterateAll()) {
       try {
         OptimizeRestoredDatabaseMetadata metadata =
             op.getMetadata().unpack(OptimizeRestoredDatabaseMetadata.class);
@@ -1304,9 +1340,9 @@ static void listDatabaseOperations(
   static void run(
       DatabaseClient dbClient,
       DatabaseAdminClient dbAdminClient,
-      InstanceAdminClient instanceAdminClient,
       String command,
-      DatabaseId database) {
+      DatabaseId database,
+      String backupId) {
     DatabaseName databaseName = DatabaseName.of(database.getInstanceId().getProject(),
         database.getInstanceId().getInstance(), database.getDatabase());
     switch (command) {
@@ -1444,10 +1480,12 @@ static void run(
         queryWithQueryOptions(dbClient);
         break;
       case "listbackupoperations":
-        listBackupOperations(instanceAdminClient, database);
+        listBackupOperations(dbAdminClient, database.getInstanceId().getProject(),
+            database.getInstanceId().getInstance(), database.getDatabase(), backupId);
         break;
       case "listdatabaseoperations":
-        listDatabaseOperations(instanceAdminClient, dbAdminClient, database.getInstanceId());
+        listDatabaseOperations(dbAdminClient, database.getInstanceId().getProject(),
+            database.getInstanceId().getInstance());
         break;
       default:
         printUsageAndExit();
@@ -1525,14 +1563,19 @@ public static void main(String[] args) throws Exception {
                 + clientProject);
         printUsageAndExit();
       }
+      // Generate a backup id for the sample database.
+      String backupId = null;
+      if (args.length == 4) {
+        backupId = args[3];
+      }
+
       // [START spanner_init_client]
       DatabaseClient dbClient = spanner.getDatabaseClient(db);
       dbAdminClient = DatabaseAdminClient.create();
-      InstanceAdminClient instanceAdminClient = spanner.getInstanceAdminClient();
       // [END spanner_init_client]
 
       // Use client here...
-      run(dbClient, dbAdminClient, instanceAdminClient, command, db);
+      run(dbClient, dbAdminClient, command, db, backupId);
       // [START spanner_init_client]
     } finally {
       if (dbAdminClient != null) {

samples/snippets/src/test/java/com/example/spanner/admin/generated/PgSpannerSampleIT.java

@@ -23,17 +23,14 @@
 import com.google.cloud.spanner.Spanner;
 import com.google.cloud.spanner.SpannerOptions;
 import com.google.cloud.spanner.admin.database.v1.DatabaseAdminClient;
-import com.google.spanner.admin.database.v1.BackupName;
 import com.google.spanner.admin.database.v1.Database;
 import com.google.spanner.admin.database.v1.DatabaseName;
 import com.google.spanner.admin.database.v1.InstanceName;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,10 +46,6 @@ public class PgSpannerSampleIT extends SampleTestBaseV2 {
   // The instance needs to exist for tests to pass.
   private static final String instanceId = System.getProperty("spanner.test.instance");
   private static final String baseDbId = System.getProperty("spanner.sample.database");
-  private static final String databaseId = formatForTest(baseDbId);
-  private static final String encryptedDatabaseId = formatForTest(baseDbId);
-  private static final String encryptedBackupId = formatForTest(baseDbId);
-  private static final String encryptedRestoreId = formatForTest(baseDbId);
   static Spanner spanner;
   static DatabaseId dbId;
   static DatabaseAdminClient dbClient;
@@ -63,7 +56,7 @@ public static void setUp() throws IOException {
         SpannerOptions.newBuilder().setAutoThrottleAdministrativeRequests().build();
     spanner = options.getService();
     dbClient = DatabaseAdminClient.create();
-    dbId = DatabaseId.of(options.getProjectId(), instanceId, databaseId);
+    dbId = DatabaseId.of(options.getProjectId(), instanceId, idGenerator.generateDatabaseId());
     // Delete stale test databases that have been created earlier by this test, but not deleted.
     deleteStaleTestDatabases();
   }
@@ -91,19 +84,6 @@ static void deleteStaleTestDatabases() {
     }
   }
 
-  @AfterClass
-  public static void tearDown() {
-    dbClient.dropDatabase(
-        DatabaseName.of(projectId, dbId.getInstanceId().getInstance(), dbId.getDatabase()));
-    dbClient.dropDatabase(
-        DatabaseName.of(projectId, dbId.getInstanceId().getInstance(),
-            SpannerSample.createRestoredSampleDbId(dbId)));
-    dbClient.dropDatabase(DatabaseName.of(projectId, instanceId, encryptedDatabaseId));
-    dbClient.dropDatabase(DatabaseName.of(projectId, instanceId, encryptedRestoreId));
-    dbClient.deleteBackup(BackupName.of(projectId, instanceId, encryptedBackupId));
-    spanner.close();
-  }
-
   private static String toComparableId(String baseId, String existingId) {
     String zeroUuid = "00000000-0000-0000-0000-0000-00000000";
     int shouldBeLength = (baseId + "-" + zeroUuid).length();
@@ -117,25 +97,21 @@ private static Pattern getTestDbIdPattern(String baseDbId) {
         Pattern.CASE_INSENSITIVE);
   }
 
-  static String formatForTest(String name) {
-    return name + "-" + UUID.randomUUID().toString().substring(0, DBID_LENGTH);
-  }
-
   private String runSample(String command) throws Exception {
     final PrintStream stdOut = System.out;
     final ByteArrayOutputStream bout = new ByteArrayOutputStream();
     final PrintStream out = new PrintStream(bout);
     System.setOut(out);
-    System.out.println(instanceId + ":" + databaseId);
-    PgSpannerSample.main(new String[]{command, instanceId, databaseId});
+    System.out.println(instanceId + ":" + dbId.getDatabase());
+    PgSpannerSample.main(new String[]{command, instanceId, dbId.getDatabase()});
     System.setOut(stdOut);
     return bout.toString();
   }
 
   @Test
   public void testSample() throws Exception {
     assertThat(instanceId).isNotNull();
-    assertThat(databaseId).isNotNull();
+    assertThat(dbId.getDatabase()).isNotNull();
 
     System.out.println("Create Database ...");
     String out = runSample("createpgdatabase");

samples/snippets/src/test/java/com/example/spanner/admin/generated/SpannerSampleIT.java

@@ -72,7 +72,6 @@ public class SpannerSampleIT extends SampleTestBaseV2 {
       Preconditions.checkNotNull(System.getProperty("spanner.test.key.ring"));
   private static final String keyName =
       Preconditions.checkNotNull(System.getProperty("spanner.test.key.name"));
-  private static final String encryptedDatabaseId = formatForTest(baseDbId);
   private static final String encryptedBackupId = formatForTest(baseDbId);
   private static final long STALE_INSTANCE_THRESHOLD_SECS =
       TimeUnit.SECONDS.convert(24L, TimeUnit.HOURS);
@@ -171,7 +170,6 @@ static void deleteStaleTestDatabases() throws IOException {
 
   @AfterClass
   public static void tearDown() {
-    databaseAdminClient.dropDatabase(DatabaseName.of(projectId, instanceId, encryptedDatabaseId));
     databaseAdminClient.deleteBackup(BackupName.of(projectId, instanceId, encryptedBackupId));
     spanner.close();
   }
@@ -409,7 +407,7 @@ public void testBackupSamples_withoutEncryption() {
       }
 
       System.out.println("List Backup ...");
-      out = runSample("listbackups", databaseId);
+      out = runSample("listbackups", databaseId, backupId);
       assertThat(out).contains("All backups:");
       assertThat(out).contains(
           String.format("All backups with backup name containing \"%s\":", backupId));
@@ -422,8 +420,8 @@ public void testBackupSamples_withoutEncryption() {
       assertThat(out).containsMatch(
           Pattern.compile("All databases created after (.+) and that are ready:"));
       assertThat(out).contains("All backups, listed using pagination:");
-      // All the above tests should include the created backup exactly once, i.e. exactly 7 times.
-      assertThat(countOccurrences(out, backupName.toString())).isEqualTo(7);
+      // All the above tests should include the created backup exactly once, i.e. exactly 6 times.
+      assertThat(countOccurrences(out, backupName.toString())).isEqualTo(6);
 
       // Try the restore operation in a retry loop, as there is a limit on the number of restore
       // operations that is allowed to execute simultaneously, and we should retry if we hit this