KAFKA-18706: Move ScramPublisher to metadata module #20468
Conversation
Signed-off-by: see-quick <[email protected]>
Signed-off-by: see-quick <[email protected]>
Signed-off-by: see-quick <[email protected]>
see-quick
changed the title
| @@ -44,7 +44,7 @@ import org.apache.kafka.common.security.auth.SecurityProtocol | |||
| import org.apache.kafka.common.utils.{KafkaThread, LogContext, Time, Utils} | |||
| import org.apache.kafka.common.{Endpoint, KafkaException, MetricName, Reconfigurable} | |||
| import org.apache.kafka.network.{ConnectionQuotaEntity, ConnectionThrottledException, SocketServerConfigs, TooManyConnectionsException} | |||
| import org.apache.kafka.security.CredentialProvider | |||
| import org.apache.kafka.server.common.CredentialProvider | |||
There was a problem hiding this comment.
nit: We try to order import alphabetically, can we move this 1 line down?
| import org.apache.kafka.metadata.publisher.AclPublisher | ||
| import org.apache.kafka.security.CredentialProvider | ||
| import org.apache.kafka.metadata.publisher.{AclPublisher, ScramPublisher} | ||
| import org.apache.kafka.server.common.CredentialProvider |
There was a problem hiding this comment.
Can we move this with the other org.apache.kafka.server.common import below?
| import org.apache.kafka.raft.QuorumConfig | ||
| import org.apache.kafka.security.CredentialProvider | ||
| import org.apache.kafka.server.common.CredentialProvider |
There was a problem hiding this comment.
Can we move this with the other org.apache.kafka.server.common import below?
| @@ -28,7 +28,7 @@ import org.apache.kafka.common.security.token.delegation.internals.DelegationTok | |||
| import org.apache.kafka.common.utils.Time | |||
| import org.apache.kafka.coordinator.group.GroupCoordinator | |||
| import org.apache.kafka.metadata.{BrokerState, MetadataCache} | |||
| import org.apache.kafka.security.CredentialProvider | |||
| import org.apache.kafka.server.common.CredentialProvider | |||
There was a problem hiding this comment.
Can we move this with the other org.apache.kafka.server.common import below?
| @@ -37,7 +37,7 @@ import org.apache.kafka.common.utils.{Exit, Time, Utils} | |||
| import org.apache.kafka.common.{TopicPartition, Uuid, protocol} | |||
| import org.apache.kafka.raft.errors.NotLeaderException | |||
| import org.apache.kafka.raft.{Batch, BatchReader, Endpoints, LeaderAndEpoch, QuorumConfig, RaftClient} | |||
| import org.apache.kafka.security.CredentialProvider | |||
| import org.apache.kafka.server.common.CredentialProvider | |||
There was a problem hiding this comment.
Can we move this with the other org.apache.kafka.server.common import below?
There was a problem hiding this comment.
I'll stop noting it from here, the same applies to all files/imports
| String deltaName = "MetadataDelta up to " + newImage.highestOffsetAndEpoch().offset(); | ||
| try { | ||
| // Apply changes to SCRAM credentials. | ||
| Optional.ofNullable(delta.scramDelta()).ifPresent(scramDelta -> { |
There was a problem hiding this comment.
If wonder if doing:
ScramDelta scramDelta = delta.scramDelta();
if (scramDelta != null) {is just more readable. WDYT?
| faultHandler.handleFault("Uncaught exception while publishing SCRAM changes from " + deltaName, t); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Can we add a newline at the end of the file?
There was a problem hiding this comment.
I wonder if we should keep the package and just change the module.
| scramDelta.changes().forEach((mechanism, userChanges) -> { | ||
| userChanges.forEach((userName, change) -> { |
There was a problem hiding this comment.
In both cases, the body of the block is a single expression, so we can remove the brackets{ }
This PR moves the ScramPublisher class from the server metadata package
to the dedicated metadata module. During refactoring, I found out that I
also need to move the CredentialProvider interface to a more appropriate
location in the server common package because
CredentialProvideris inthe
servermodule, and I can't include that module in themetadatabecause I would create a circular dependency, i.e.,
server module ←-------------┐ ↓ (depends on). │
(which would make it circular) metadata module------------┘
So I have moved
CredentialProvidertoserver-commonmodule, andmetadatamodule has alreadyserver-commonand thus it's resolved.