Skip to content

Commit 2375491

Browse files
philcoakleylesv
philcoakley
authored and
lesv
committed
Updates Cloud-KMS sample code to use V1 libraries. (GoogleCloudPlatform#566)
* Updates KMS sample code to use V1 libraries. * Updates KMS sample code to use V1 libraries.
1 parent c27959d commit 2375491

File tree

5 files changed

+31
-31
lines changed

5 files changed

+31
-31
lines changed

‎kms/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<dependency>
1717
<groupId>com.google.apis</groupId>
1818
<artifactId>google-api-services-cloudkms</artifactId>
19-
<version>v1beta1-rev412-1.22.0</version>
19+
<version>v1-rev1-1.22.0</version>
2020
<exclusions>
2121
<exclusion> <!-- exclude an old version of Guava -->
2222
<groupId>com.google.guava</groupId>

‎kms/src/main/java/com/example/CryptFile.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import com.google.api.client.http.javanet.NetHttpTransport;
2020
import com.google.api.client.json.JsonFactory;
2121
import com.google.api.client.json.jackson2.JacksonFactory;
22-
import com.google.api.services.cloudkms.v1beta1.CloudKMS;
23-
import com.google.api.services.cloudkms.v1beta1.CloudKMSScopes;
24-
import com.google.api.services.cloudkms.v1beta1.model.DecryptRequest;
25-
import com.google.api.services.cloudkms.v1beta1.model.DecryptResponse;
26-
import com.google.api.services.cloudkms.v1beta1.model.EncryptRequest;
27-
import com.google.api.services.cloudkms.v1beta1.model.EncryptResponse;
22+
import com.google.api.services.cloudkms.v1.CloudKMS;
23+
import com.google.api.services.cloudkms.v1.CloudKMSScopes;
24+
import com.google.api.services.cloudkms.v1.model.DecryptRequest;
25+
import com.google.api.services.cloudkms.v1.model.DecryptResponse;
26+
import com.google.api.services.cloudkms.v1.model.EncryptRequest;
27+
import com.google.api.services.cloudkms.v1.model.EncryptResponse;
2828

2929
import org.kohsuke.args4j.CmdLineException;
3030
import org.kohsuke.args4j.CmdLineParser;
@@ -63,7 +63,7 @@ public static CloudKMS createAuthorizedClient() throws IOException {
6363
* Encrypts the given bytes, using the primary version of the specified crypto key.
6464
*
6565
* The primary version can be updated via the <a
66-
* href="https://g.co/cloud/kms/docs/reference/rest/%3Cspan%20class="x x-first x-last">v1beta1/projects.locations.keyRings.cryptoKeys/updatePrimaryVersion">updatePrimaryVersion</a>
66+
* href="https://g.co/cloud/kms/docs/reference/rest/%3Cspan%20class="x x-first x-last">v1/projects.locations.keyRings.cryptoKeys/updatePrimaryVersion">updatePrimaryVersion</a>
6767
* method.
6868
*/
6969
public static byte[] encrypt(String projectId, String ringId, String keyId, byte[] plaintext)

‎kms/src/main/java/com/example/Quickstart.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import com.google.api.client.http.javanet.NetHttpTransport;
2121
import com.google.api.client.json.JsonFactory;
2222
import com.google.api.client.json.jackson2.JacksonFactory;
23-
import com.google.api.services.cloudkms.v1beta1.CloudKMS;
24-
import com.google.api.services.cloudkms.v1beta1.CloudKMSScopes;
25-
import com.google.api.services.cloudkms.v1beta1.model.KeyRing;
26-
import com.google.api.services.cloudkms.v1beta1.model.ListKeyRingsResponse;
23+
import com.google.api.services.cloudkms.v1.CloudKMS;
24+
import com.google.api.services.cloudkms.v1.CloudKMSScopes;
25+
import com.google.api.services.cloudkms.v1.model.KeyRing;
26+
import com.google.api.services.cloudkms.v1.model.ListKeyRingsResponse;
2727

2828
import java.io.IOException;
2929

@@ -84,4 +84,4 @@ public static void main(String... args) throws Exception {
8484
}
8585
}
8686
}
87-
// [END kms_quickstart]
87+
// [END kms_quickstart]

