Skip to content

Commit f57ddc0

Browse files
NSeydouxNSeydoux
authored
Pick up VC Provider from environment configuration (#530)
1 parent 255ea6a commit f57ddc0

3 files changed

Lines changed: 47 additions & 19 deletions

File tree

‎.github/workflows/ci-config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
env:
3232
INRUPT_TEST_WEBID: ${{ secrets.INRUPT_PROD_WEBID }}
3333
INRUPT_TEST_PUBLIC_RESOURCE_PATH: ${{ secrets.INRUPT_PROD_PUBLIC_RESOURCE_PATH }}
34+
INRUPT_ACCESS_ACCESS_GRANT_PROVIDER: ${{ secrets.INRUPT_PROD_ACCESS_GRANT_PROVIDER }}
3435
INRUPT_TEST_CLIENT_ID: ${{ secrets.INRUPT_PROD_CLIENT_ID }}
3536
INRUPT_TEST_CLIENT_SECRET: ${{ secrets.INRUPT_PROD_CLIENT_SECRET }}
3637

@@ -41,6 +42,7 @@ jobs:
4142
env:
4243
INRUPT_TEST_WEBID: ${{ secrets.INRUPT_DEV_WEBID }}
4344
INRUPT_TEST_PUBLIC_RESOURCE_PATH: ${{ secrets.INRUPT_DEV_PUBLIC_RESOURCE_PATH }}
45+
INRUPT_ACCESS_ACCESS_GRANT_PROVIDER: ${{ secrets.INRUPT_DEV_ACCESS_GRANT_PROVIDER }}
4446
INRUPT_TEST_CLIENT_ID: ${{ secrets.INRUPT_DEV_CLIENT_ID }}
4547
INRUPT_TEST_CLIENT_SECRET: ${{ secrets.INRUPT_DEV_CLIENT_SECRET }}
4648

‎integration/base/src/main/java/com/inrupt/client/integration/base/AccessGrantScenarios.java‎

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public class AccessGrantScenarios {
9393
private static final String AUTH_METHOD = config
9494
.getOptionalValue("inrupt.test.auth-method", String.class)
9595
.orElse("client_secret_basic");
96-
protected static String VC_PROVIDER;
96+
protected static String ACCESS_GRANT_PROVIDER;
9797
private static final String PRIVATE_RESOURCE_PATH = config
9898
.getOptionalValue("inrupt.test.private-resource-path", String.class)
9999
.orElse("private");
@@ -190,11 +190,13 @@ static void setup() throws IOException {
190190
);
191191
accessGrantServer.start();
192192

193-
VC_PROVIDER = config
194-
.getOptionalValue("inrupt.test.vc.provider", String.class)
193+
ACCESS_GRANT_PROVIDER = config
194+
.getOptionalValue("inrupt.test.access-grant.provider", String.class)
195195
.orElse(accessGrantServer.getMockServerUrl());
196196

197-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
197+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
198+
URI.create(ACCESS_GRANT_PROVIDER)
199+
).session(session);
198200
final Set<String> modes = new HashSet<>(Arrays.asList(GRANT_MODE_READ, GRANT_MODE_APPEND));
199201
final Instant expiration = Instant.parse(GRANT_EXPIRATION);
200202

@@ -206,7 +208,7 @@ static void setup() throws IOException {
206208

207209
LOGGER.info("Integration Test Issuer: [{}]", issuer);
208210
LOGGER.info("Integration Test Pod Host: [{}]", podUrl);
209-
LOGGER.info("Integration Test Access Grant server: [{}]", VC_PROVIDER);
211+
LOGGER.info("Integration Test Access Grant server: [{}]", ACCESS_GRANT_PROVIDER);
210212
}
211213

212214
@AfterAll
@@ -237,7 +239,9 @@ static void teardown() {
237239
void accessGrantIssuanceLifecycleTest(final Session session) {
238240
LOGGER.info("Integration Test - Access Grant issuance lifecycle");
239241

240-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
242+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
243+
URI.create(ACCESS_GRANT_PROVIDER)
244+
).session(session);
241245

242246
final Set<String> modes = new HashSet<>(Arrays.asList(GRANT_MODE_READ));
243247
final Instant expiration = Instant.parse(GRANT_EXPIRATION);
@@ -286,7 +290,9 @@ void accessGrantIssuanceLifecycleTest(final Session session) {
286290
void accessGrantWithRequestOverridesTest(final Session session) {
287291
LOGGER.info("Integration Test - Access Grant with request overrides");
288292

289-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
293+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
294+
URI.create(ACCESS_GRANT_PROVIDER)
295+
).session(session);
290296

291297
final Set<String> modes = new HashSet<>(Arrays.asList(GRANT_MODE_READ, GRANT_MODE_APPEND));
292298
final Instant expiration = Instant.now().plus(90, ChronoUnit.DAYS);
@@ -305,7 +311,9 @@ void accessGrantWithRequestOverridesTest(final Session session) {
305311
void accessGrantNonRecursiveTest(final Session session) {
306312
LOGGER.info("Integration Test - Issue a non-recursive access grant");
307313

308-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
314+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
315+
URI.create(ACCESS_GRANT_PROVIDER)
316+
).session(session);
309317

310318
final Set<String> modes = new HashSet<>(Arrays.asList(GRANT_MODE_READ));
311319
final Instant expiration = Instant.parse(GRANT_EXPIRATION);
@@ -325,7 +333,9 @@ void accessGrantNonRecursiveTest(final Session session) {
325333
void accessGrantQueryByRequestorTest(final Session session) {
326334
LOGGER.info("Integration Test - Lookup Access Grants by requestor");
327335

328-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
336+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
337+
URI.create(ACCESS_GRANT_PROVIDER)
338+
).session(session);
329339

330340
//query for all grants issued by the user
331341
final List<AccessRequest> grants = accessGrantClient.query(sharedResource, null, URI.create(webidUrl),
@@ -349,7 +359,9 @@ void accessGrantQueryByRequestorTest(final Session session) {
349359
void accessGrantQueryByResourceTest(final Session session) {
350360
LOGGER.info("Integration Test - Lookup Access Grants by resource");
351361

352-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
362+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
363+
URI.create(ACCESS_GRANT_PROVIDER)
364+
).session(session);
353365

354366
//query for all grants of a dedicated resource
355367
final List<AccessRequest> requests = accessGrantClient.query(sharedResource, null, URI.create(webidUrl),
@@ -370,7 +382,9 @@ void accessGrantQueryByResourceTest(final Session session) {
370382
void accessGrantQueryByPurposeTest(final Session session) {
371383
LOGGER.info("Integration Test - Lookup Access Grants by purpose");
372384

373-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
385+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
386+
URI.create(ACCESS_GRANT_PROVIDER)
387+
).session(session);
374388

375389
//query for all grants with a dedicated purpose
376390
final List<AccessRequest> requests = accessGrantClient.query(sharedResource, null, URI.create(webidUrl),
@@ -399,7 +413,9 @@ void accessGrantGetRdfTest(final Session session) {
399413
assertDoesNotThrow(() -> client.create(resource));
400414
}
401415

402-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
416+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
417+
URI.create(ACCESS_GRANT_PROVIDER)
418+
).session(session);
403419

404420
final Set<String> modes = new HashSet<>(Arrays.asList(GRANT_MODE_READ, GRANT_MODE_WRITE, GRANT_MODE_APPEND));
405421
final Instant expiration = Instant.parse(GRANT_EXPIRATION);
@@ -432,7 +448,9 @@ void accessGrantSetRdfTest(final Session session) {
432448
try (final SolidRDFSource resource = new SolidRDFSource(testRDFresourceURI)) {
433449
assertDoesNotThrow(() -> client.create(resource));
434450

435-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
451+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
452+
URI.create(ACCESS_GRANT_PROVIDER)
453+
).session(session);
436454

437455
final Set<String> modes = new HashSet<>(Arrays.asList(
438456
GRANT_MODE_READ, GRANT_MODE_WRITE, GRANT_MODE_APPEND));
@@ -470,7 +488,9 @@ void accessGrantSetRdfTest(final Session session) {
470488
void accessGrantCreateRdfTest(final Session session) {
471489
LOGGER.info("Integration Test - Creating RDF using Access Grant");
472490

473-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
491+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
492+
URI.create(ACCESS_GRANT_PROVIDER)
493+
).session(session);
474494

475495
final URI newTestFileURI = URIBuilder.newBuilder(testContainerURI)
476496
.path("newRdf.ttl")
@@ -515,7 +535,9 @@ void accessGrantGetNonRdfTest(final Session session) throws IOException {
515535
assertDoesNotThrow(() -> client.create(testResource));
516536
}
517537

518-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
538+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
539+
URI.create(ACCESS_GRANT_PROVIDER)
540+
).session(session);
519541

520542
final Set<String> modes = new HashSet<>(Arrays.asList(GRANT_MODE_READ, GRANT_MODE_WRITE, GRANT_MODE_APPEND));
521543
final Instant expiration = Instant.parse(GRANT_EXPIRATION);
@@ -560,7 +582,9 @@ void accessGrantSetNonRdfTest(final Session session) throws IOException {
560582
assertDoesNotThrow(() -> client.create(testResource));
561583
}
562584

563-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
585+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
586+
URI.create(ACCESS_GRANT_PROVIDER)
587+
).session(session);
564588

565589
final Set<String> modes = new HashSet<>(Arrays.asList(GRANT_MODE_READ, GRANT_MODE_WRITE, GRANT_MODE_APPEND));
566590
final Instant expiration = Instant.parse(GRANT_EXPIRATION);
@@ -604,7 +628,9 @@ void accessGrantCreateNonRdfTest(final Session session) throws IOException {
604628
.path("newFile.txt")
605629
.build();
606630

607-
final AccessGrantClient accessGrantClient = new AccessGrantClient(URI.create(VC_PROVIDER)).session(session);
631+
final AccessGrantClient accessGrantClient = new AccessGrantClient(
632+
URI.create(ACCESS_GRANT_PROVIDER)
633+
).session(session);
608634

609635
final Set<String> modes = new HashSet<>(Arrays.asList(GRANT_MODE_READ, GRANT_MODE_WRITE, GRANT_MODE_APPEND));
610636
final Instant expiration = Instant.parse(GRANT_EXPIRATION);

‎integration/uma/src/test/java/com/inrupt/client/integration/uma/UmaAccessGrantScenarioTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void accessGrantUmaAuthentication(final Session session) {
4747
LOGGER.info("Integration Test - UMA Authentication to VC endpoint");
4848

4949
final AccessGrantClient accessGrantClient = new AccessGrantClient(
50-
URI.create(AccessGrantScenarios.VC_PROVIDER)
50+
URI.create(AccessGrantScenarios.ACCESS_GRANT_PROVIDER)
5151
).session(session);
5252

5353
// Make an authenticated request to the VC provider /issue endpoint to enforce a token is cached by the session.
@@ -59,7 +59,7 @@ void accessGrantUmaAuthentication(final Session session) {
5959
.toCompletableFuture().join();
6060
// Lookup the session cache.
6161
final Request dummyRequest = Request.newBuilder(
62-
URI.create(AccessGrantScenarios.VC_PROVIDER).resolve("/issue")
62+
URI.create(AccessGrantScenarios.ACCESS_GRANT_PROVIDER).resolve("/issue")
6363
).POST(Request.BodyPublishers.ofString("Not relevant")).build();
6464
final var token = session.fromCache(dummyRequest);
6565
final var credential = session.getCredential(

0 commit comments

Comments
 (0)