Skip to content

Commit

Permalink
kafka: Rename a dyncfg/LaunchDarkly flag (#28209)
Browse files Browse the repository at this point in the history
Renames the dyncfg introduced in
#28178 to
`kafka_default_aws_privatelink_endpoint_identification_algorithm`.

### Motivation

Slack:
https://materializeinc.slack.com/archives/C06CQC8LW4V/p1720800069242729

### Checklist

- [ ] This PR has adequate test coverage / QA involvement has been duly
considered. ([trigger-ci for additional test/nightly
runs](https://trigger-ci.dev.materialize.com/))
- [ ] This PR has an associated up-to-date [design
doc](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/README.md),
is a design doc
([template](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/00000000_template.md)),
or is sufficiently small to not require a design.
  <!-- Reference the design in the description. -->
- [ ] If this PR evolves [an existing `$T ⇔ Proto$T`
mapping](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/command-and-response-binary-encoding.md)
(possibly in a backwards-incompatible way), then it is tagged with a
`T-proto` label.
- [ ] If this PR will require changes to cloud orchestration or tests,
there is a companion cloud PR to account for those changes that is
tagged with the release-blocker label
([example](MaterializeInc/cloud#5021)).
<!-- Ask in #team-cloud on Slack if you need help preparing the cloud
PR. -->
- [x] This PR includes the following [user-facing behavior
changes](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/guide-changes.md#what-changes-require-a-release-note):
  - N/a
  • Loading branch information
ParkMyCar committed Jul 15, 2024
1 parent a41053d commit 0bb2e6c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions src/storage-types/src/connections.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ use crate::connections::aws::{AwsConnection, AwsConnectionValidationError};
use crate::controller::AlterError;
use crate::dyncfgs::{
ENFORCE_EXTERNAL_ADDRESSES, KAFKA_CLIENT_ID_ENRICHMENT_RULES,
KAFKA_ENDPOINT_IDENTIFICATION_ALGORITHM,
KAFKA_DEFAULT_AWS_PRIVATELINK_ENDPOINT_IDENTIFICATION_ALGORITHM,
};
use crate::errors::{ContextCreationError, CsrConnectError};
use crate::AlterCompatible;
Expand Down Expand Up @@ -639,8 +639,8 @@ impl KafkaConnection {
Tunnel::AwsPrivatelink(t) => {
assert!(&self.brokers.is_empty());

let algo =
KAFKA_ENDPOINT_IDENTIFICATION_ALGORITHM.get(storage_configuration.config_set());
let algo = KAFKA_DEFAULT_AWS_PRIVATELINK_ENDPOINT_IDENTIFICATION_ALGORITHM
.get(storage_configuration.config_set());
options.insert("ssl.endpoint.identification.algorithm".into(), algo.into());

// When using a default privatelink tunnel broker/brokers cannot be specified
Expand Down
15 changes: 8 additions & 7 deletions src/storage-types/src/dyncfgs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,14 @@ pub const KAFKA_POLL_MAX_WAIT: Config<Duration> = Config::new(
available.",
);

pub const KAFKA_ENDPOINT_IDENTIFICATION_ALGORITHM: Config<&'static str> = Config::new(
"kafka_endpoint_identification_algorithm",
// Default to no hostname verification, which is the default in versions of `librdkafka <1.9.2`.
"none",
"The value we set for the 'ssl.endpoint.identification.algorithm' option in the Kafka \
pub const KAFKA_DEFAULT_AWS_PRIVATELINK_ENDPOINT_IDENTIFICATION_ALGORITHM: Config<&'static str> =
Config::new(
"kafka_default_aws_privatelink_endpoint_identification_algorithm",
// Default to no hostname verification, which is the default in versions of `librdkafka <1.9.2`.
"none",
"The value we set for the 'ssl.endpoint.identification.algorithm' option in the Kafka \
Connection config. default: 'none'",
);
);

// MySQL

Expand Down Expand Up @@ -183,7 +184,7 @@ pub fn all_dyncfgs(configs: ConfigSet) -> ConfigSet {
.add(&STORAGE_DOWNGRADE_SINCE_DURING_FINALIZATION)
.add(&KAFKA_CLIENT_ID_ENRICHMENT_RULES)
.add(&KAFKA_POLL_MAX_WAIT)
.add(&KAFKA_ENDPOINT_IDENTIFICATION_ALGORITHM)
.add(&KAFKA_DEFAULT_AWS_PRIVATELINK_ENDPOINT_IDENTIFICATION_ALGORITHM)
.add(&MYSQL_REPLICATION_HEARTBEAT_INTERVAL)
.add(&MYSQL_OFFSET_KNOWN_INTERVAL)
.add(&PG_FETCH_SLOT_RESUME_LSN_INTERVAL)
Expand Down

0 comments on commit 0bb2e6c

Please sign in to comment.