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: move config validation to startup stage so bad configs will break the component #425

Merged
merged 2 commits into from
Feb 13, 2024
Merged

fix: move config validation to startup stage so bad configs will break the component #425

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e58a5ed
fix: move config validation to startup stage so bad configs will brea…
robcmann Feb 13, 2024
179c901
fix: make config change callback a final field
robcmann Feb 13, 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
6 changes: 4 additions & 2 deletions src/main/java/com/aws/greengrass/clientdevices/auth/ClientDevicesAuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import com.aws.greengrass.clientdevices.auth.session.SessionCreator;
import com.aws.greengrass.clientdevices.auth.session.SessionManager;
import com.aws.greengrass.clientdevices.auth.util.ResizableLinkedBlockingQueue;
import com.aws.greengrass.config.ChildChanged;
import com.aws.greengrass.config.Node;
import com.aws.greengrass.config.Topics;
import com.aws.greengrass.config.WhatHappened;
Expand Down Expand Up @@ -83,6 +84,7 @@ public class ClientDevicesAuthService extends PluginService {
private static final int DEFAULT_CLOUD_CALL_QUEUE_SIZE = 100;
private static final int DEFAULT_THREAD_POOL_SIZE = 1;
public static final int DEFAULT_MAX_ACTIVE_AUTH_TOKENS = 2500;
private final ChildChanged configChangeHandler = this::configChangeHandler;

// Create a threadpool for calling the cloud. Single thread will be used by default.
private ThreadPoolExecutor cloudCallThreadPool;
Expand All @@ -108,7 +110,6 @@ protected void install() throws InterruptedException {
context.get(CertificateManager.class).updateCertificatesConfiguration(new CertificatesConfig(getConfig()));
initializeInfrastructure();
initializeHandlers();
subscribeToConfigChanges();
}

private int getValidCloudCallQueueSize(Topics topics) {
Expand Down Expand Up @@ -163,7 +164,7 @@ private void initializeHandlers() {

private void subscribeToConfigChanges() {
onConfigurationChanged();
config.lookupTopics(CONFIGURATION_CONFIG_KEY).subscribe(this::configChangeHandler);
config.lookupTopics(CONFIGURATION_CONFIG_KEY).subscribe(configChangeHandler);
}

private void onConfigurationChanged() {
Expand Down Expand Up @@ -214,6 +215,7 @@ private void configChangeHandler(WhatHappened whatHappened, Node node) {
@Override
protected void startup() throws InterruptedException {
context.get(CertificateManager.class).startMonitors();
subscribeToConfigChanges();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

subscribe registers a config change callback. That callback needs to be saved as a final field so that we don't duplicate callbacks

super.startup();
}

Expand Down
Loading