Skip to content

Add resource active check for the CLS configuration #1896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yavor16 merged 1 commit into from
Aug 13, 2026
Merged

Add resource active check for the CLS configuration #1896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...dfoundry/multiapps/controller/process/steps/CollectCloudLoggingServiceParametersStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private boolean isCloudLoggingEnabled(DeploymentDescriptor deploymentDescriptor)
.isEmpty()
&& deploymentDescriptor.getResources()
.stream()
.anyMatch(CollectCloudLoggingServiceParametersStep::isCloudLoggingServiceResource);
.anyMatch(CollectCloudLoggingServiceParametersStep::isActiveCloudLoggingServiceResource);
}

protected LoggingConfiguration createLoggingServiceConfiguration(ProcessContext context,
Expand Down Expand Up @@ -179,11 +179,15 @@ private void updateLoggingConfiguration(ProcessContext context, LoggingConfigura

private Resource findCloudLoggingServiceResource(List<Resource> resources) {
return resources.stream()
.filter(CollectCloudLoggingServiceParametersStep::isCloudLoggingServiceResource)
.filter(CollectCloudLoggingServiceParametersStep::isActiveCloudLoggingServiceResource)
.findFirst()
.get();
}

private static boolean isActiveCloudLoggingServiceResource(Resource resource) {
return isCloudLoggingServiceResource(resource) && resource.isActive();
Comment thread
Yavor16 marked this conversation as resolved.
}

private static boolean isCloudLoggingServiceResource(Resource resource) {
ResourceType resourceType = CloudModelBuilderUtil.getResourceType(resource);
return ResourceType.CLOUD_LOGGING_SERVICE.equals(resourceType);
Expand Down
37 changes: 37 additions & 0 deletions ...ndry/multiapps/controller/process/steps/CollectCloudLoggingServiceParametersStepTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,33 @@ void deploy_cloudLoggingResource_noUnsentEntries_doesNotForward() throws FileSto
verify(operationLogsExporter, never()).sendLogsToCloudLoggingService(any(), Mockito.<OperationLogEntry> any());
}

@Test
void deploy_inactiveCloudLoggingResource_noExistingConfig_finishesWithoutSideEffects() {
prepareDeployContext(descriptorWithInactiveCloudLogging());

step.execute(execution);

assertStepFinishedSuccessfully();
assertNull(context.getVariable(Variables.EXTERNAL_LOGGING_SERVICE_CONFIGURATION));
verify(loggingConfigurationQuery, never()).delete();
verify(auditLog, never()).logDeleteLoggingConfiguration(any(), any(), any());
verify(unsentProcessLogsProvider, never()).getUnsentProcessLogs(any());
}

@Test
void deploy_inactiveCloudLoggingResource_existingConfig_deletesExisting() {
LoggingConfiguration existing = buildConfig();
stubExistingConfig(existing);
prepareDeployContext(descriptorWithInactiveCloudLogging());

step.execute(execution);

assertStepFinishedSuccessfully();
assertNull(context.getVariable(Variables.EXTERNAL_LOGGING_SERVICE_CONFIGURATION));
verify(auditLog).logDeleteLoggingConfiguration(USER_NAME, SPACE_GUID, existing);
verify(loggingConfigurationQuery).delete();
}

private void prepareDeployContext(DeploymentDescriptor descriptor) {
when(processTypeParser.getProcessType(any())).thenReturn(ProcessType.DEPLOY);
context.setVariable(Variables.DEPLOYMENT_DESCRIPTOR, descriptor);
Expand All @@ -256,6 +283,16 @@ private static DeploymentDescriptor descriptorWithCloudLogging() {
CLOUD_LOGGING_TYPE_PARAMETER))));
}

private static DeploymentDescriptor descriptorWithInactiveCloudLogging() {
return DeploymentDescriptor.createV3()
.setResources(List.of(Resource.createV3()
.setName("my-cls")
.setType(CLOUD_LOGGING_RESOURCE_TYPE)
.setActive(false)
.setParameters(Map.of(SupportedParameters.TYPE,
CLOUD_LOGGING_TYPE_PARAMETER))));
}

private static DeploymentDescriptor descriptorWithoutCloudLogging() {
return DeploymentDescriptor.createV3()
.setResources(List.of(Resource.createV3()
Expand Down
Loading