Update Secret Manager samples to be canonical (GoogleCloudPlatform#2717)

sethvargo · web-flow · commit 82c66ef651ef · 2020-04-24T10:49:41.000-04:00
diff --git a/secretmanager/pom.xml b/secretmanager/pom.xml
@@ -17,7 +17,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.google.cloud.secretmanager.samples</groupId>
+  <groupId>secretmanager</groupId>
   <artifactId>secretmanager-samples</artifactId>
   <packaging>jar</packaging>
 
diff --git a/secretmanager/src/main/java/secretmanager/AccessSecretVersion.java b/secretmanager/src/main/java/secretmanager/AccessSecretVersion.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.example;
+package secretmanager;
 
 // [START secretmanager_access_secret_version]
-import com.google.cloud.secretmanager.v1.AccessSecretVersionRequest;
 import com.google.cloud.secretmanager.v1.AccessSecretVersionResponse;
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
 import com.google.cloud.secretmanager.v1.SecretVersionName;
@@ -41,12 +40,10 @@ public void accessSecretVersion(String projectId, String secretId, String versio
     // once, and can be reused for multiple requests. After completing all of your requests, call
     // the "close" method on the client to safely clean up any remaining background resources.
     try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
-      SecretVersionName name = SecretVersionName.of(projectId, secretId, versionId);
+      SecretVersionName secretVersionName = SecretVersionName.of(projectId, secretId, versionId);
 
       // Access the secret version.
-      AccessSecretVersionRequest request =
-          AccessSecretVersionRequest.newBuilder().setName(name.toString()).build();
-      AccessSecretVersionResponse response = client.accessSecretVersion(request);
+      AccessSecretVersionResponse response = client.accessSecretVersion(secretVersionName);
 
       // Print the secret payload.
       //
diff --git a/secretmanager/src/main/java/secretmanager/AddSecretVersion.java b/secretmanager/src/main/java/secretmanager/AddSecretVersion.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.example;
+package secretmanager;
 
 // [START secretmanager_add_secret_version]
-import com.google.cloud.secretmanager.v1.AddSecretVersionRequest;
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
 import com.google.cloud.secretmanager.v1.SecretName;
 import com.google.cloud.secretmanager.v1.SecretPayload;
@@ -40,23 +39,16 @@ public void addSecretVersion(String projectId, String secretId) throws IOExcepti
     // once, and can be reused for multiple requests. After completing all of your requests, call
     // the "close" method on the client to safely clean up any remaining background resources.
     try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
-      SecretName name = SecretName.of(projectId, secretId);
+      SecretName secretName = SecretName.of(projectId, secretId);
 
       // Create the secret payload.
       SecretPayload payload =
           SecretPayload.newBuilder()
               .setData(ByteString.copyFromUtf8("my super secret data"))
               .build();
 
-      // Create the request.
-      AddSecretVersionRequest request =
-          AddSecretVersionRequest.newBuilder()
-              .setParent(name.toString())
-              .setPayload(payload)
-              .build();
-
       // Add the secret version.
-      SecretVersion version = client.addSecretVersion(request);
+      SecretVersion version = client.addSecretVersion(secretName, payload);
       System.out.printf("Added secret version %s\n", version.getName());
     }
   }
diff --git a/secretmanager/src/main/java/secretmanager/CreateSecret.java b/secretmanager/src/main/java/secretmanager/CreateSecret.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.example;
+package secretmanager;
 
 // [START secretmanager_create_secret]
-import com.google.cloud.secretmanager.v1.CreateSecretRequest;
 import com.google.cloud.secretmanager.v1.ProjectName;
 import com.google.cloud.secretmanager.v1.Replication;
 import com.google.cloud.secretmanager.v1.Secret;
