From 1f454ef721048b25dc124a24cb6514fcb6a25ceb Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Thu, 15 Oct 2020 11:55:36 -0500 Subject: [PATCH] Update demo application --- spring-credhub-demo/build.gradle | 6 +- .../credhub/demo/CredHubDemoController.java | 83 ++++++++++--------- .../src/main/resources/application.yml | 4 + 3 files changed, 53 insertions(+), 40 deletions(-) diff --git a/spring-credhub-demo/build.gradle b/spring-credhub-demo/build.gradle index 989110b..4ba3a14 100644 --- a/spring-credhub-demo/build.gradle +++ b/spring-credhub-demo/build.gradle @@ -18,7 +18,7 @@ description = 'Spring CredHub Demo' buildscript { ext { - springBootVersion = "2.0.6.RELEASE" + springBootVersion = "2.2.6.RELEASE" } dependencies { @@ -45,10 +45,10 @@ apply plugin: 'io.spring.dependency-management' apply plugin: 'org.springframework.boot' dependencies { - compile("org.springframework.boot:spring-boot-starter-webflux") + compile("org.springframework.boot:spring-boot-starter-web") compile("org.springframework.boot:spring-boot-starter-actuator") - compile("org.springframework.credhub:spring-credhub-starter:2.0.0.BUILD-SNAPSHOT") + compile("org.springframework.credhub:spring-credhub-starter:2.1.1.RELEASE") } repositories { diff --git a/spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java b/spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java index 5b2f679..8d4cbb6 100644 --- a/spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java +++ b/spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java @@ -43,10 +43,13 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class CredHubDemoController { + private static final String APP_GUID_2 = UUID.randomUUID().toString(); - private CredHubCredentialOperations credentialOperations; + private final CredHubCredentialOperations credentialOperations; + private final CredHubPermissionOperations permissionOperations; + private final CredHubInterpolationOperations interpolationOperations; public CredHubDemoController(CredHubOperations credHubOperations) { @@ -60,11 +63,10 @@ public class CredHubDemoController { Results results = new Results(); try { - SimpleCredentialName credentialName = - new SimpleCredentialName("spring-credhub", "demo", "credentials_json"); + SimpleCredentialName credentialName = new SimpleCredentialName("spring-credhub", "demo", + "credentials_json"); - CredentialDetails credentialDetails = - writeCredentials(credentialName, value, results); + CredentialDetails credentialDetails = writeCredentials(credentialName, value, results); getCredentialsById(credentialDetails.getId(), results); @@ -83,23 +85,20 @@ public class CredHubDemoController { interpolateServiceData(credentialName, results); deleteCredentials(credentialName, results); - } catch (Exception e) { + } + catch (Exception e) { saveResults(results, "Exception caught: " + e.getMessage()); } return results; } - private CredentialDetails writeCredentials(SimpleCredentialName name, - Map value, - Results results) { + private CredentialDetails writeCredentials(SimpleCredentialName name, Map value, + Results results) { try { - JsonCredentialRequest request = JsonCredentialRequest.builder() - .name(name) - .value(value) - .build(); + JsonCredentialRequest request = JsonCredentialRequest.builder().name(name).value(value).build(); - CredentialDetails credentialDetails = credentialOperations.write(request); + CredentialDetails credentialDetails = this.credentialOperations.write(request); saveResults(results, "Successfully wrote credentials: ", credentialDetails); return credentialDetails; @@ -112,61 +111,65 @@ public class CredHubDemoController { private void getCredentialsById(String id, Results results) { try { - CredentialDetails retrievedDetails = - credentialOperations.getById(id, JsonCredential.class); + CredentialDetails retrievedDetails = this.credentialOperations.getById(id, + JsonCredential.class); saveResults(results, "Successfully retrieved credentials by ID: ", retrievedDetails); - } catch (Exception e) { + } + catch (Exception e) { saveResults(results, "Error retrieving credentials by ID: ", e.getMessage()); } } private void getCredentialsByName(CredentialName name, Results results) { try { - CredentialDetails retrievedDetails = - credentialOperations.getByName(name, JsonCredential.class); + CredentialDetails retrievedDetails = this.credentialOperations.getByName(name, + JsonCredential.class); saveResults(results, "Successfully retrieved credentials by name: ", retrievedDetails); - } catch (Exception e) { + } + catch (Exception e) { saveResults(results, "Error retrieving credentials by name: ", e.getMessage()); } } private void findCredentialsByName(CredentialName name, Results results) { try { - List retrievedDetails = credentialOperations.findByName(name); + List retrievedDetails = this.credentialOperations.findByName(name); saveResults(results, "Successfully found credentials by name: ", retrievedDetails); - } catch (Exception e) { + } + catch (Exception e) { saveResults(results, "Error finding credentials by name: ", e.getMessage()); } } private void findCredentialsByPath(String path, Results results) { try { - List retrievedDetails = credentialOperations.findByPath(path); + List retrievedDetails = this.credentialOperations.findByPath(path); saveResults(results, "Successfully found credentials by path: ", retrievedDetails); - } catch (Exception e) { + } + catch (Exception e) { saveResults(results, "Error finding credentials by path: ", e.getMessage()); } } private void getCredentialPermissions(CredentialName name, Results results) { try { - List retrievedDetails = permissionOperations.getPermissions(name); + List retrievedDetails = this.permissionOperations.getPermissions(name); saveResults(results, "Successfully retrieved credential permissions: ", retrievedDetails); - } catch (Exception e) { + } + catch (Exception e) { saveResults(results, "Error retrieving credential permissions: ", e.getMessage()); } } private void addCredentialPermissions(CredentialName name, Results results) { try { - Permission permission = Permission.builder() - .app(APP_GUID_2) - .operations(Operation.READ, Operation.WRITE, Operation.DELETE) - .build(); + Permission permission = Permission.builder().app(APP_GUID_2) + .operations(Operation.READ, Operation.WRITE, Operation.DELETE).build(); - permissionOperations.addPermissions(name, permission); + this.permissionOperations.addPermissions(name, permission); saveResults(results, "Successfully added permissions"); - } catch (Exception e) { + } + catch (Exception e) { saveResults(results, "Error adding permission: ", e.getMessage()); } } @@ -174,23 +177,26 @@ public class CredHubDemoController { private void interpolateServiceData(CredentialName name, Results results) { try { ServicesData request = buildServicesData(name.getName()); - ServicesData interpolatedServiceData = interpolationOperations.interpolateServiceData(request); + ServicesData interpolatedServiceData = this.interpolationOperations.interpolateServiceData(request); saveResults(results, "Successfully interpolated service data: ", interpolatedServiceData); - } catch (Exception e) { + } + catch (Exception e) { saveResults(results, "Error interpolating service data: ", e.getMessage()); } } private void deleteCredentials(CredentialName name, Results results) { try { - credentialOperations.deleteByName(name); + this.credentialOperations.deleteByName(name); saveResults(results, "Successfully deleted credentials"); - } catch (Exception e) { + } + catch (Exception e) { saveResults(results, "Error deleting credentials by name: ", e.getMessage()); } } private ServicesData buildServicesData(String credHubReferenceName) throws IOException { + // @formatter:off String vcapServices = "{" + " \"service-offering\": [" + " {" + @@ -207,6 +213,7 @@ public class CredHubDemoController { " }" + " ]" + "}"; + // @formatter:on ObjectMapper mapper = new ObjectMapper(); return mapper.readValue(vcapServices, ServicesData.class); @@ -220,6 +227,8 @@ public class CredHubDemoController { results.add(Collections.singletonMap(message, details)); } - private class Results extends ArrayList> { + private static class Results extends ArrayList> { + } + } diff --git a/spring-credhub-demo/src/main/resources/application.yml b/spring-credhub-demo/src/main/resources/application.yml index 7ea719a..722bcbd 100644 --- a/spring-credhub-demo/src/main/resources/application.yml +++ b/spring-credhub-demo/src/main/resources/application.yml @@ -3,3 +3,7 @@ management: web: exposure: include: "*" + +spring: + credhub: + url: https://credhub.service.cf.internal:8844 \ No newline at end of file