Skip to content

Commit 0554808

Browse files
TetyanaYahodskaTetyanaYahodska
committed
Merged changes from main
2 parents 3c37ec0 + 372f0b5 commit 0554808

File tree

65 files changed

+2284
-619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2284
-619
lines changed

‎appengine-java11/appengine-simple-jetty-main/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2222
<maven.compiler.source>11</maven.compiler.source>
2323
<maven.compiler.target>11</maven.compiler.target>
24-
<jetty.version>9.4.54.v20240208</jetty.version>
24+
<jetty.version>9.4.56.v20240826</jetty.version>
2525
</properties>
2626

2727
<!-- [START gae_java11_server_dependencies] -->

‎auth/src/main/java/UndeleteApiKey.java‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright 2024 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
// [START apikeys_undelete_api_key]
18+
import com.google.api.apikeys.v2.ApiKeysClient;
19+
import com.google.api.apikeys.v2.Key;
20+
import com.google.api.apikeys.v2.UndeleteKeyRequest;
21+
import java.io.IOException;
22+
import java.util.concurrent.ExecutionException;
23+
import java.util.concurrent.TimeUnit;
24+
import java.util.concurrent.TimeoutException;
25+
26+
public class UndeleteApiKey {
27+
28+
public static void main(String[] args)
29+
throws IOException, ExecutionException, InterruptedException, TimeoutException {
30+
// TODO(developer): Replace these variables before running the sample.
31+
// Project ID or project number of the Google Cloud project.
32+
String projectId = "YOUR_PROJECT_ID";
33+
// The API key id to undelete.
34+
String keyId = "YOUR_KEY_ID";
35+
36+
undeleteApiKey(projectId, keyId);
37+
}
38+
39+
// Undeletes an API key.
40+
public static void undeleteApiKey(String projectId, String keyId)
41+
throws IOException, ExecutionException, InterruptedException, TimeoutException {
42+
// Initialize client that will be used to send requests. This client only needs to be created
43+
// once, and can be reused for multiple requests.
44+
try (ApiKeysClient apiKeysClient = ApiKeysClient.create()) {
45+
46+
// Initialize the undelete request and set the argument.
47+
UndeleteKeyRequest undeleteKeyRequest = UndeleteKeyRequest.newBuilder()
48+
.setName(String.format("projects/%s/locations/global/keys/%s", projectId, keyId))
49+
.build();
50+
51+
// Make the request and wait for the operation to complete.
52+
Key undeletedKey = apiKeysClient.undeleteKeyAsync(undeleteKeyRequest)
53+
.get(3, TimeUnit.MINUTES);
54+
55+
System.out.printf("Successfully undeleted the API key: %s", undeletedKey.getName());
56+
}
57+
}
58+
}
59+
// [END apikeys_undelete_api_key]

