Skip to content

Commit 64c2cc6

Browse files
TetyanaYahodskaTetyanaYahodska
committed
Merge branch 'main' into compute_create_secondary_disk
2 parents 1b75b5e + 3b9ac56 commit 64c2cc6

File tree

16 files changed

+1062
-98
lines changed

16 files changed

+1062
-98
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
/speech @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers
8080
/talent @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers
8181
/texttospeech @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers
82-
/translate @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers
82+
/translate @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers @GoogleCloudPlatform/cloud-ml-translate-dev
8383
/video @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers
8484
/vision @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers
8585

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

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
// [START compute_reservation_create_shared]
2020
import com.google.cloud.compute.v1.AllocationSpecificSKUReservation;
21+
import com.google.cloud.compute.v1.InsertReservationRequest;
2122
import com.google.cloud.compute.v1.Operation;
23+
import com.google.cloud.compute.v1.Operation.Status;
2224
import com.google.cloud.compute.v1.Reservation;
2325
import com.google.cloud.compute.v1.ReservationsClient;
2426
import com.google.cloud.compute.v1.ShareSettings;
@@ -29,12 +31,6 @@
2931
import java.util.concurrent.TimeoutException;
3032

3133
public class CreateSharedReservation {
32-
private final ReservationsClient reservationsClient;
33-
34-
// Constructor to inject the ReservationsClient
35-
public CreateSharedReservation(ReservationsClient reservationsClient) {
36-
this.reservationsClient = reservationsClient;
37-
}
3834

3935
public static void main(String[] args)
4036
throws IOException, ExecutionException, InterruptedException, TimeoutException {
@@ -48,62 +44,66 @@ public static void main(String[] args)
4844
// For more information visit this page:
4945
// https://cloud.google.com/compute/docs/instances/reservations-shared#shared_reservation_constraint
5046
String projectId = "YOUR_PROJECT_ID";
51-
// Zone in which the reservation resides.
47+
// Zone in which to reserve resources.
5248
String zone = "us-central1-a";
5349
// Name of the reservation to be created.
5450
String reservationName = "YOUR_RESERVATION_NAME";
5551
// The URI of the global instance template to be used for creating the reservation.
5652
String instanceTemplateUri = String.format(
57-
"projects/%s/global/instanceTemplates/YOUR_INSTANCE_TEMPLATE_NAME", projectId);
53+
"projects/%s/global/instanceTemplates/%s", projectId, "YOUR_INSTANCE_TEMPLATE_NAME");
5854
// Number of instances for which capacity needs to be reserved.
5955
int vmCount = 3;
60-
// In your main method, create ReservationsClient
61-
ReservationsClient client = ReservationsClient.create();
62-
// Create an instance of your class, passing in the client
63-
CreateSharedReservation creator = new CreateSharedReservation(client);
6456

65-
creator.createSharedReservation(projectId, zone, reservationName, instanceTemplateUri, vmCount);
57+
createSharedReservation(projectId, zone, reservationName, instanceTemplateUri, vmCount);
6658
}
6759

