Skip to content

Commit 8c76982

Browse files
vijaykanthmvijaykanthm
committed
lint fixes
1 parent c64abfb commit 8c76982

File tree

4 files changed

+46
-55
lines changed

4 files changed

+46
-55
lines changed

‎security-command-center/snippets/src/main/java/vtwo/assets/AddDeleteSecurityMarks.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@
1616

1717
package vtwo.assets;
1818

19-
import java.io.IOException;
20-
2119
import com.google.cloud.securitycenter.v2.SecurityCenterClient;
2220
import com.google.cloud.securitycenter.v2.SecurityMarks;
2321
import com.google.cloud.securitycenter.v2.UpdateSecurityMarksRequest;
2422
import com.google.protobuf.FieldMask;
23+
import java.io.IOException;
2524

2625
//[START securitycenter_add_delete_security_marks_assets_v2]
2726

28-
2927
public class AddDeleteSecurityMarks {
3028
public static void main(String[] args) throws IOException {
3129
// organizationId: Google Cloud Organization id.

‎security-command-center/snippets/src/main/java/vtwo/assets/AddSecurityMarksToAssets.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public static void main(String[] args) throws IOException {
4242

4343
// Demonstrates adding security marks to findings.
4444
// To add or change security marks, you must have an IAM role that includes permission:
45-
public static SecurityMarks addToAsset(String organizationId,
46-
String location, String assetId) throws IOException {
45+
public static SecurityMarks addToAsset(String organizationId, String location, String assetId)
46+
throws IOException {
4747
// Initialize client that will be used to send requests. This client only needs to be created
4848
// once, and can be reused for multiple requests.
4949
SecurityCenterClient client = SecurityCenterClient.create();
@@ -53,37 +53,36 @@ public static SecurityMarks addToAsset(String organizationId,
5353
// String assetName = "projects/{project-id}/assets/{asset-id}";
5454
// String assetName = "folders/{folder-id}/assets/{asset-id}";
5555
String assetName = String.format("organizations/%s/assets/%s", organizationId, assetId);
56-
56+
5757
// Start setting up a request to add security marks for a finding.
5858
ImmutableMap markMap = ImmutableMap.of("key_a", "value_a", "key_b", "value_b");
5959

6060
// Add security marks and field mask for security marks.
61-
SecurityMarks securityMarks = SecurityMarks.newBuilder()
62-
.setName(assetName + "/securityMarks")
63-
.putAllMarks(markMap)
64-
.build();
61+
SecurityMarks securityMarks =
62+
SecurityMarks.newBuilder()
63+
.setName(assetName + "/securityMarks")
64+
.putAllMarks(markMap)
65+
.build();
6566

6667
// Set the update mask to specify which properties should be updated.
6768
// If empty, all mutable fields will be updated.
6869
// For more info on constructing field mask path, see the proto or:
6970
// https://cloud.google.com/java/docs/reference/protobuf/latest/com.google.protobuf.FieldMask
70-
FieldMask updateMask = FieldMask.newBuilder()
71-
.addPaths("marks.key_a")
72-
.addPaths("marks.key_b")
73-
.build();
71+
FieldMask updateMask =
72+
FieldMask.newBuilder().addPaths("marks.key_a").addPaths("marks.key_b").build();
7473

75-
UpdateSecurityMarksRequest request = UpdateSecurityMarksRequest.newBuilder()
76-
.setSecurityMarks(securityMarks)
77-
.setUpdateMask(updateMask)
78-
.build();
74+
UpdateSecurityMarksRequest request =
75+
UpdateSecurityMarksRequest.newBuilder()
76+
.setSecurityMarks(securityMarks)
77+
.setUpdateMask(updateMask)
78+
.build();
7979

8080
// Call the API.
8181
SecurityMarks response = client.updateSecurityMarks(request);
8282

8383
System.out.println("Security Marks:" + response);
8484
return response;
85-
}
85+
}
8686
}
8787

88-
8988
// [END securitycenter_add_security_marks_assets_v2]

‎security-command-center/snippets/src/main/java/vtwo/assets/DeleteAssetsSecurityMarks.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616

1717
package vtwo.assets;
1818

19-
import java.io.IOException;
20-
2119
import com.google.cloud.securitycenter.v2.SecurityCenterClient;
2220
import com.google.cloud.securitycenter.v2.SecurityMarks;
2321
import com.google.cloud.securitycenter.v2.UpdateSecurityMarksRequest;
2422
import com.google.protobuf.FieldMask;
23+
import java.io.IOException;
2524

2625
//[START securitycenter_delete_security_marks_assets_v2]
2726

‎security-command-center/snippets/src/test/java/vtwo/AssetSecurityMarksIT.java‎

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,13 @@
2626
import java.util.concurrent.TimeUnit;
2727
import java.util.regex.Matcher;
2828
import java.util.regex.Pattern;
29-
29+
import com.google.api.gax.rpc.InvalidArgumentException;
30+
import com.google.cloud.securitycenter.v1.Asset;
31+
import com.google.cloud.securitycenter.v1.ListAssetsRequest;
32+
import com.google.cloud.securitycenter.v1.SecurityCenterClient;
33+
import com.google.cloud.securitycenter.v2.OrganizationName;
34+
import com.google.cloud.securitycenter.v2.SecurityMarks;
35+
import com.google.cloud.testing.junit4.MultipleAttemptsRule;
3036
import org.junit.After;
3137
import org.junit.AfterClass;
3238
import org.junit.Before;
@@ -35,15 +41,6 @@
3541
import org.junit.Test;
3642
import org.junit.runner.RunWith;
3743
import org.junit.runners.JUnit4;
38-
39-
import com.google.api.gax.rpc.InvalidArgumentException;
40-
import com.google.cloud.securitycenter.v1.Asset;
41-
import com.google.cloud.securitycenter.v1.ListAssetsRequest;
42-
import com.google.cloud.securitycenter.v1.SecurityCenterClient;
43-
import com.google.cloud.securitycenter.v2.OrganizationName;
44-
import com.google.cloud.securitycenter.v2.SecurityMarks;
45-
import com.google.cloud.testing.junit4.MultipleAttemptsRule;
46-
4744
import vtwo.assets.AddDeleteSecurityMarks;
4845
import vtwo.assets.AddSecurityMarksToAssets;
4946
import vtwo.assets.DeleteAssetsSecurityMarks;
@@ -57,7 +54,8 @@ public class AssetSecurityMarksIT {
5754
private static ByteArrayOutputStream stdOut;
5855

5956
@Rule
60-
public final MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3, 120000); // 2 minutes
57+
public final MultipleAttemptsRule multipleAttemptsRule =
58+
new MultipleAttemptsRule(3, 120000); // 2 minutes
6159

6260
// Check if the required environment variables are set.
6361
public static void requireEnvVar(String envVarName) {
@@ -74,9 +72,9 @@ private static String extractAssetId(String assetPath) {
7472
}
7573
return assetPath;
7674
}
77-
78-
@SuppressWarnings("deprecation")
79-
@BeforeClass
75+
76+
@SuppressWarnings("deprecation")
77+
@BeforeClass
8078
public static void setUp() throws IOException, InterruptedException {
8179
final PrintStream out = System.out;
8280
stdOut = new ByteArrayOutputStream();
@@ -86,20 +84,18 @@ public static void setUp() throws IOException, InterruptedException {
8684

8785
// Fetch a valid asset ID dynamically
8886
try (SecurityCenterClient client = SecurityCenterClient.create()) {
89-
OrganizationName orgName = OrganizationName.of(ORGANIZATION_ID);
90-
ListAssetsRequest request = ListAssetsRequest.newBuilder()
91-
.setParent(orgName.toString())
92-
.setPageSize(1)
93-
.build();
94-
95-
Asset asset = client.listAssets(request).iterateAll().iterator().next().getAsset();
96-
assetName = asset.getName(); // Get the full resource name for the asset
97-
assetId = extractAssetId(assetName);
87+
OrganizationName orgName = OrganizationName.of(ORGANIZATION_ID);
88+
ListAssetsRequest request =
89+
ListAssetsRequest.newBuilder().setParent(orgName.toString()).setPageSize(1).build();
90+
91+
Asset asset = client.listAssets(request).iterateAll().iterator().next().getAsset();
92+
assetName = asset.getName(); // Get the full resource name for the asset
93+
assetId = extractAssetId(assetName);
9894
} catch (InvalidArgumentException e) {
99-
System.err.println("Error retrieving asset ID: " + e.getMessage());
100-
throw e;
95+
System.err.println("Error retrieving asset ID: " + e.getMessage());
96+
throw e;
10197
}
102-
98+
10399
stdOut = null;
104100
System.setOut(out);
105101
TimeUnit.MINUTES.sleep(1);
@@ -124,26 +120,26 @@ public static void cleanUp() {
124120

125121
@Test
126122
public void testAddSecurityMarksToAsset() throws IOException {
127-
SecurityMarks response = AddSecurityMarksToAssets.addToAsset(
128-
ORGANIZATION_ID, LOCATION, assetId);
123+
SecurityMarks response =
124+
AddSecurityMarksToAssets.addToAsset(ORGANIZATION_ID, LOCATION, assetId);
129125

130126
assertTrue(response.getMarksOrThrow("key_a").contains("value_a"));
131127
assertTrue(response.getMarksOrThrow("key_b").contains("value_b"));
132128
}
133129

134130
@Test
135131
public void testDeleteSecurityMarksOnAsset() throws IOException {
136-
SecurityMarks response = DeleteAssetsSecurityMarks.deleteSecurityMarks(
137-
ORGANIZATION_ID, LOCATION, assetId);
132+
SecurityMarks response =
133+
DeleteAssetsSecurityMarks.deleteSecurityMarks(ORGANIZATION_ID, LOCATION, assetId);
138134

139135
assertFalse(response.containsMarks("key_a"));
140136
assertFalse(response.containsMarks("key_b"));
141137
}
142138

143139
@Test
144140
public void testAddAndDeleteSecurityMarks() throws IOException {
145-
SecurityMarks response = AddDeleteSecurityMarks.addDeleteSecurityMarks(
146-
ORGANIZATION_ID, LOCATION, assetId);
141+
SecurityMarks response =
142+
AddDeleteSecurityMarks.addDeleteSecurityMarks(ORGANIZATION_ID, LOCATION, assetId);
147143

148144
// Assert update for key_a
149145
assertTrue(response.getMarksOrThrow("key_a").contains("new_value_for_a"));
@@ -152,4 +148,3 @@ public void testAddAndDeleteSecurityMarks() throws IOException {
152148
assertFalse(response.getMarksMap().containsKey("key_b"));
153149
}
154150
}
155-

0 commit comments

Comments
 (0)