fix: print statements in samples and IT

Author: rajatbhatta

samples/snippets/src/main/java/com/example/spanner/CreateInstanceConfigSample.java

@@ -49,9 +49,7 @@ static void createInstanceConfig(
             .build()
             .getService()) {
       final InstanceAdminClient instanceAdminClient = spanner.getInstanceAdminClient();
-
       final InstanceConfig baseConfig = instanceAdminClient.getInstanceConfig(baseInstanceConfig);
-
       List<ReplicaInfo> readOnlyReplicas = ImmutableList.of(baseConfig.getOptionalReplicas().get(0));
 
       InstanceConfigInfo instanceConfigInfo =
@@ -64,12 +62,12 @@ static void createInstanceConfig(
           instanceAdminClient.createInstanceConfig(instanceConfigInfo);
 
       try {
-        System.out.printf("Waiting for operation on %s to complete...\n", instanceConfigId);
+        System.out.printf("Waiting for create operation on %s to complete...\n", instanceConfigId);
         InstanceConfig instanceConfig = operation.get(5, TimeUnit.MINUTES);
-        System.out.printf("Created instance config %s\n", instanceConfig.getId());
+        System.out.printf("Created instance configuration %s\n", instanceConfig.getId());
       } catch (ExecutionException | TimeoutException e) {
         System.out.printf(
-            "Error: Creating instance config %s failed with error message %s\n",
+            "Error: Creating instance configuration %s failed with error message %s\n",
             instanceConfigInfo.getId(), e.getMessage());
       } catch (InterruptedException e) {
         System.out.println(

samples/snippets/src/main/java/com/example/spanner/DeleteInstanceConfigSample.java

@@ -39,12 +39,13 @@ static void deleteInstanceConfig(String projectId, String instanceConfigId) {
       final InstanceAdminClient instanceAdminClient = spanner.getInstanceAdminClient();
 
       try {
-        System.out.printf("Waiting for operation on %s to complete...\n", instanceConfigId);
+        System.out.printf("Waiting for delete operation on %s to complete...\n", instanceConfigId);
         instanceAdminClient.deleteInstanceConfig(instanceConfigId);
-        System.out.printf("Deleted user instance config with id %s\n", instanceConfigId);
+        System.out.printf("Deleted instance configuration %s\n", instanceConfigId);
       } catch (SpannerException e) {
         System.out.printf(
-            "Could not delete user instance config %s: %s\n", instanceConfigId, e.getMessage());
+            "Error: Deleting instance configuration %s failed with error message: %s\n",
+            instanceConfigId, e.getMessage());
       }
     }
   }

samples/snippets/src/main/java/com/example/spanner/ListInstanceConfigOperationsSample.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.example.spanner;
 
 // [START spanner_list_instance_config_operations]

samples/snippets/src/main/java/com/example/spanner/UpdateInstanceConfigSample.java

@@ -36,11 +36,10 @@ static void updateInstanceConfig() {
     // TODO(developer): Replace these variables before running the sample.
     String projectId = "my-project";
     String instanceConfigId = "custom-instance-config";
-    String displayName = "my-display-name";
-    updateInstanceConfig(projectId, instanceConfigId, displayName);
+    updateInstanceConfig(projectId, instanceConfigId);
   }
 
-  static void updateInstanceConfig(String projectId, String instanceConfigId, String displayName) {
+  static void updateInstanceConfig(String projectId, String instanceConfigId) {
     try (Spanner spanner =
         SpannerOptions.newBuilder()
             .setProjectId(projectId)
@@ -50,18 +49,20 @@ static void updateInstanceConfig(String projectId, String instanceConfigId, Stri
 
       InstanceConfigInfo instanceConfigInfo =
           InstanceConfig.newBuilder(InstanceConfigId.of(projectId, instanceConfigId))
-              .setDisplayName(displayName)
+              .setDisplayName("updated custom instance config")
+              .addLabel("updated", "true")
               .build();
 
       final OperationFuture<InstanceConfig, UpdateInstanceConfigMetadata> operation =
           instanceAdminClient.updateInstanceConfig(
-              instanceConfigInfo, ImmutableList.of(InstanceConfigField.DISPLAY_NAME));
+              instanceConfigInfo,
+              ImmutableList.of(InstanceConfigField.DISPLAY_NAME, InstanceConfigField.LABELS));
 
       try {
-        System.out.printf("Waiting for operation on %s to complete...\n", instanceConfigId);
+        System.out.printf("Waiting for update operation on %s to complete...\n", instanceConfigId);
         InstanceConfig instanceConfig = operation.get(5, TimeUnit.MINUTES);
         System.out.printf(
-            "Updated instance config %s with new display name %s\n",
+            "Updated instance configuration %s with new display name %s\n",
             instanceConfig.getId(), instanceConfig.getDisplayName());
       } catch (ExecutionException | TimeoutException e) {
         System.out.printf(

samples/snippets/src/test/java/com/example/spanner/CustomInstanceConfigSampleIT.java

@@ -32,56 +32,28 @@ public void testCustomInstanceConfigOperations() throws Exception {
             () ->
                 CreateInstanceConfigSample.createInstanceConfig(
                     projectId, instanceConfigName, customInstanceConfigId));
-    assertTrue(
-        "Expected instance config "
-            + customInstanceConfigId
-            + " to be created."
-            + " Output received was "
-            + out1,
-        out1.contains(customInstanceConfigId));
+    assertTrue(out1.contains("Created instance configuration"));
 
     // List the instance config operations.
     final String out2 =
         SampleRunner.runSample(
             () ->
                 ListInstanceConfigOperationsSample.listInstanceConfigOperations(projectId));
-    assertTrue(
-        "Expected to list instance config for project: "
-            + projectId
-            + ". Output received was "
-            + out2,
-        out2.contains(customInstanceConfigId));
+    assertTrue(out2.contains("List instance config operation"));
 
     // Update display name to a randomly generated instance config id.
-    String newDisplayName = idGenerator.generateInstanceConfigId();
     final String out3 =
         SampleRunner.runSample(
             () ->
                 UpdateInstanceConfigSample.updateInstanceConfig(
-                    projectId, customInstanceConfigId, newDisplayName));
-    assertTrue(
-        "Expected display name to be updated from "
-            + customInstanceConfigId
-            + " to "
-            + newDisplayName
-            + " for instance config "
-            + customInstanceConfigId
-            + "."
-            + " Output received was "
-            + out3,
-        out3.contains(newDisplayName));
+                    projectId, customInstanceConfigId));
+    assertTrue(out3.contains("Updated instance configuration"));
 
     // Delete the created instance config.
     final String out4 =
         SampleRunner.runSample(
             () ->
                 DeleteInstanceConfigSample.deleteInstanceConfig(projectId, customInstanceConfigId));
-    assertTrue(
-        "Expected instance config "
-            + customInstanceConfigId
-            + " to be deleted."
-            + " Output received was "
-            + out4,
-        out4.contains(customInstanceConfigId));
+    assertTrue(out4.contains("Deleted instance configuration"));
   }
 }