#199 fix PDP service so docker changes can be tested

- Deletes duplicative, unused `foundation-policy-decision-point` module - Repackages `extensions-pdp-service` to be more in-line with rest of the project - Undo aiops -> aissemble property file rename as the code hasn't been updated - Update JKS key alias to from aiops to aissemble - Add healthcheck URL to PDP service for easy testing
boozallen · Jul 18, 2024 · 50ab114 · 50ab114
1 parent e54f099
commit 50ab114
Show file tree

Hide file tree

Showing 14 changed files with 5 additions and 243 deletions.
diff --git a/...le-policy-decision-point/src/main/resources/authorization/attributes/test-attributes.json b/...le-policy-decision-point/src/main/resources/authorization/attributes/test-attributes.json
@@ -4,6 +4,6 @@
 		"category": "subject",
 		"type": "boolean",
 		"required": "false",
-		"attributePointClass": "com.boozallen.LocalAttributePoint"
+		"attributePointClass": "com.boozallen.aissemble.security.LocalAttributePoint"
 	}
 ]
diff --git a/...ns/extensions-docker/aissemble-policy-decision-point/src/main/resources/docker/Dockerfile b/...ns/extensions-docker/aissemble-policy-decision-point/src/main/resources/docker/Dockerfile
@@ -12,7 +12,7 @@ RUN mkdir -p /deployments/krausening/
 COPY target/dockerbuild/*.jar /deployments/
 
 COPY ./src/main/resources/truststore/aissemble-secure.jks /deployments/
-COPY ./src/main/resources/krausening/base/aissemble-security.properties /deployments/krausening/
+COPY ./src/main/resources/krausening/base/aiops-security.properties /deployments/krausening/
 COPY ./src/main/resources/authorization/policies/test-policy.xml /deployments/
 COPY ./src/main/resources/authorization/attributes/test-attributes.json /deployments/
 COPY ./src/main/resources/authorization/pdp.xml /deployments/
diff --git a/...sening/base/aissemble-security.properties → ...krausening/base/aiops-security.properties b/...sening/base/aissemble-security.properties → ...krausening/base/aiops-security.properties
diff --git a/...docker/aissemble-policy-decision-point/src/main/resources/truststore/aissemble-secure.jks b/...docker/aissemble-policy-decision-point/src/main/resources/truststore/aissemble-secure.jks
diff --git a/...c/main/java/com/boozallen/aiops/security/authorization/policy/AiopsAttributeProvider.java b/...c/main/java/com/boozallen/aiops/security/authorization/policy/AiopsAttributeProvider.java
@@ -339,9 +339,9 @@ protected AiopsAttributePoint findAttributePointImplementation(AiopsAttribute at
                 }
             }
         } catch (ClassNotFoundException e) {
-            logger.error("Could not find attribute point '{}' in classpath!", attributePointClassName);
+            logger.error("Could not find attribute point '{}' in classpath!", attributePointClassName, e);
         } catch (InstantiationException | IllegalAccessException e) {
-            logger.error("Could not instantiate attribute point '" + attributePointClassName + "'!", e);
+            logger.error("Could not instantiate attribute point '{}'!", attributePointClassName, e);
         }
 
         return attributePoint;

diff --git a/...va/com/boozallen/LocalAttributePoint.java → ...ssemble/security/LocalAttributePoint.java b/...va/com/boozallen/LocalAttributePoint.java → ...ssemble/security/LocalAttributePoint.java
@@ -1,4 +1,4 @@
-package com.boozallen;
+package com.boozallen.aissemble.security;
 
 /*-
  * #%L

diff --git a/...java/com/boozallen/PDPHelperResource.java → ...aissemble/security/PDPHelperResource.java b/...java/com/boozallen/PDPHelperResource.java → ...aissemble/security/PDPHelperResource.java
diff --git a/foundation/foundation-security/foundation-policy-decision-point/LICENSE.txt b/foundation/foundation-security/foundation-policy-decision-point/LICENSE.txt
diff --git a/foundation/foundation-security/foundation-policy-decision-point/README.md b/foundation/foundation-security/foundation-policy-decision-point/README.md
diff --git a/foundation/foundation-security/foundation-policy-decision-point/pom.xml b/foundation/foundation-security/foundation-policy-decision-point/pom.xml
diff --git a/...policy-decision-point/src/main/java/com/boozallen/aiops/security/LocalAttributePoint.java b/...policy-decision-point/src/main/java/com/boozallen/aiops/security/LocalAttributePoint.java
diff --git a/...n-policy-decision-point/src/main/java/com/boozallen/aiops/security/PDPHelperResource.java b/...n-policy-decision-point/src/main/java/com/boozallen/aiops/security/PDPHelperResource.java
diff --git a/...ation-security/foundation-policy-decision-point/src/main/resources/application.properties b/...ation-security/foundation-policy-decision-point/src/main/resources/application.properties
diff --git a/foundation/foundation-security/pom.xml b/foundation/foundation-security/pom.xml
@@ -15,7 +15,6 @@
 	<description>Contains the modules used for security</description>
 
 	<modules>
-		<module>foundation-policy-decision-point</module>
 		<module>aissemble-foundation-pdp-client-python</module>
 		<module>foundation-pdp-client-java</module>
 	</modules>