Discovery Client - Support "ClusterId" environment variable without prefix #247
Conversation
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
Contributor
Contributor
There was a problem hiding this comment.
Pull request overview
This PR enhances the Discovery Client to support both the prefixed (NIDISCOVERY_CLUSTERID) and prefix-less (CLUSTERID) environment variable names for specifying the Cluster ID, aligning with the Discovery Service's own behavior. This change improves robustness and compatibility when interacting with the Discovery Service.
Key changes:
- Introduced constants for the environment variable prefix and cluster ID name
- Added fallback logic to check both prefixed and non-prefixed environment variable names
- Includes inline comment noting future consideration for case-insensitive environment variable lookups
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
...i.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py
Show resolved
Hide resolved
...i.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py
Outdated
Show resolved
Hide resolved
hunter-ni
requested review from
bkeryan,
dixonjoel and
jfriedri-ni
as code owners
jfriedri-ni
reviewed
Dec 17, 2025
...i.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py
Show resolved
Hide resolved
bkeryan
approved these changes
Dec 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this Pull Request accomplish?
This set of changes adds support for the
ClusterIdenvironment variable (without theNIDiscovery_prefix), given that the Discovery Service recognizes an environment variable of that prefix-less name as well.This change is being made in response to this comment on PR #242.
Why should this Pull Request be merged?
This PR adds greater robustness in properly handling an environment variable being set to specify the Cluster ID of the Discovery Service.
What testing has been done?
DiscoveryClientwas able to successfully interact with the Discovery Service that was launched with theClusterIdenvironment variable setDiscoveryClientwas still able to successfully interact with a Discovery Service that was launched with theNIDiscovery_ClusterIDenvironment variable