Fix #26798: log additional manifests

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

@@ -111,6 +111,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static eu.openanalytics.containerproxy.backend.kubernetes.PodPatcher.DEBUG_PROPERTY;
+
 public class KubernetesBackend extends AbstractContainerBackend {
 
 	private static final String PROPERTY_PREFIX = "proxy.kubernetes.";
@@ -136,6 +138,10 @@ public class KubernetesBackend extends AbstractContainerBackend {
 
 	private KubernetesManifestsRemover kubernetesManifestsRemover;
 
+	private Boolean logManifests;
+
+	private final ObjectMapper writer = new ObjectMapper(new YAMLFactory());
+
 	@Override
 	public void initialize() throws ContainerProxyException {
 		super.initialize();
@@ -157,6 +163,7 @@ public void initialize() throws ContainerProxyException {
 
 		kubeClient = new DefaultKubernetesClient(configBuilder.build());
 		kubernetesManifestsRemover = new KubernetesManifestsRemover(kubeClient, getAppNamespaces(), identifierService);
+		logManifests = environment.getProperty(DEBUG_PROPERTY, Boolean.class, false);
 	}
 
 	public void initialize(KubernetesClient client) {
@@ -472,10 +479,10 @@ private JsonPatch readPatchFromSpec(KubernetesSpecExtension specExtension) throw
 	 * The resource will only be created if it does not already exist.
 	 */
 	private void createAdditionalManifests(Proxy proxy, KubernetesSpecExtension specExtension, String namespace) throws JsonProcessingException {
-		for (GenericKubernetesResource fullObject: parseAdditionalManifests(proxy.getUserId(), proxy.getSpecId(), namespace, specExtension.getKubernetesAdditionalManifests(), false)) {
+		for (GenericKubernetesResource fullObject: parseAdditionalManifests(proxy, namespace, specExtension.getKubernetesAdditionalManifests(), false)) {
 			applyAdditionalManifest(proxy, fullObject);
 		}
-		for (GenericKubernetesResource fullObject: parseAdditionalManifests(proxy.getUserId(), proxy.getSpecId(), namespace, specExtension.getKubernetesAdditionalPersistentManifests(), true)) {
+		for (GenericKubernetesResource fullObject: parseAdditionalManifests(proxy, namespace, specExtension.getKubernetesAdditionalPersistentManifests(), true)) {
 			applyAdditionalManifest(proxy, fullObject);
 		}
 	}
@@ -518,7 +525,7 @@ private void applyAdditionalManifest(Proxy proxy, GenericKubernetesResource reso
 	 * When the resource has no namespace definition, the provided namespace
 	 * parameter will be used.
 	 */
-	private List<GenericKubernetesResource> parseAdditionalManifests(String userId, String specId, String namespace, List<String> manifests, Boolean persistent) throws JsonProcessingException {
+	private List<GenericKubernetesResource> parseAdditionalManifests(Proxy proxy, String namespace, List<String> manifests, Boolean persistent) throws JsonProcessingException {
 		ArrayList<GenericKubernetesResource> result = new ArrayList<>();
 		for (String manifest : manifests) {
 			GenericKubernetesResource object = Serialization.yamlMapper().readValue(manifest, GenericKubernetesResource.class);
@@ -537,12 +544,12 @@ private List<GenericKubernetesResource> parseAdditionalManifests(String userId,
 			}
 			fullObject.getMetadata().getLabels().put("openanalytics.eu/sp-additional-manifest", "true");
 			fullObject.getMetadata().getLabels().put("openanalytics.eu/sp-persistent-manifest", persistent.toString());
-			fullObject.getMetadata().getLabels().put("openanalytics.eu/sp-manifest-id", kubernetesManifestsRemover.getManifestId(specId, userId));
+			fullObject.getMetadata().getLabels().put("openanalytics.eu/sp-manifest-id", kubernetesManifestsRemover.getManifestId(proxy.getSpecId(), proxy.getUserId()));
+
+			if (logManifests) {
+				slog.info(proxy, "Creating additional manifest: \n" + writer.writeValueAsString(fullObject));
+			}
 
-			// TODO annotations
-//			fullObject.getMetadata().getLabels().put("openanalytics.eu/sp-realm", identifierService.realmId);
-//			fullObject.getMetadata().getLabels().put("openanalytics.eu/sp-spec-id", specId);
-//			fullObject.getMetadata().getLabels().put("openanalytics.eu/sp-uer-id", specId);
 			result.add(fullObject);
 		}
 		return result;

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/PodPatcher.java

@@ -38,7 +38,7 @@
 @Component
 public class PodPatcher {
 
-	private static final String DEBUG_PROPERTY = "proxy.kubernetes.debug-patches";
+	public static final String DEBUG_PROPERTY = "proxy.kubernetes.debug-patches";
 
 	@Inject
 	private Environment environment;
@@ -54,7 +54,7 @@ public class PodPatcher {
 	public void init() {
 		mapper.registerModule(new JSR353Module());
 		writer.registerModule(new JSR353Module());
-		loggingEnabled = Boolean.valueOf(environment.getProperty(DEBUG_PROPERTY, "false"));
+		loggingEnabled = environment.getProperty(DEBUG_PROPERTY, Boolean.class, false);
 	}
 
 	/**
@@ -80,7 +80,6 @@ public Pod patch(Pod pod, JsonPatch patch) {
 	 * enabled the original and patched specification will be logged as YAML.
 	 */
 	public Pod patchWithDebug(Proxy proxy, Pod pod, JsonPatch patch) throws JsonProcessingException {
-		// TODO pretty print
 		if (loggingEnabled) {
 			log.info(proxy, "Original Pod: \n" + writer.writeValueAsString(pod));
 		}