6860
// Creates a shared reservation with the given name in the given zone.
69-
public void createSharedReservation(
70-
String projectId, String zone,
71-
String reservationName, String instanceTemplateUri, int vmCount)
72-
throws ExecutionException, InterruptedException, TimeoutException {
61+
public static Status createSharedReservation(
62+
String projectId, String zone,
63+
String reservationName, String instanceTemplateUri, int vmCount)
64+
throws ExecutionException, InterruptedException, TimeoutException, IOException {
65+
66+
// Initialize client that will be used to send requests. This client only needs to be created
67+
// once, and can be reused for multiple requests.
68+
try (ReservationsClient reservationsClient = ReservationsClient.create()) {
69+
ShareSettings shareSettings = ShareSettings.newBuilder()
70+
.setShareType(String.valueOf(ShareSettings.ShareType.SPECIFIC_PROJECTS))
71+
// The IDs of projects that can consume this reservation. You can include up to
72+
// 100 consumer projects. These projects must be in the same organization as
73+
// the owner project. Don't include the owner project.
74+
// By default, it is already allowed to consume the reservation.
75+
.putProjectMap("CONSUMER_PROJECT_1", ShareSettingsProjectConfig.newBuilder().build())
76+
.putProjectMap("CONSUMER_PROJECT_2", ShareSettingsProjectConfig.newBuilder().build())
77+
.build();
7378

74-
ShareSettings shareSettings = ShareSettings.newBuilder()
75-
.setShareType(String.valueOf(ShareSettings.ShareType.SPECIFIC_PROJECTS))
76-
// The IDs of projects that can consume this reservation. You can include up to 100
77-
// consumer projects. These projects must be in the same organization as
78-
// the owner project. Don't include the owner project. By default, it is already allowed
79-
// to consume the reservation.
80-
.putProjectMap("CONSUMER_PROJECT_ID_1", ShareSettingsProjectConfig.newBuilder().build())
81-
.putProjectMap("CONSUMER_PROJECT_ID_2", ShareSettingsProjectConfig.newBuilder().build())
82-
.build();
79+
Reservation reservationResource =
80+
Reservation.newBuilder()
81+
.setName(reservationName)
82+
.setZone(zone)
83+
.setSpecificReservationRequired(true)
84+
.setShareSettings(shareSettings)
85+
.setSpecificReservation(
86+
AllocationSpecificSKUReservation.newBuilder()
87+
.setCount(vmCount)
88+
.setSourceInstanceTemplate(instanceTemplateUri)
89+
.build())
90+
.build();
8391

84-
// Create the reservation.
85-
Reservation reservation =
86-
Reservation.newBuilder()
87-
.setName(reservationName)
88-
.setZone(zone)
89-
.setSpecificReservationRequired(true)
90-
.setShareSettings(shareSettings)
91-
.setSpecificReservation(
92-
AllocationSpecificSKUReservation.newBuilder()
93-
.setCount(vmCount)
94-
.setSourceInstanceTemplate(instanceTemplateUri)
95-
.build())
96-
.build();
92+
InsertReservationRequest request =
93+
InsertReservationRequest.newBuilder()
94+
.setProject(projectId)
95+
.setZone(zone)
96+
.setReservationResource(reservationResource)
97+
.build();
9798

98-
// Wait for the create reservation operation to complete.
99-
Operation response =
100-
this.reservationsClient.insertAsync(projectId, zone, reservation).get(3, TimeUnit.MINUTES);
99+
Operation response = reservationsClient.insertAsync(request)
100+
.get(3, TimeUnit.MINUTES);
101101

102-
if (response.hasError()) {
103-
System.out.println("Reservation creation failed!" + response);
104-
return;
102+
if (response.hasError()) {
103+
throw new Error("Reservation creation failed!!" + response);
104+
}
105+
return response.getStatus();
105106
}
106-
System.out.println("Reservation created. Operation Status: " + response.getStatus());
107107
}
108108
}
109109
// [END compute_reservation_create_shared]

‎compute/cloud-client/src/test/java/compute/reservation/ReservationIT.java‎

Lines changed: 27 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,23 @@
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020
import static com.google.common.truth.Truth.assertWithMessage;
21+
import static org.junit.Assert.assertEquals;
2122
import static org.junit.Assert.assertNotNull;
23+
import static org.mockito.ArgumentMatchers.any;
24+
import static org.mockito.ArgumentMatchers.anyLong;
2225
import static org.mockito.Mockito.mock;
26+
import static org.mockito.Mockito.mockStatic;
2327
import static org.mockito.Mockito.times;
2428
import static org.mockito.Mockito.verify;
2529
import static org.mockito.Mockito.when;
2630

2731
import com.google.api.gax.longrunning.OperationFuture;
2832
import com.google.api.gax.rpc.NotFoundException;
29-
import com.google.cloud.compute.v1.AllocationSpecificSKUReservation;
33+
import com.google.cloud.compute.v1.InsertReservationRequest;
3034
import com.google.cloud.compute.v1.Operation;
3135
import com.google.cloud.compute.v1.Operation.Status;
3236
import com.google.cloud.compute.v1.Reservation;
3337
import com.google.cloud.compute.v1.ReservationsClient;
34-
import com.google.cloud.compute.v1.ShareSettings;
35-
import com.google.cloud.compute.v1.ShareSettingsProjectConfig;
3638
import compute.CreateInstanceTemplate;
3739
import compute.CreateRegionalInstanceTemplate;
3840
import compute.DeleteInstanceTemplate;
@@ -53,6 +55,7 @@
5355
import org.junit.jupiter.api.Timeout;
5456
import org.junit.runner.RunWith;
5557
import org.junit.runners.JUnit4;
58+
import org.mockito.MockedStatic;
5659

5760
@RunWith(JUnit4.class)
5861
@Timeout(value = 6, unit = TimeUnit.MINUTES)
@@ -184,50 +187,26 @@ public void testCreateReservationWithRegionInstanceTemplate()
184187

185188
@Test
186189
public void testCreateSharedReservation()
187-
throws ExecutionException, InterruptedException, TimeoutException {
188-
// Mock the ReservationsClient
189-
ReservationsClient mockReservationsClient = mock(ReservationsClient.class);
190-
191-
// This test require projects in the test environment to share reservation with,
192-
// therefore the operation should be mocked. If you want to make a real test,
193-
// please set the CONSUMER_PROJECT_ID_1 and CONSUMER_PROJECT_ID_2 accordingly.
194-
// Make sure that base project has proper permissions to share reservations.
195-
// See: https://cloud.google.com/compute/docs/instances/reservations-shared#shared_reservation_constraint
196-
ShareSettings shareSettings = ShareSettings.newBuilder()
197-
.setShareType(String.valueOf(ShareSettings.ShareType.SPECIFIC_PROJECTS))
198-
.putProjectMap("CONSUMER_PROJECT_ID_1", ShareSettingsProjectConfig.newBuilder().build())
199-
.putProjectMap("CONSUMER_PROJECT_ID_2", ShareSettingsProjectConfig.newBuilder().build())
200-
.build();
201-
202-
Reservation reservation =
203-
Reservation.newBuilder()
204-
.setName(RESERVATION_NAME_SHARED)
205-
.setZone(ZONE)
206-
.setSpecificReservationRequired(true)
207-
.setShareSettings(shareSettings)
208-
.setSpecificReservation(
209-
AllocationSpecificSKUReservation.newBuilder()
210-
.setCount(NUMBER_OF_VMS)
211-
.setSourceInstanceTemplate(INSTANCE_TEMPLATE_SHARED_RESERV_URI)
212-
.build())
213-
.build();
214-
215-
OperationFuture mockFuture = mock(OperationFuture.class);
216-
when(mockReservationsClient.insertAsync(PROJECT_ID, ZONE, reservation))
217-
.thenReturn(mockFuture);
218-
Operation mockOperation = mock(Operation.class);
219-
when(mockFuture.get(3, TimeUnit.MINUTES)).thenReturn(mockOperation);
220-
when(mockOperation.hasError()).thenReturn(false);
221-
when(mockOperation.getStatus()).thenReturn(Status.DONE);
222-
223-
// Create an instance, passing in the mock client
224-
CreateSharedReservation creator = new CreateSharedReservation(mockReservationsClient);
225-
226-
creator.createSharedReservation(PROJECT_ID, ZONE,
227-
RESERVATION_NAME_SHARED, INSTANCE_TEMPLATE_SHARED_RESERV_URI, NUMBER_OF_VMS);
228-
229-
verify(mockReservationsClient, times(1))
230-
.insertAsync(PROJECT_ID, ZONE, reservation);
231-
assertThat(stdOut.toString()).contains("Reservation created. Operation Status: DONE");
190+
throws ExecutionException, InterruptedException, TimeoutException, IOException {
191+
try (MockedStatic<ReservationsClient> mockReservationsClient =
192+
mockStatic(ReservationsClient.class)) {
193+
ReservationsClient mockClient = mock(ReservationsClient.class);
194+
OperationFuture mockFuture = mock(OperationFuture.class);
195+
Operation mockOperation = mock(Operation.class);
196+
197+
mockReservationsClient.when(ReservationsClient::create).thenReturn(mockClient);
198+
when(mockClient.insertAsync(any(InsertReservationRequest.class)))
199+
.thenReturn(mockFuture);
200+
when(mockFuture.get(3, TimeUnit.MINUTES)).thenReturn(mockOperation);
201+
when(mockOperation.getStatus()).thenReturn(Status.DONE);
202+
203+
Status status = CreateSharedReservation.createSharedReservation(PROJECT_ID, ZONE,
204+
RESERVATION_NAME_SHARED, INSTANCE_TEMPLATE_SHARED_RESERV_URI, NUMBER_OF_VMS);
205+
206+
verify(mockClient, times(1)).insertAsync(any(InsertReservationRequest.class));
207+
verify(mockFuture, times(1)).get(anyLong(), any(TimeUnit.class));
208+
assertEquals(Status.DONE, status);
209+
210+
}
232211
}
233212
}

‎security-command-center/snippets/src/main/java/management/api/CreateEventThreatDetectionCustomModule.java‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
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 management.api;
18+
19+
// [START securitycenter_create_event_threat_detection_custom_module]
20+
import com.google.cloud.securitycentermanagement.v1.CreateEventThreatDetectionCustomModuleRequest;
21+
import com.google.cloud.securitycentermanagement.v1.EventThreatDetectionCustomModule;
22+
import com.google.cloud.securitycentermanagement.v1.EventThreatDetectionCustomModule.EnablementState;
23+
import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient;
24+
import com.google.protobuf.ListValue;
25+
import com.google.protobuf.Struct;
26+
import com.google.protobuf.Value;
27+
import java.io.IOException;
28+
import java.util.Arrays;
29+
import java.util.HashMap;
30+
import java.util.List;
31+
import java.util.Map;
32+
33+
public class CreateEventThreatDetectionCustomModule {
34+
35+
public static void main(String[] args) throws IOException {
36+
// https://cloud.google.com/security-command-center/docs/reference/security-center-management/rest/v1/organizations.locations.eventThreatDetectionCustomModules/create
37+
// TODO: Developer should replace project_id with a real project ID before running this code
38+
String projectId = "project_id";
39+
40+
String customModuleDisplayName = "custom_module_display_name";
41+
42+
createEventThreatDetectionCustomModule(projectId, customModuleDisplayName);
43+
}
44+
45+
public static EventThreatDetectionCustomModule createEventThreatDetectionCustomModule(
46+
String projectId, String customModuleDisplayName) throws IOException {
47+
48+
// Initialize client that will be used to send requests. This client only needs
49+
// to be created
50+
// once, and can be reused for multiple requests.
51+
try (SecurityCenterManagementClient client = SecurityCenterManagementClient.create()) {
52+
53+
// define the metadata and other config parameters severity, description,
54+
// recommendation and ips below
55+
Map<String, Value> metadata = new HashMap<>();
56+
metadata.put("severity", Value.newBuilder().setStringValue("MEDIUM").build());
57+
metadata.put(
58+
"description", Value.newBuilder().setStringValue("add your description here").build());
59+
metadata.put(
60+
"recommendation",
61+
Value.newBuilder().setStringValue("add your recommendation here").build());
62+
List<Value> ips = Arrays.asList(Value.newBuilder().setStringValue("0.0.0.0").build());
63+
64+
Value metadataVal =
65+
Value.newBuilder()
66+
.setStructValue(Struct.newBuilder().putAllFields(metadata).build())
67+
.build();
68+
Value ipsValue =
69+
Value.newBuilder().setListValue(ListValue.newBuilder().addAllValues(ips).build()).build();
70+
71+
Struct configStruct =
72+
Struct.newBuilder().putFields("metadata", metadataVal).putFields("ips", ipsValue).build();
73+
74+
// define the Event Threat Detection custom module configuration, update the EnablementState
75+
// below
76+
EventThreatDetectionCustomModule eventThreatDetectionCustomModule =
77+
EventThreatDetectionCustomModule.newBuilder()
78+
.setConfig(configStruct)
79+
.setDisplayName(customModuleDisplayName)
80+
.setEnablementState(EnablementState.ENABLED)
81+
.setType("CONFIGURABLE_BAD_IP")
82+
.build();
83+
84+
CreateEventThreatDetectionCustomModuleRequest request =
85+
CreateEventThreatDetectionCustomModuleRequest.newBuilder()
86+
.setParent(String.format("projects/%s/locations/global", projectId))
87+
.setEventThreatDetectionCustomModule(eventThreatDetectionCustomModule)
88+
.build();
89+
90+
EventThreatDetectionCustomModule response =
91+
client.createEventThreatDetectionCustomModule(request);
92+
93+
return response;
94+
}
95+
}
96+
}
97+
// [END securitycenter_create_event_threat_detection_custom_module]

0 commit comments

Comments
 (0)