@@ -40,7 +39,7 @@ public void createSecret(String projectId, String secretId) throws IOException {
     // the "close" method on the client to safely clean up any remaining background resources.
     try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
       // Build the parent name from the project.
-      ProjectName parent = ProjectName.of(projectId);
+      ProjectName projectName = ProjectName.of(projectId);
 
       // Build the secret to create.
       Secret secret =
@@ -51,16 +50,8 @@ public void createSecret(String projectId, String secretId) throws IOException {
                       .build())
               .build();
 
-      // Create the request.
-      CreateSecretRequest request =
-          CreateSecretRequest.newBuilder()
-              .setParent(parent.toString())
-              .setSecretId(secretId)
-              .setSecret(secret)
-              .build();
-
       // Create the secret.
-      Secret createdSecret = client.createSecret(request);
+      Secret createdSecret = client.createSecret(projectName, secretId, secret);
       System.out.printf("Created secret %s\n", createdSecret.getName());
     }
   }
diff --git a/secretmanager/src/main/java/secretmanager/DeleteSecret.java b/secretmanager/src/main/java/secretmanager/DeleteSecret.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.example;
+package secretmanager;
 
 // [START secretmanager_delete_secret]
-import com.google.cloud.secretmanager.v1.DeleteSecretRequest;
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
 import com.google.cloud.secretmanager.v1.SecretName;
 import java.io.IOException;
@@ -38,14 +37,10 @@ public void deleteSecret(String projectId, String secretId) throws IOException {
     // the "close" method on the client to safely clean up any remaining background resources.
     try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
       // Build the secret name.
-      SecretName name = SecretName.of(projectId, secretId);
-
-      // Create the request.
-      DeleteSecretRequest request =
-          DeleteSecretRequest.newBuilder().setName(name.toString()).build();
+      SecretName secretName = SecretName.of(projectId, secretId);
 
       // Create the secret.
-      client.deleteSecret(request);
+      client.deleteSecret(secretName);
       System.out.printf("Deleted secret %s\n", secretId);
     }
   }
diff --git a/secretmanager/src/main/java/secretmanager/DestroySecretVersion.java b/secretmanager/src/main/java/secretmanager/DestroySecretVersion.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.example;
+package secretmanager;
 
 // [START secretmanager_destroy_secret_version]
-import com.google.cloud.secretmanager.v1.DestroySecretVersionRequest;
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
 import com.google.cloud.secretmanager.v1.SecretVersion;
 import com.google.cloud.secretmanager.v1.SecretVersionName;
@@ -41,14 +40,10 @@ public void destroySecretVersion(String projectId, String secretId, String versi
     // the "close" method on the client to safely clean up any remaining background resources.
     try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
       // Build the name from the version.
-      SecretVersionName name = SecretVersionName.of(projectId, secretId, versionId);
-
-      // Create the request.
-      DestroySecretVersionRequest request =
-          DestroySecretVersionRequest.newBuilder().setName(name.toString()).build();
+      SecretVersionName secretVersionName = SecretVersionName.of(projectId, secretId, versionId);
 
       // Create the secret.
-      SecretVersion version = client.destroySecretVersion(request);
+      SecretVersion version = client.destroySecretVersion(secretVersionName);
       System.out.printf("Destroyed secret version %s\n", version.getName());
     }
   }
diff --git a/secretmanager/src/main/java/secretmanager/DisableSecretVersion.java b/secretmanager/src/main/java/secretmanager/DisableSecretVersion.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.example;
+package secretmanager;
 
 // [START secretmanager_disable_secret_version]
-import com.google.cloud.secretmanager.v1.DisableSecretVersionRequest;
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
 import com.google.cloud.secretmanager.v1.SecretVersion;
 import com.google.cloud.secretmanager.v1.SecretVersionName;
@@ -41,14 +40,10 @@ public void disableSecretVersion(String projectId, String secretId, String versi
     // the "close" method on the client to safely clean up any remaining background resources.
     try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
       // Build the name from the version.
-      SecretVersionName name = SecretVersionName.of(projectId, secretId, versionId);
-
-      // Create the request.
-      DisableSecretVersionRequest request =
-          DisableSecretVersionRequest.newBuilder().setName(name.toString()).build();
+      SecretVersionName secretVersionName = SecretVersionName.of(projectId, secretId, versionId);
 
       // Create the secret.
-      SecretVersion version = client.disableSecretVersion(request);
+      SecretVersion version = client.disableSecretVersion(secretVersionName);
       System.out.printf("Disabled secret version %s\n", version.getName());
     }
   }
