Skip to content
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

Jump to bottom

fix(saas): apply new operate config #2402

Merged
merged 4 commits into from
May 2, 2024
Merged

fix(saas): apply new operate config #2402

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd5e308
fix(saas): apply new operate config
chillleader May 2, 2024
6b8cca4
lint
chillleader May 2, 2024
c89c0f7
rm old test
chillleader May 2, 2024
a58ba2a
add new test
chillleader May 2, 2024
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
50 changes: 20 additions & 30 deletions ...saas-bundle/src/main/java/io/camunda/connector/runtime/saas/SaaSOperateClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
*/
package io.camunda.connector.runtime.saas;

import io.camunda.common.auth.Authentication;
import io.camunda.common.auth.JwtConfig;
import io.camunda.common.auth.JwtCredential;
import io.camunda.common.auth.Product;
import io.camunda.common.auth.SaaSAuthenticationBuilder;
import io.camunda.common.json.JsonMapper;
import io.camunda.connector.api.secret.SecretProvider;
import io.camunda.operate.CamundaOperateClient;
import io.camunda.zeebe.spring.client.properties.OperateClientConfigurationProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;

@Configuration
public class SaaSOperateClientFactory {

private static final Logger LOG = LoggerFactory.getLogger(SaaSOperateClientFactory.class);
public static String SECRET_NAME_CLIENT_ID = "M2MClientId";
public static String SECRET_NAME_SECRET = "M2MSecret";

Expand All @@ -45,37 +45,27 @@ public SaaSOperateClientFactory(@Autowired SaaSConfiguration saaSConfiguration)
this.internalSecretProvider = saaSConfiguration.getInternalSecretProvider();
}

@Bean
public OperatePropertiesPostProcessor operatePropertiesPostProcessor() {
return new OperatePropertiesPostProcessor();
}

@Bean
@Primary
public CamundaOperateClient camundaOperateClientBundle(Authentication authentication) {
public CamundaOperateClient camundaOperateClientBundle(
OperateClientConfigurationProperties operateProperties, JsonMapper jsonMapper) {

var jwtConfig = new JwtConfig();
var jwtCredential =
new JwtCredential(
internalSecretProvider.getSecret(SECRET_NAME_CLIENT_ID),
internalSecretProvider.getSecret(SECRET_NAME_SECRET),
operateProperties.getBaseUrl(),
operateProperties.getAuthUrl());
jwtConfig.addProduct(Product.OPERATE, jwtCredential);

var authentication =
new SaaSAuthenticationBuilder().withJwtConfig(jwtConfig).withJsonMapper(jsonMapper).build();

return CamundaOperateClient.builder()
.operateUrl(operateUrl)
.authentication(authentication)
.setup()
.build();
}

public class OperatePropertiesPostProcessor implements BeanPostProcessor {

public OperatePropertiesPostProcessor() {
LOG.info("OperatePropertiesPostProcessor created");
}

@Override
public Object postProcessBeforeInitialization(Object bean, String beanName) {
if (bean instanceof OperateClientConfigurationProperties operateProperties) {
String operateClientId = internalSecretProvider.getSecret(SECRET_NAME_CLIENT_ID);
String operateClientSecret = internalSecretProvider.getSecret(SECRET_NAME_SECRET);
operateProperties.setClientId(operateClientId);
operateProperties.setClientSecret(operateClientSecret);
return operateProperties;
}
return bean;
}
}
}
5 changes: 3 additions & 2 deletions bundle/camunda-saas-bundle/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ camunda.connector.secret-provider.console.enabled=false
zeebe.client.worker.threads=10
zeebe.client.worker.max-jobs-active=32

# Enforce local connection, even if cluster-id set (for Operate Auth)
# Enforce local connection, even if cluster-id set
zeebe.client.connection-mode=ADDRESS
camunda.client.mode=simple

connectors.log.appender=stackdriver

# For specifying the size of inbound connectors activity log
camunda.connector.inbound.log.size=10

# Disabling the default Operate client, we are configuring our own
camunda.operate.client.enabled=false
camunda.client.operate.enabled=false
Loading