Skip to content

Commit 9509dff

Browse files
committed
Fix compilation failures and rebase on main
1 parent 60e18ea commit 9509dff

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisManagementServiceIntegrationTest.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2181,7 +2181,12 @@ public void testCreateAndUpdatePrincipalRoleWithReservedProperties() {
21812181

21822182
PrincipalRole badPrincipalRole =
21832183
new PrincipalRole(
2184-
client.newEntityName("myprincipalrole"), Map.of("polaris.reserved", "foo"), 0L, 0L, 1);
2184+
client.newEntityName("myprincipalrole"),
2185+
false,
2186+
Map.of("polaris.reserved", "foo"),
2187+
0L,
2188+
0L,
2189+
1);
21852190
try (Response response =
21862191
managementApi
21872192
.request("v1/principal-roles")
@@ -2192,7 +2197,12 @@ public void testCreateAndUpdatePrincipalRoleWithReservedProperties() {
21922197

21932198
PrincipalRole goodPrincipalRole =
21942199
new PrincipalRole(
2195-
client.newEntityName("myprincipalrole"), Map.of("not.reserved", "foo"), 0L, 0L, 1);
2200+
client.newEntityName("myprincipalrole"),
2201+
false,
2202+
Map.of("not.reserved", "foo"),
2203+
0L,
2204+
0L,
2205+
1);
21962206
try (Response response =
21972207
managementApi
21982208
.request("v1/principal-roles")

quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/ManagementServiceTest.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import org.apache.polaris.service.TestServices;
5353
import org.apache.polaris.service.admin.PolarisAdminService;
5454
import org.apache.polaris.service.config.DefaultConfigurationStore;
55+
import org.apache.polaris.service.config.ReservedProperties;
5556
import org.junit.jupiter.api.BeforeEach;
5657
import org.junit.jupiter.api.Test;
5758
import org.mockito.Mockito;
@@ -219,7 +220,18 @@ public String getAuthenticationScheme() {
219220
return "";
220221
}
221222
},
222-
new PolarisAuthorizerImpl(new DefaultConfigurationStore(Map.of())));
223+
new PolarisAuthorizerImpl(new DefaultConfigurationStore(Map.of())),
224+
new ReservedProperties() {
225+
@Override
226+
public List<String> prefixes() {
227+
return List.of();
228+
}
229+
230+
@Override
231+
public Set<String> allowlist() {
232+
return Set.of();
233+
}
234+
});
223235
}
224236

225237
private PrincipalEntity createPrincipal(

0 commit comments

Comments
 (0)