Skip to content

Improve test coverage for invalid inputs in Policy APIs #1665

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 25 commits into from
May 27, 2025
Merged

Improve test coverage for invalid inputs in Policy APIs #1665

Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6ca133d
started
williamhyun May 19, 2025
525e3d2
Commit
williamhyun May 21, 2025
0801ccd
in progress
williamhyun May 21, 2025
d989fc6
Update imports
williamhyun May 21, 2025
f3a6f23
WIP
williamhyun May 21, 2025
89479fe
WIP
williamhyun May 21, 2025
95e27cf
WIP
williamhyun May 22, 2025
cbd1d5b
Removed Debugging
williamhyun May 22, 2025
f87455e
Implemented Quarkus Tests
williamhyun May 22, 2025
8d78fd8
WIP
williamhyun May 22, 2025
b85f50e
Good checkpoint
williamhyun May 22, 2025
a2e72a5
Detach cases covered
williamhyun May 23, 2025
56961ae
End of day
williamhyun May 23, 2025
9af9066
Done
williamhyun May 23, 2025
c5048f1
Ready to open PR
williamhyun May 23, 2025
bbbdaef
Style Check
williamhyun May 23, 2025
ad3205b
Applied Feedback
williamhyun May 27, 2025
53ef318
Merge branch 'apache:main' into starter
williamhyun May 27, 2025
18ee295
Move Testing Message Constants
williamhyun May 27, 2025
4a4804b
Revert Wildcard Import
williamhyun May 27, 2025
94dfb79
fix(quickstart): Correct Quickstart Instructions (#1673)
adnanhemani May 27, 2025
a4cbc7a
Remove Java URI validations for Blob Storage providers (#1604)
adnanhemani May 27, 2025
1257407
Remove Magic Strings
williamhyun May 27, 2025
e536595
Merge branch 'apache:main' into starter
williamhyun May 27, 2025
1fcb7fb
Remove String Format
williamhyun May 27, 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
254 changes: 254 additions & 0 deletions ...src/main/java/org/apache/polaris/service/it/test/PolarisPolicyServiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,13 @@
import org.apache.polaris.service.it.env.PolicyApi;
import org.apache.polaris.service.it.ext.PolarisIntegrationTestExtension;
import org.apache.polaris.service.types.ApplicablePolicy;
import org.apache.polaris.service.types.AttachPolicyRequest;
import org.apache.polaris.service.types.CreatePolicyRequest;
import org.apache.polaris.service.types.DetachPolicyRequest;
import org.apache.polaris.service.types.Policy;
import org.apache.polaris.service.types.PolicyAttachmentTarget;
import org.apache.polaris.service.types.PolicyIdentifier;
import org.apache.polaris.service.types.UpdatePolicyRequest;
import org.assertj.core.api.Assertions;
import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.AfterAll;
Expand Down Expand Up @@ -107,6 +110,13 @@ public class PolarisPolicyServiceIntegrationTest {
private static final PolicyIdentifier NS1_P3 = new PolicyIdentifier(NS1, "P3");
private static final TableIdentifier NS2_T1 = TableIdentifier.of(NS2, "T1");

private static final String NS1_NAME = RESTUtil.encodeNamespace(NS1);
private static final String INVALID_NAMESPACE = "INVALID_NAMESPACE";
private static final String INVALID_POLICY = "INVALID_POLICY";
private static final String INVALID_TABLE = "INVALID_TABLE";
private static final String INVALID_NAMESPACE_MSG =
"Namespace does not exist: " + INVALID_NAMESPACE;

private static URI s3BucketBase;
private static String principalRoleName;
private static ClientCredentials adminCredentials;
Expand Down Expand Up @@ -333,6 +343,141 @@ public void testCreatePolicyWithInvalidName(String policyName) {
}
}

@Test
public void testCreatePolicyWithNonExistingNamespace() {
CreatePolicyRequest request =
CreatePolicyRequest.builder()
.setType(PredefinedPolicyTypes.DATA_COMPACTION.getName())
.setName(currentCatalogName)
.setDescription("test policy")
.setContent(EXAMPLE_TABLE_MAINTENANCE_POLICY_CONTENT)
.build();
try (Response res =
policyApi
.request(
"polaris/v1/{cat}/namespaces/{ns}/policies",
Map.of("cat", currentCatalogName, "ns", INVALID_NAMESPACE))
.post(Entity.json(request))) {
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
Assertions.assertThat(res.readEntity(String.class)).contains(INVALID_NAMESPACE_MSG);
}
}

@Test
public void testAttachPolicyToNonExistingNamespace() {
restCatalog.createNamespace(NS1);
policyApi.createPolicy(
currentCatalogName,
NS1_P1,
PredefinedPolicyTypes.DATA_COMPACTION,
EXAMPLE_TABLE_MAINTENANCE_POLICY_CONTENT,
"test policy");

Namespace invalidNamespace = Namespace.of(INVALID_NAMESPACE);
var invalidTarget =
new PolicyAttachmentTarget(
PolicyAttachmentTarget.TypeEnum.NAMESPACE, List.of(invalidNamespace.levels()));

AttachPolicyRequest request =
AttachPolicyRequest.builder().setTarget(invalidTarget).setParameters(Map.of()).build();
try (Response res =
policyApi
.request(
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy-name}/mappings",
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy-name", NS1_P1.getName()))
.put(Entity.json(request))) {
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
Assertions.assertThat(res.readEntity(String.class)).contains(INVALID_NAMESPACE_MSG);
}
policyApi.dropPolicy(currentCatalogName, NS1_P1);
}

@Test
public void testAttachPolicyToNonExistingTable() {
restCatalog.createNamespace(NS1);
policyApi.createPolicy(
currentCatalogName,
NS1_P1,
PredefinedPolicyTypes.DATA_COMPACTION,
EXAMPLE_TABLE_MAINTENANCE_POLICY_CONTENT,
"test policy");
TableIdentifier invalidTable = TableIdentifier.of(NS1, INVALID_TABLE);
var invalidTarget =
new PolicyAttachmentTarget(
PolicyAttachmentTarget.TypeEnum.TABLE_LIKE,
List.of(invalidTable.toString().split("\\.")));

AttachPolicyRequest request =
AttachPolicyRequest.builder().setTarget(invalidTarget).setParameters(Map.of()).build();
try (Response res =
policyApi
.request(
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy-name}/mappings",
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy-name", NS1_P1.getName()))
.put(Entity.json(request))) {
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
Assertions.assertThat(res.readEntity(String.class))
.contains("Table or view does not exist: " + NS1_NAME + "." + INVALID_TABLE);
}
policyApi.dropPolicy(currentCatalogName, NS1_P1);
}

@Test
public void testDetachPolicyFromNonExistingNamespace() {
restCatalog.createNamespace(NS1);
policyApi.createPolicy(
currentCatalogName,
NS1_P1,
PredefinedPolicyTypes.DATA_COMPACTION,
EXAMPLE_TABLE_MAINTENANCE_POLICY_CONTENT,
"test policy");
Namespace invalidNamespace = Namespace.of(INVALID_NAMESPACE);
var invalidTarget =
new PolicyAttachmentTarget(
PolicyAttachmentTarget.TypeEnum.NAMESPACE, List.of(invalidNamespace.levels()));

DetachPolicyRequest request = DetachPolicyRequest.builder().setTarget(invalidTarget).build();
try (Response res =
policyApi
.request(
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy-name}/mappings",
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy-name", NS1_P1.getName()))
.post(Entity.json(request))) {
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
Assertions.assertThat(res.readEntity(String.class)).contains(INVALID_NAMESPACE_MSG);
}
policyApi.dropPolicy(currentCatalogName, NS1_P1);
}

@Test
public void testDetachPolicyFromNonExistingTable() {
restCatalog.createNamespace(NS1);
policyApi.createPolicy(
currentCatalogName,
NS1_P1,
PredefinedPolicyTypes.DATA_COMPACTION,
EXAMPLE_TABLE_MAINTENANCE_POLICY_CONTENT,
"test policy");
TableIdentifier invalidTable = TableIdentifier.of(NS1, INVALID_TABLE);
var invalidTarget =
new PolicyAttachmentTarget(
PolicyAttachmentTarget.TypeEnum.TABLE_LIKE,
List.of(invalidTable.toString().split("\\.")));

DetachPolicyRequest request = DetachPolicyRequest.builder().setTarget(invalidTarget).build();
try (Response res =
policyApi
.request(
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy-name}/mappings",
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy-name", NS1_P1.getName()))
.post(Entity.json(request))) {
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
Assertions.assertThat(res.readEntity(String.class))
.contains("Table or view does not exist: " + NS1_NAME + "." + INVALID_TABLE);
}
policyApi.dropPolicy(currentCatalogName, NS1_P1);
}

@Test
public void testDropPolicy() {
restCatalog.createNamespace(NS1);
Expand All @@ -359,6 +504,24 @@ public void testDropPolicy() {
.hasSize(0);
}

@Test
public void testDropNonExistingPolicy() {
restCatalog.createNamespace(NS1);
try (Response res =
policyApi
.request(
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy}",
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy", INVALID_POLICY))
.delete()) {
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
Assertions.assertThat(res.readEntity(String.class))
.contains(
"Policy does not exist: class PolicyIdentifier",
"namespace: " + NS1_NAME,
"name: " + INVALID_POLICY);
}
}

@Test
public void testUpdatePolicy() {
restCatalog.createNamespace(NS1);
Expand Down Expand Up @@ -387,6 +550,29 @@ public void testUpdatePolicy() {
policyApi.dropPolicy(currentCatalogName, NS1_P1);
}

@Test
public void testUpdateNonExistingPolicy() {
restCatalog.createNamespace(NS1);
UpdatePolicyRequest request =
UpdatePolicyRequest.builder()
.setContent("{\"enable\":false}")
.setDescription("updated test policy")
.build();
try (Response res =
policyApi
.request(
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy}",
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy", INVALID_POLICY))
.put(Entity.json(request))) {
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
Assertions.assertThat(res.readEntity(String.class))
.contains(
"Policy does not exist: class PolicyIdentifier",
"namespace: " + NS1_NAME,
"name: " + INVALID_POLICY);
}
}

@Test
public void testListPolicies() {
restCatalog.createNamespace(NS1);
Expand Down Expand Up @@ -417,6 +603,74 @@ public void testListPolicies() {
policyApi.dropPolicy(currentCatalogName, NS1_P2);
}

@Test
public void testListPoliciesOnNonExistingNamespace() {
try (Response res =
policyApi
.request(
"polaris/v1/{cat}/namespaces/{ns}/policies",
Map.of("cat", currentCatalogName, "ns", INVALID_NAMESPACE))
.get()) {
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
Assertions.assertThat(res.readEntity(String.class)).contains(INVALID_NAMESPACE_MSG);
}
}

@Test
public void testGetApplicablePoliciesOnNonExistingNamespace() {
try (Response res =
policyApi
.request(
"polaris/v1/{cat}/applicable-policies",
Map.of("cat", currentCatalogName),
Map.of("namespace", INVALID_NAMESPACE))
.get()) {
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
Assertions.assertThat(res.readEntity(String.class)).contains(INVALID_NAMESPACE_MSG);
}
}

@Test
public void testGetApplicablePoliciesOnNonExistingTable() {
restCatalog.createNamespace(NS1);
policyApi.createPolicy(
currentCatalogName,
NS1_P1,
PredefinedPolicyTypes.DATA_COMPACTION,
EXAMPLE_TABLE_MAINTENANCE_POLICY_CONTENT,
"test policy");
try (Response res =
policyApi
.request(
"polaris/v1/{cat}/applicable-policies",
Map.of("cat", currentCatalogName),
Map.of("namespace", NS1_NAME, "target-name", INVALID_TABLE))
.get()) {
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
Assertions.assertThat(res.readEntity(String.class))
.contains("Table does not exist: " + NS1_NAME + "." + INVALID_TABLE);
}
policyApi.dropPolicy(currentCatalogName, NS1_P1);
}

@Test
public void testLoadNonExistingPolicy() {
restCatalog.createNamespace(NS1);
try (Response res =
policyApi
.request(
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy}",
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy", INVALID_POLICY))
.get()) {
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
Assertions.assertThat(res.readEntity(String.class))
.contains(
"Policy does not exist: class PolicyIdentifier",
"namespace: " + NS1_NAME,
"name: " + INVALID_POLICY);
}
}

@Test
public void testPolicyMapping() {
restCatalog.createNamespace(NS1);
Expand Down
Loading