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

Secrets provider should be initialized for each new function #6993

Merged
merged 2 commits into from
May 23, 2020
Merged

Secrets provider should be initialized for each new function #6993

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86189d1
Secrets provider should be initialized for each new function
May 19, 2020
9e7054d
add comment
May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...untime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.apache.pulsar.functions.runtime.RuntimeCustomizer;
import org.apache.pulsar.functions.runtime.RuntimeFactory;
import org.apache.pulsar.functions.runtime.RuntimeUtils;
import org.apache.pulsar.functions.secretsprovider.ClearTextSecretsProvider;
import org.apache.pulsar.functions.secretsprovider.SecretsProvider;
import org.apache.pulsar.functions.secretsproviderconfigurator.SecretsProviderConfigurator;
import org.apache.pulsar.functions.utils.Reflections;
Expand All @@ -58,13 +57,17 @@ public class ThreadRuntimeFactory implements RuntimeFactory {
private FunctionCacheManager fnCache;
private PulsarClient pulsarClient;
private String storageServiceUrl;
private SecretsProvider secretsProvider;
private SecretsProvider defaultSecretsProvider;
private CollectorRegistry collectorRegistry;
private String narExtractionDirectory;
private volatile boolean closed;
private SecretsProviderConfigurator secretsProviderConfigurator;
private ClassLoader rootClassLoader;

/**
* This constructor is used by other runtimes (e.g. ProcessRuntime and KubernetesRuntime) that rely on ThreadRuntime to actually run an instance of the function.
* When used by other runtimes, the arguments such as secretsProvider and rootClassLoader will be provided.
*/
public ThreadRuntimeFactory(String threadGroupName, String pulsarServiceUrl, String storageServiceUrl,
AuthenticationConfig authConfig, SecretsProvider secretsProvider,
CollectorRegistry collectorRegistry, String narExtractionDirectory,
Expand Down Expand Up @@ -112,7 +115,7 @@ private void initialize(String threadGroupName, PulsarClient pulsarClient, Strin

this.rootClassLoader = rootClassLoader;
this.secretsProviderConfigurator = secretsProviderConfigurator;
this.secretsProvider = secretsProvider;
this.defaultSecretsProvider = secretsProvider;
this.fnCache = new FunctionCacheManagerImpl(rootClassLoader);
this.threadGroup = new ThreadGroup(threadGroupName);
this.pulsarClient = pulsarClient;
Expand All @@ -139,6 +142,7 @@ public void initialize(WorkerConfig workerConfig, AuthenticationConfig authentic
public ThreadRuntime createContainer(InstanceConfig instanceConfig, String jarFile,
String originalCodeFileName,
Long expectedHealthCheckInterval) {
SecretsProvider secretsProvider = defaultSecretsProvider;
if (secretsProvider == null) {
String secretsProviderClassName = secretsProviderConfigurator.getSecretsProviderClassName(instanceConfig.getFunctionDetails());
secretsProvider = (SecretsProvider) Reflections.createInstance(secretsProviderClassName, this.rootClassLoader);
Expand Down