‎kms/src/main/java/com/example/SnippetCommands.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void run() throws IOException {
119119
public static class AddMemberToKeyRingPolicyCommand extends KeyRingArgs implements Command {
120120
@Argument(metaVar = "member", required = true, index = 1,
121121
usage = "The member to add.\n"
122-
+ "See https://g.co/cloud/kms/docs/reference/rest/v1beta1/Policy#binding "
122+
+ "See https://g.co/cloud/kms/docs/reference/rest/v1/Policy#binding "
123123
+ "for valid values.")
124124
String member;
125125
@Argument(metaVar = "role", required = true, index = 2,
@@ -135,7 +135,7 @@ public void run() throws IOException {
135135
public static class AddMemberToCryptoKeyPolicyCommand extends KeyArgs implements Command {
136136
@Argument(metaVar = "member", required = true, index = 2,
137137
usage = "The member to add.\n"
138-
+ "See https://g.co/cloud/kms/docs/reference/rest/v1beta1/Policy#binding "
138+
+ "See https://g.co/cloud/kms/docs/reference/rest/v1/Policy#binding "
139139
+ "for valid values.")
140140
String member;
141141
@Argument(metaVar = "role", required = true, index = 3,
@@ -151,7 +151,7 @@ public void run() throws IOException {
151151
public static class RemoveMemberFromKeyRingPolicyCommand extends KeyRingArgs implements Command {
152152
@Argument(metaVar = "member", required = true, index = 1,
153153
usage = "The member to add.\n"
154-
+ "See https://g.co/cloud/kms/docs/reference/rest/v1beta1/Policy#binding "
154+
+ "See https://g.co/cloud/kms/docs/reference/rest/v1/Policy#binding "
155155
+ "for valid values.")
156156
String member;
157157
@Argument(metaVar = "role", required = true, index = 2,
@@ -167,7 +167,7 @@ public void run() throws IOException {
167167
public static class RemoveMemberFromCryptoKeyPolicyCommand extends KeyArgs implements Command {
168168
@Argument(metaVar = "member", required = true, index = 2,
169169
usage = "The member to add.\n"
170-
+ "See https://g.co/cloud/kms/docs/reference/rest/v1beta1/Policy#binding "
170+
+ "See https://g.co/cloud/kms/docs/reference/rest/v1/Policy#binding "
171171
+ "for valid values.")
172172
String member;
173173
@Argument(metaVar = "role", required = true, index = 3,

‎kms/src/main/java/com/example/Snippets.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
import com.google.api.client.http.javanet.NetHttpTransport;
2020
import com.google.api.client.json.JsonFactory;
2121
import com.google.api.client.json.jackson2.JacksonFactory;
22-
import com.google.api.services.cloudkms.v1beta1.CloudKMS;
23-
import com.google.api.services.cloudkms.v1beta1.CloudKMSScopes;
24-
import com.google.api.services.cloudkms.v1beta1.model.Binding;
25-
import com.google.api.services.cloudkms.v1beta1.model.CryptoKey;
26-
import com.google.api.services.cloudkms.v1beta1.model.CryptoKeyVersion;
27-
import com.google.api.services.cloudkms.v1beta1.model.DestroyCryptoKeyVersionRequest;
28-
import com.google.api.services.cloudkms.v1beta1.model.KeyRing;
29-
import com.google.api.services.cloudkms.v1beta1.model.ListCryptoKeyVersionsResponse;
30-
import com.google.api.services.cloudkms.v1beta1.model.ListCryptoKeysResponse;
31-
import com.google.api.services.cloudkms.v1beta1.model.ListKeyRingsResponse;
32-
import com.google.api.services.cloudkms.v1beta1.model.Policy;
33-
import com.google.api.services.cloudkms.v1beta1.model.SetIamPolicyRequest;
22+
import com.google.api.services.cloudkms.v1.CloudKMS;
23+
import com.google.api.services.cloudkms.v1.CloudKMSScopes;
24+
import com.google.api.services.cloudkms.v1.model.Binding;
25+
import com.google.api.services.cloudkms.v1.model.CryptoKey;
26+
import com.google.api.services.cloudkms.v1.model.CryptoKeyVersion;
27+
import com.google.api.services.cloudkms.v1.model.DestroyCryptoKeyVersionRequest;
28+
import com.google.api.services.cloudkms.v1.model.KeyRing;
29+
import com.google.api.services.cloudkms.v1.model.ListCryptoKeyVersionsResponse;
30+
import com.google.api.services.cloudkms.v1.model.ListCryptoKeysResponse;
31+
import com.google.api.services.cloudkms.v1.model.ListKeyRingsResponse;
32+
import com.google.api.services.cloudkms.v1.model.Policy;
33+
import com.google.api.services.cloudkms.v1.model.SetIamPolicyRequest;
3434

3535
import org.kohsuke.args4j.CmdLineException;
3636
import org.kohsuke.args4j.CmdLineParser;
@@ -264,7 +264,7 @@ public static Policy getKeyRingPolicy(String projectId, String ringId) throws IO
264264
* user:$userEmail
265265
* serviceAccount:$serviceAccountEmail
266266
*
267-
* See https://g.co/cloud/kms/docs/reference/rest/v1beta1/Policy#binding
267+
* See https://g.co/cloud/kms/docs/reference/rest/v1/Policy#binding
268268
* for more details.
269269
*
270270
* @param role Must be in one of the following formats:
@@ -324,7 +324,7 @@ public static Policy addMemberToCryptoKeyPolicy(
324324
* user:$userEmail
325325
* serviceAccount:$serviceAccountEmail
326326
*
327-
* See https://g.co/cloud/kms/docs/reference/rest/v1beta1/Policy#binding
327+
* See https://g.co/cloud/kms/docs/reference/rest/v1/Policy#binding
328328
* for more details.
329329
*
330330
* @param role Must be in one of the following formats:

0 commit comments

Comments
 (0)