diff --git a/secretmanager/src/main/java/secretmanager/EnableSecretVersion.java b/secretmanager/src/main/java/secretmanager/EnableSecretVersion.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.example;
+package secretmanager;
 
 // [START secretmanager_enable_secret_version]
-import com.google.cloud.secretmanager.v1.EnableSecretVersionRequest;
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
 import com.google.cloud.secretmanager.v1.SecretVersion;
 import com.google.cloud.secretmanager.v1.SecretVersionName;
@@ -41,14 +40,10 @@ public void enableSecretVersion(String projectId, String secretId, String versio
     // the "close" method on the client to safely clean up any remaining background resources.
     try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
       // Build the name from the version.
-      SecretVersionName name = SecretVersionName.of(projectId, secretId, versionId);
-
-      // Create the request.
-      EnableSecretVersionRequest request =
-          EnableSecretVersionRequest.newBuilder().setName(name.toString()).build();
+      SecretVersionName secretVersionName = SecretVersionName.of(projectId, secretId, versionId);
 
       // Create the secret.
-      SecretVersion version = client.enableSecretVersion(request);
+      SecretVersion version = client.enableSecretVersion(secretVersionName);
       System.out.printf("Enabled secret version %s\n", version.getName());
     }
   }
diff --git a/secretmanager/src/main/java/secretmanager/GetSecret.java b/secretmanager/src/main/java/secretmanager/GetSecret.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.example;
+package secretmanager;
 
 // [START secretmanager_get_secret]
-import com.google.cloud.secretmanager.v1.GetSecretRequest;
 import com.google.cloud.secretmanager.v1.Secret;
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
 import com.google.cloud.secretmanager.v1.SecretName;
@@ -39,13 +38,10 @@ public void getSecret(String projectId, String secretId) throws IOException {
     // the "close" method on the client to safely clean up any remaining background resources.
     try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
       // Build the name.
-      SecretName name = SecretName.of(projectId, secretId);
-
-      // Create the request.
-      GetSecretRequest request = GetSecretRequest.newBuilder().setName(name.toString()).build();
+      SecretName secretName = SecretName.of(projectId, secretId);
 
       // Create the secret.
-      Secret secret = client.getSecret(request);
+      Secret secret = client.getSecret(secretName);
 
       // Get the replication policy.
       String replication = "";
diff --git a/secretmanager/src/main/java/secretmanager/GetSecretVersion.java b/secretmanager/src/main/java/secretmanager/GetSecretVersion.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.example;
+package secretmanager;
 
 // [START secretmanager_get_secret_version]
-import com.google.cloud.secretmanager.v1.GetSecretVersionRequest;
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
 import com.google.cloud.secretmanager.v1.SecretVersion;
 import com.google.cloud.secretmanager.v1.SecretVersionName;
@@ -41,14 +40,10 @@ public void getSecretVersion(String projectId, String secretId, String versionId
     // the "close" method on the client to safely clean up any remaining background resources.
     try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
       // Build the name from the version.
-      SecretVersionName name = SecretVersionName.of(projectId, secretId, versionId);
-
-      // Create the request.
-      GetSecretVersionRequest request =
-          GetSecretVersionRequest.newBuilder().setName(name.toString()).build();
+      SecretVersionName secretVersionName = SecretVersionName.of(projectId, secretId, versionId);
 
       // Create the secret.
-      SecretVersion version = client.getSecretVersion(request);
+      SecretVersion version = client.getSecretVersion(secretVersionName);
       System.out.printf("Secret version %s, state %s\n", version.getName(), version.getState());
     }
   }
diff --git a/secretmanager/src/main/java/secretmanager/IamGrantAccess.java b/secretmanager/src/main/java/secretmanager/IamGrantAccess.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example;
+package secretmanager;
 
 // [START secretmanager_iam_grant_access]
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
@@ -42,14 +42,12 @@ public void iamGrantAccess(String projectId, String secretId, String member) thr
     // the "close" method on the client to safely clean up any remaining background resources.
     try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
       // Build the name from the version.
