Skip to content

Commit 2622f1b

Browse files
committed
Fix UnifiedHostGroupsIT to follow unified config test pattern
Co-authored-by: Isaac
1 parent bc5cb4c commit 2622f1b

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

databricks-sdk-java/src/test/java/com/databricks/sdk/integration/UnifiedHostGroupsIT.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.junit.jupiter.api.Assertions.*;
44

5+
import com.databricks.sdk.AccountClient;
56
import com.databricks.sdk.WorkspaceClient;
67
import com.databricks.sdk.core.DatabricksConfig;
78
import com.databricks.sdk.integration.framework.EnvContext;
@@ -10,23 +11,28 @@
1011
import com.databricks.sdk.service.iam.Group;
1112
import com.databricks.sdk.service.iam.ListGroupsRequest;
1213
import org.junit.jupiter.api.Test;
14+
import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
15+
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
1316
import org.junit.jupiter.api.extension.ExtendWith;
1417

1518
@EnvContext("account")
1619
@ExtendWith(EnvTest.class)
20+
@EnabledIfEnvironmentVariable(named = "UNIFIED_HOST", matches = ".+")
1721
public class UnifiedHostGroupsIT {
1822
@Test
23+
@DisabledIfEnvironmentVariable(named = "CLOUD_PROVIDER", matches = "GCP")
1924
void listWorkspaceGroupsViaUnifiedHost(
20-
@EnvOrSkip("UNIFIED_HOST") String host,
25+
AccountClient a,
26+
@EnvOrSkip("UNIFIED_HOST") String unifiedHost,
2127
@EnvOrSkip("TEST_WORKSPACE_ID") String workspaceId,
22-
@EnvOrSkip("DATABRICKS_CLIENT_ID") String clientId,
23-
@EnvOrSkip("DATABRICKS_CLIENT_SECRET") String clientSecret) {
28+
@EnvOrSkip("TEST_ACCOUNT_ID") String accountId) {
2429
DatabricksConfig config =
2530
new DatabricksConfig()
26-
.setHost(host)
31+
.setHost(unifiedHost)
32+
.setClientId(a.config().getClientId())
33+
.setClientSecret(a.config().getClientSecret())
2734
.setWorkspaceId(workspaceId)
28-
.setClientId(clientId)
29-
.setClientSecret(clientSecret);
35+
.setAccountId(accountId);
3036
WorkspaceClient ws = new WorkspaceClient(config);
3137

3238
Iterable<Group> groups = ws.groups().list(new ListGroupsRequest().setAttributes("displayName"));

0 commit comments

Comments
 (0)