Add cloud logging service feature #1847
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| package org.cloudfoundry.multiapps.controller.core.auditlogging; | ||
|
|
||
| import java.text.MessageFormat; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
|
|
||
| import org.cloudfoundry.multiapps.controller.core.Messages; | ||
| import org.cloudfoundry.multiapps.controller.core.auditlogging.model.AuditLogConfiguration; | ||
| import org.cloudfoundry.multiapps.controller.core.auditlogging.model.ConfigurationChangeActions; | ||
| import org.cloudfoundry.multiapps.controller.persistence.model.LoggingConfiguration; | ||
|
|
||
| public class CloudLoggingServiceConfigurationAuditLog { | ||
|
|
||
| private static final String ID_PROPERTY_NAME = "id"; | ||
| private static final String MTA_ID_PROPERTY_NAME = "mtaId"; | ||
| private static final String MTA_SPACE_PROPERTY_NAME = "mtaSpace"; | ||
| private static final String MTA_SPACE_ID_PROPERTY_NAME = "mtaSpaceId"; | ||
| private static final String MTA_ORG_PROPERTY_NAME = "mtaOrg"; | ||
| private static final String NAMESPACE_PROPERTY_NAME = "namespace"; | ||
| private static final String TARGET_SPACE_PROPERTY_NAME = "targetSpace"; | ||
| private static final String TARGET_ORG_PROPERTY_NAME = "targetOrg"; | ||
| private static final String SERVICE_INSTANCE_NAME_PROPERTY_NAME = "serviceInstanceName"; | ||
| private static final String SERVICE_KEY_NAME_PROPERTY_NAME = "serviceKeyName"; | ||
| private static final String LOG_LEVEL_PROPERTY_NAME = "logLevel"; | ||
| private static final String IS_FAILSAFE_PROPERTY_NAME = "isFailSafe"; | ||
|
|
||
| private final AuditLoggingFacade auditLoggingFacade; | ||
|
|
||
| public CloudLoggingServiceConfigurationAuditLog(AuditLoggingFacade auditLoggingFacade) { | ||
| this.auditLoggingFacade = auditLoggingFacade; | ||
| } | ||
|
|
||
| public void logCreateLoggingConfiguration(String username, String spaceId, LoggingConfiguration loggingConfiguration) { | ||
| String performedAction = MessageFormat.format(Messages.LOGGING_CONFIGURATION_CREATE, spaceId); | ||
| auditLoggingFacade.logConfigurationChangeAuditLog(new AuditLogConfiguration(username, | ||
| spaceId, | ||
| performedAction, | ||
| Messages.LOGGING_CONFIGURATION_CREATE_AUDIT_LOG_CONFIG, | ||
| buildIdentifiers(loggingConfiguration)), | ||
| ConfigurationChangeActions.CONFIGURATION_CREATE); | ||
| } | ||
|
|
||
| public void logUpdateLoggingConfiguration(String username, String spaceId, LoggingConfiguration newConfiguration) { | ||
| String performedAction = MessageFormat.format(Messages.LOGGING_CONFIGURATION_UPDATE, spaceId); | ||
| auditLoggingFacade.logConfigurationChangeAuditLog(new AuditLogConfiguration(username, | ||
| spaceId, | ||
| performedAction, | ||
| Messages.LOGGING_CONFIGURATION_UPDATE_AUDIT_LOG_CONFIG, | ||
| buildIdentifiers(newConfiguration)), | ||
| ConfigurationChangeActions.CONFIGURATION_UPDATE); | ||
| } | ||
|
|
||
| public void logDeleteLoggingConfiguration(String username, String spaceId, LoggingConfiguration loggingConfiguration) { | ||
| String performedAction = MessageFormat.format(Messages.LOGGING_CONFIGURATION_DELETE, spaceId); | ||
| auditLoggingFacade.logConfigurationChangeAuditLog(new AuditLogConfiguration(username, | ||
| spaceId, | ||
| performedAction, | ||
| Messages.LOGGING_CONFIGURATION_DELETE_AUDIT_LOG_CONFIG, | ||
| buildIdentifiers(loggingConfiguration)), | ||
| ConfigurationChangeActions.CONFIGURATION_DELETE); | ||
| } | ||
|
|
||
| public void logGetLoggingConfiguration(String username, String spaceId, LoggingConfiguration loggingConfiguration) { | ||
| String performedAction = MessageFormat.format(Messages.LOGGING_CONFIGURATION_GET, spaceId); | ||
| Map<String, String> identifiers = new HashMap<>(); | ||
| identifiers.put(MTA_ID_PROPERTY_NAME, loggingConfiguration.getMtaId()); | ||
| identifiers.put(NAMESPACE_PROPERTY_NAME, loggingConfiguration.getNamespace()); | ||
| auditLoggingFacade.logDataAccessAuditLog(new AuditLogConfiguration(username, | ||
|
Contributor
There was a problem hiding this comment. why buildIdentifiers is not used in this method? |
||
| spaceId, | ||
| performedAction, | ||
| Messages.LOGGING_CONFIGURATION_GET_AUDIT_LOG_CONFIG, | ||
| identifiers)); | ||
| } | ||
|
|
||
| public void logListLoggingConfigurations(String username, String spaceId) { | ||
|
Contributor
There was a problem hiding this comment. Is this really used? |
||
| String performedAction = MessageFormat.format(Messages.LOGGING_CONFIGURATION_LIST, spaceId); | ||
| auditLoggingFacade.logDataAccessAuditLog(new AuditLogConfiguration(username, | ||
| spaceId, | ||
| performedAction, | ||
| Messages.LOGGING_CONFIGURATION_LIST_AUDIT_LOG_CONFIG)); | ||
| } | ||
|
|
||
| private Map<String, String> buildIdentifiers(LoggingConfiguration loggingConfiguration) { | ||
| Map<String, String> identifiers = new HashMap<>(); | ||
| identifiers.put(ID_PROPERTY_NAME, loggingConfiguration.getId()); | ||
| identifiers.put(MTA_ID_PROPERTY_NAME, loggingConfiguration.getMtaId()); | ||
| identifiers.put(MTA_SPACE_PROPERTY_NAME, loggingConfiguration.getMtaSpace()); | ||
| identifiers.put(MTA_SPACE_ID_PROPERTY_NAME, loggingConfiguration.getMtaSpaceId()); | ||
| identifiers.put(MTA_ORG_PROPERTY_NAME, loggingConfiguration.getMtaOrg()); | ||
| identifiers.put(NAMESPACE_PROPERTY_NAME, loggingConfiguration.getNamespace()); | ||
| identifiers.put(TARGET_SPACE_PROPERTY_NAME, loggingConfiguration.getTargetSpace()); | ||
| identifiers.put(TARGET_ORG_PROPERTY_NAME, loggingConfiguration.getTargetOrg()); | ||
| identifiers.put(SERVICE_INSTANCE_NAME_PROPERTY_NAME, loggingConfiguration.getServiceInstanceName()); | ||
| identifiers.put(SERVICE_KEY_NAME_PROPERTY_NAME, loggingConfiguration.getServiceKeyName()); | ||
|
Comment on lines
+91
to
+95
Contributor
There was a problem hiding this comment. Can we use the IDs of target space and service instance? |
||
| identifiers.put(LOG_LEVEL_PROPERTY_NAME, Objects.toString(loggingConfiguration.getLogLevel())); | ||
| identifiers.put(IS_FAILSAFE_PROPERTY_NAME, Objects.toString(loggingConfiguration.isFailSafe())); | ||
| return identifiers; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package org.cloudfoundry.multiapps.controller.core.model; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import com.fasterxml.jackson.databind.annotation.JsonDeserialize; | ||
| import com.fasterxml.jackson.databind.annotation.JsonSerialize; | ||
| import org.cloudfoundry.multiapps.common.Nullable; | ||
| import org.immutables.value.Value; | ||
|
|
||
| @Value.Immutable | ||
| @JsonSerialize(as = ImmutableExternalLoggingServiceConfiguration.class) | ||
| @JsonDeserialize(as = ImmutableExternalLoggingServiceConfiguration.class) | ||
| public interface ExternalLoggingServiceConfiguration { | ||
|
|
||
| @Nullable | ||
| String getServiceInstanceName(); | ||
|
|
||
| @Nullable | ||
| String getServiceKeyName(); | ||
|
|
||
| @Nullable | ||
| String getTargetOrg(); | ||
|
|
||
| @Nullable | ||
| String getTargetSpace(); | ||
|
|
||
| @Nullable | ||
| String getOperationId(); | ||
|
|
||
| @Nullable | ||
| String getEndpointUrl(); | ||
|
|
||
| @Nullable | ||
| String getServerCa(); | ||
|
|
||
| @Nullable | ||
| String getClientCert(); | ||
|
|
||
| @Nullable | ||
| String getClientKey(); | ||
|
|
||
| @Nullable | ||
| List<String> getLogLevels(); | ||
|
|
||
| @Nullable | ||
| Boolean isFailSafe(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because SAP Cloud logging service is an internal proprietary service it should not be exposed in the open source. The whole logic related to the service must be move in the internal project.
Move every SAP related thing to the internal project and only leave the what is actually open source in this PR