‎auth/src/test/java/ApiKeySnippetsIT.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
public class ApiKeySnippetsIT {
3737

3838
private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
39-
private static final String CREDENTIALS = System.getenv("GOOGLE_APPLICATION_CREDENTIALS");
4039
private static Key API_KEY;
4140
private static String API_KEY_STRING;
4241
private ByteArrayOutputStream stdOut;
@@ -79,8 +78,15 @@ public static void cleanup()
7978

8079
String apiKeyId = getApiKeyId(API_KEY);
8180
DeleteApiKey.deleteApiKey(PROJECT_ID, apiKeyId);
82-
String goal = String.format("Successfully deleted the API key: %s", API_KEY.getName());
83-
assertThat(stdOut.toString()).contains(goal);
81+
82+
UndeleteApiKey.undeleteApiKey(PROJECT_ID, apiKeyId);
83+
String undeletedKey = String.format("Successfully undeleted the API key: %s",
84+
API_KEY.getName());
85+
assertThat(stdOut.toString()).contains(undeletedKey);
86+
87+
DeleteApiKey.deleteApiKey(PROJECT_ID, apiKeyId);
88+
String deletedKey = String.format("Successfully deleted the API key: %s", API_KEY.getName());
89+
assertThat(stdOut.toString()).contains(deletedKey);
8490

8591
stdOut.close();
8692
System.setOut(out);

‎compute/cloud-client/src/main/java/compute/disks/storagepool/CreateHyperdiskStoragePool.java‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package compute.disks.storagepool;
1616

1717
// [START compute_hyperdisk_pool_create]
18-
1918
import com.google.cloud.compute.v1.InsertStoragePoolRequest;
2019
import com.google.cloud.compute.v1.Operation;
2120
import com.google.cloud.compute.v1.StoragePool;
@@ -32,12 +31,13 @@ public static void main(String[] args)
3231
// Project ID or project number of the Google Cloud project you want to use.
3332
String projectId = "YOUR_PROJECT_ID";
3433
// Name of the zone in which you want to create the storagePool.
35-
String zone = "europe-central2-b";
34+
String zone = "us-central1-a";
3635
// Name of the storagePool you want to create.
3736
String storagePoolName = "YOUR_STORAGE_POOL_NAME";
38-
// The type of disk you want to create. This value uses the following format:
39-
// "projects/%s/zones/%s/storagePoolTypes/hyperdisk-throughput|hyperdisk-balanced"
40-
String storagePoolType = "hyperdisk-balanced";
37+
// The type of disk you want to create.
38+
// Storage types can be "hyperdisk-throughput" or "hyperdisk-balanced"
39+
String storagePoolType = String.format(
40+
"projects/%s/zones/%s/storagePoolTypes/hyperdisk-balanced", projectId, zone);
4141
// Optional: the capacity provisioning type of the storage pool.
4242
// The allowed values are advanced and standard. If not specified, the value advanced is used.
4343
String capacityProvisioningType = "advanced";
@@ -48,16 +48,19 @@ public static void main(String[] args)
4848
long provisionedIops = 3000;
4949
// the throughput in MBps to provision for the storage pool.
5050
long provisionedThroughput = 140;
51+
// The allowed values are low-casing strings "advanced" and "standard".
52+
// If not specified, "advanced" is used.
53+
String performanceProvisioningType = "advanced";
5154

5255
createHyperdiskStoragePool(projectId, zone, storagePoolName, storagePoolType,
53-
capacityProvisioningType, provisionedCapacity, provisionedIops, provisionedThroughput);
56+
capacityProvisioningType, provisionedCapacity, provisionedIops,
57+
provisionedThroughput, performanceProvisioningType);
5458
}
5559