-      SecretName name = SecretName.of(projectId, secretId);
-
-      // Create a request to get the current IAM policy.
-      GetIamPolicyRequest getRequest =
-          GetIamPolicyRequest.newBuilder().setResource(name.toString()).build();
+      SecretName secretName = SecretName.of(projectId, secretId);
 
       // Request the current IAM policy.
-      Policy currentPolicy = client.getIamPolicy(getRequest);
+      Policy currentPolicy =
+          client.getIamPolicy(
+              GetIamPolicyRequest.newBuilder().setResource(secretName.toString()).build());
 
       // Build the new binding.
       Binding binding =
@@ -61,15 +59,12 @@ public void iamGrantAccess(String projectId, String secretId, String member) thr
       // Create a new IAM policy from the current policy, adding the binding.
       Policy newPolicy = Policy.newBuilder().mergeFrom(currentPolicy).addBindings(binding).build();
 
-      // Create a request to update the IAM policy.
-      SetIamPolicyRequest setRequest =
+      // Save the updated IAM policy.
+      client.setIamPolicy(
           SetIamPolicyRequest.newBuilder()
-              .setResource(name.toString())
+              .setResource(secretName.toString())
               .setPolicy(newPolicy)
-              .build();
-
-      // Save the updated IAM policy.
-      client.setIamPolicy(setRequest);
+              .build());
 
       System.out.printf("Updated IAM policy for %s\n", secretId);
     }
diff --git a/secretmanager/src/main/java/secretmanager/IamRevokeAccess.java b/secretmanager/src/main/java/secretmanager/IamRevokeAccess.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example;
+package secretmanager;
 
 // [START secretmanager_iam_revoke_access]
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
@@ -42,14 +42,12 @@ public void iamRevokeAccess(String projectId, String secretId, String member) th
     // the "close" method on the client to safely clean up any remaining background resources.
     try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
       // Build the name from the version.
-      SecretName name = SecretName.of(projectId, secretId);
-
-      // Create a request to get the current IAM policy.
-      GetIamPolicyRequest getRequest =
-          GetIamPolicyRequest.newBuilder().setResource(name.toString()).build();
+      SecretName secretName = SecretName.of(projectId, secretId);
 
       // Request the current IAM policy.
-      Policy policy = client.getIamPolicy(getRequest);
+      Policy policy =
+          client.getIamPolicy(
+              GetIamPolicyRequest.newBuilder().setResource(secretName.toString()).build());
 
       // Search through bindings and remove matches.
       String roleToFind = "roles/secretmanager.secretAccessor";
@@ -59,12 +57,12 @@ public void iamRevokeAccess(String projectId, String secretId, String member) th
         }
       }
 
-      // Create a request to update the IAM policy.
-      SetIamPolicyRequest setRequest =
-          SetIamPolicyRequest.newBuilder().setResource(name.toString()).setPolicy(policy).build();
-
       // Save the updated IAM policy.
-      client.setIamPolicy(setRequest);
+      client.setIamPolicy(
+          SetIamPolicyRequest.newBuilder()
+              .setResource(secretName.toString())
+              .setPolicy(policy)
+              .build());
 
       System.out.printf("Updated IAM policy for %s\n", secretId);
     }
diff --git a/secretmanager/src/main/java/secretmanager/ListSecretVersions.java b/secretmanager/src/main/java/secretmanager/ListSecretVersions.java
diff --git a/secretmanager/src/main/java/secretmanager/ListSecrets.java b/secretmanager/src/main/java/secretmanager/ListSecrets.java
diff --git a/secretmanager/src/main/java/secretmanager/Quickstart.java b/secretmanager/src/main/java/secretmanager/Quickstart.java
diff --git a/secretmanager/src/main/java/secretmanager/UpdateSecret.java b/secretmanager/src/main/java/secretmanager/UpdateSecret.java
diff --git a/secretmanager/src/test/java/secretmanager/QuickstartIT.java b/secretmanager/src/test/java/secretmanager/QuickstartIT.java
diff --git a/secretmanager/src/test/java/secretmanager/SnippetsIT.java b/secretmanager/src/test/java/secretmanager/SnippetsIT.java
