Skip to content

feat(iam): add utility class for ServiceAccount test #10058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
May 15, 2025
Merged

feat(iam): add utility class for ServiceAccount test #10058

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3f45bf5
feat(iam): add utility class for ServiceAccount test
alarconesparza Apr 4, 2025
0001e63
fix typo
alarconesparza Apr 4, 2025
484951a
feat(iam): refactor ServiceAccountTests.java
alarconesparza Apr 7, 2025
243a71c
make await functions match
alarconesparza Apr 8, 2025
fe3a1f6
add await for key disabling
alarconesparza Apr 8, 2025
dd239a3
use UUID instead of time for naming
alarconesparza Apr 9, 2025
1ece256
remove unused env var
alarconesparza Apr 10, 2025
bfc6a6d
use Util functions in QuickstartTests
alarconesparza Apr 10, 2025
daa7898
use try/finally blocks to ensure clean up
alarconesparza Apr 11, 2025
b41f1a0
use coreMatchers.not to invert Matcher logic
alarconesparza Apr 11, 2025
f9e4143
split tests by sample so they are in their own files
alarconesparza Apr 15, 2025
edeb2ed
rename test functions after splitting them to avoid redundancy
alarconesparza Apr 15, 2025
792f372
unify tests format and practices
alarconesparza Apr 15, 2025
b3870c2
fix testRenameServiceAccount
alarconesparza Apr 15, 2025
48e10d9
fix testListServiceAccounts
alarconesparza Apr 15, 2025
1a3d583
add waiting time for assertions after enable/disable operations
alarconesparza Apr 16, 2025
90137d8
Undo changes to quickstartTest
alarconesparza Apr 21, 2025
fd86f71
fix lint issue quickstartTest
alarconesparza Apr 21, 2025
243b94b
Ignore test until issue is resolved
alarconesparza Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions iam/snippets/src/test/java/DenyIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
public class DenyIT {

private static final String PROJECT_ID = System.getenv("IAM_PROJECT_ID");
private static final String GOOGLE_APPLICATION_CREDENTIALS = System.getenv("IAM_CREDENTIALS");
private static String POLICY_ID;

private ByteArrayOutputStream stdOut;
Expand All @@ -55,7 +54,6 @@ public static void setUp()
final PrintStream out = System.out;
ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
System.setOut(new PrintStream(stdOut));
requireEnvVar("IAM_CREDENTIALS");
requireEnvVar("IAM_PROJECT_ID");

POLICY_ID = "limit-project-deletion" + UUID.randomUUID();
Expand Down
37 changes: 8 additions & 29 deletions iam/snippets/src/test/java/QuickstartTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
import static org.junit.Assert.assertNotNull;

import com.google.cloud.iam.admin.v1.IAMClient;
import com.google.iam.admin.v1.CreateServiceAccountRequest;
import com.google.iam.admin.v1.DeleteServiceAccountRequest;
import com.google.iam.admin.v1.ProjectName;
import com.google.iam.admin.v1.ServiceAccount;
import com.google.iam.admin.v1.ServiceAccountName;
import com.google.iam.v1.Binding;
import com.google.iam.v1.Policy;
import java.io.IOException;
Expand All @@ -41,13 +37,13 @@
public class QuickstartTests {
private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
private static final String SERVICE_ACCOUNT =
"iam-test-account-" + UUID.randomUUID().toString().split("-")[0];
"iam-test-account-" + UUID.randomUUID().toString().split("-")[0];
private String serviceAccountEmail;

private static void requireEnvVar(String varName) {
assertNotNull(
System.getenv(varName),
String.format("Environment variable '%s' is required to perform these tests.", varName));
System.getenv(varName),
String.format("Environment variable '%s' is required to perform these tests.", varName));
}

@BeforeClass
Expand All @@ -58,33 +54,16 @@ public static void checkRequirements() {

// Creates a service account to use during the test
@Before
public void setUp() throws IOException {
try (IAMClient iamClient = IAMClient.create()) {
ServiceAccount serviceAccount = ServiceAccount
.newBuilder()
.setDisplayName("test-display-name")
.build();
CreateServiceAccountRequest request = CreateServiceAccountRequest.newBuilder()
.setName(ProjectName.of(PROJECT_ID).toString())
.setAccountId(SERVICE_ACCOUNT)
.setServiceAccount(serviceAccount)
.build();

serviceAccount = iamClient.createServiceAccount(request);
serviceAccountEmail = serviceAccount.getEmail();
}
public void setUp() throws IOException, InterruptedException {
ServiceAccount serviceAccount =
Util.setUpTest_createServiceAccount(PROJECT_ID, SERVICE_ACCOUNT);
serviceAccountEmail = serviceAccount.getEmail();
}

// Deletes the service account used in the test.
@After
public void tearDown() throws IOException {
try (IAMClient iamClient = IAMClient.create()) {
String serviceAccountName = SERVICE_ACCOUNT + "@" + PROJECT_ID + ".iam.gserviceaccount.com";
DeleteServiceAccountRequest request = DeleteServiceAccountRequest.newBuilder()
.setName(ServiceAccountName.of(PROJECT_ID, serviceAccountName).toString())
.build();
iamClient.deleteServiceAccount(request);
}
Util.tearDownTest_deleteServiceAccount(PROJECT_ID, SERVICE_ACCOUNT);
}

@Test
Expand Down
2 changes: 0 additions & 2 deletions iam/snippets/src/test/java/RoleIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public class RoleIT {
private ByteArrayOutputStream bout;

private static final String projectId = System.getenv("IAM_PROJECT_ID");
private static final String GOOGLE_APPLICATION_CREDENTIALS = System.getenv("IAM_CREDENTIALS");
private static final String _suffix = UUID.randomUUID().toString().substring(0, 6);
private static final String roleId = "testRole" + _suffix;
private static final String roleName = "projects/" + projectId + "/roles/" + roleId;
Expand All @@ -57,7 +56,6 @@ public static void checkRequirements() throws IOException {
ByteArrayOutputStream stdOut = new ByteArrayOutputStream();

requireEnvVar("IAM_PROJECT_ID");
requireEnvVar("IAM_CREDENTIALS");

stdOut.close();
System.setOut(out);
Expand Down
Loading