5660
// Creates a hyperdisk storagePool in a project
5761
public static StoragePool createHyperdiskStoragePool(String projectId, String zone,
58-
String storagePoolName, String storagePoolType,
59-
String capacityProvisioningType, long capacity,
60-
long iops, long throughput)
62+
String storagePoolName, String storagePoolType, String capacityProvisioningType,
63+
long capacity, long iops, long throughput, String performanceProvisioningType)
6164
throws IOException, ExecutionException, InterruptedException, TimeoutException {
6265
// Initialize client that will be used to send requests. This client only needs to be created
6366
// once, and can be reused for multiple requests.
@@ -71,6 +74,7 @@ public static StoragePool createHyperdiskStoragePool(String projectId, String zo
7174
.setPoolProvisionedCapacityGb(capacity)
7275
.setPoolProvisionedIops(iops)
7376
.setPoolProvisionedThroughput(throughput)
77+
.setPerformanceProvisioningType(performanceProvisioningType)
7478
.build();
7579

7680
InsertStoragePoolRequest request = InsertStoragePoolRequest.newBuilder()

‎compute/cloud-client/src/main/java/compute/reservation/ConsumeAnyMatchingReservation.java‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
/*
2+
* Copyright 2024 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package compute.reservation;
18+
19+
// [START compute_consume_any_matching_reservation]
20+
import static com.google.cloud.compute.v1.ReservationAffinity.ConsumeReservationType.ANY_RESERVATION;
21+
22+
import com.google.api.gax.longrunning.OperationFuture;
23+
import com.google.cloud.compute.v1.AttachedDisk;
24+
import com.google.cloud.compute.v1.AttachedDiskInitializeParams;
25+
import com.google.cloud.compute.v1.InsertInstanceRequest;
26+
import com.google.cloud.compute.v1.Instance;
27+
import com.google.cloud.compute.v1.InstancesClient;
28+
import com.google.cloud.compute.v1.NetworkInterface;
29+
import com.google.cloud.compute.v1.Operation;
30+
import com.google.cloud.compute.v1.ReservationAffinity;
31+
import java.io.IOException;
32+
import java.util.concurrent.ExecutionException;
33+
import java.util.concurrent.TimeUnit;
34+
import java.util.concurrent.TimeoutException;
35+
36+
public class ConsumeAnyMatchingReservation {
37+
38+
public static void main(String[] args)
39+
throws IOException, ExecutionException, InterruptedException, TimeoutException {
40+
// TODO(developer): Replace these variables before running the sample.
41+
// Project ID or project number of the Cloud project you want to use.
42+
String projectId = "YOUR_PROJECT_ID";
43+
// Zone where the VM instance will be created.
44+
String zone = "us-central1-a";
45+
// Name of the VM instance you want to query.
46+
String instanceName = "YOUR_INSTANCE_NAME";
47+
// machineType: machine type of the VM being created.
48+
// * For a list of machine types, see https://cloud.google.com/compute/docs/machine-types
49+
String machineTypeName = "n1-standard-4";
50+
// sourceImage: path to the operating system image to mount.
51+
// * For details about images you can mount, see https://cloud.google.com/compute/docs/images
52+
String sourceImage = "projects/debian-cloud/global/images/family/debian-11";
53+
// diskSizeGb: storage size of the boot disk to attach to the instance.
54+
long diskSizeGb = 10L;
55+
// networkName: network interface to associate with the instance.
56+
String networkName = "default";
57+
// Minimum CPU platform of the instances.
58+
String minCpuPlatform = "Intel Skylake";
59+
60+
createInstanceAsync(projectId, zone, instanceName, machineTypeName, sourceImage,
61+
diskSizeGb, networkName, minCpuPlatform);
62+
}
63+
64+
// Create a virtual machine targeted with the reserveAffinity field.
65+
// In this consumption model, existing and new VMs automatically consume a reservation
66+
// if their properties match the VM properties specified in the reservation.
67+
public static Instance createInstanceAsync(String projectId, String zone,
68+
String instanceName, String machineTypeName, String sourceImage,
69+
long diskSizeGb, String networkName, String minCpuPlatform)
70+
throws IOException, InterruptedException, ExecutionException, TimeoutException {
71+
String machineType = String.format("zones/%s/machineTypes/%s", zone, machineTypeName);
72+
// Initialize client that will be used to send requests. This client only needs to be created
73+
// once, and can be reused for multiple requests.
74+
try (InstancesClient instancesClient = InstancesClient.create()) {
75+
AttachedDisk disk =
76+
AttachedDisk.newBuilder()
77+
.setBoot(true)
78+
.setAutoDelete(true)
79+
.setType(AttachedDisk.Type.PERSISTENT.toString())
80+
.setDeviceName("disk-1")
81+
.setInitializeParams(
82+
AttachedDiskInitializeParams.newBuilder()
83+
.setSourceImage(sourceImage)
84+
.setDiskSizeGb(diskSizeGb)
85+
.build())
86+
.build();
87+
88+
NetworkInterface networkInterface = NetworkInterface.newBuilder()
89+
.setName(networkName)
90+
.build();
91+
92+
ReservationAffinity reservationAffinity =
93+
ReservationAffinity.newBuilder()
94+
.setConsumeReservationType(ANY_RESERVATION.toString())
95+
.build();
96+
97+
Instance instanceResource =
98+
Instance.newBuilder()
99+
.setName(instanceName)
100+
.setMachineType(machineType)
101+
.addDisks(disk)
102+
.addNetworkInterfaces(networkInterface)
103+
.setMinCpuPlatform(minCpuPlatform)
104+
.setReservationAffinity(reservationAffinity)
105+
.build();
106+
107+
InsertInstanceRequest insertInstanceRequest = InsertInstanceRequest.newBuilder()
108+
.setProject(projectId)
109+
.setZone(zone)
110+
.setInstanceResource(instanceResource)
111+
.build();
112+
113+
OperationFuture<Operation, Operation> operation = instancesClient.insertAsync(
114+
insertInstanceRequest);
115+
116+
Operation response = operation.get(3, TimeUnit.MINUTES);
117+
118+
if (response.hasError()) {
119+
return null;
120+
}
121+
return instancesClient.get(projectId, zone, instanceName);
122+
}
123+
}
124+
}
125+
// [END compute_consume_any_matching_reservation]

0 commit comments

Comments
 (0)