This is an automated email from the ASF dual-hosted git repository. cmccabe pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git
from 47450ee064b MINOR: update RocksDBMetricsRecorder test to JUnit5 and fix memory leak (#13336) add 38c409cf33c KAFKA-14084: SCRAM support in KRaft. (#13114) No new revisions were added by this update. Summary of changes: checkstyle/import-control.xml | 1 + .../message/AlterUserScramCredentialsRequest.json | 2 +- .../DescribeUserScramCredentialsRequest.json | 2 +- .../scala/kafka/security/CredentialProvider.scala | 21 +- .../src/main/scala/kafka/server/BrokerServer.scala | 1 + .../main/scala/kafka/server/ControllerApis.scala | 13 + core/src/main/scala/kafka/server/KafkaApis.scala | 28 +- .../server/metadata/BrokerMetadataPublisher.scala | 17 ++ .../kafka/server/metadata/KRaftMetadataCache.scala | 5 + core/src/test/java/kafka/test/MockController.java | 10 + .../AlterUserScramCredentialsRequestTest.scala | 144 +++++++-- .../DescribeUserScramCredentialsRequestTest.scala | 44 ++- .../unit/kafka/server/MetadataCacheTest.scala | 3 +- .../unit/kafka/server/ReplicaManagerTest.scala | 5 +- .../metadata/BrokerMetadataSnapshotterTest.scala | 4 +- .../org/apache/kafka/controller/Controller.java | 15 + .../kafka/controller/ControllerMetricsManager.java | 2 + .../apache/kafka/controller/QuorumController.java | 31 ++ .../kafka/controller/ScramControlManager.java | 324 +++++++++++++++++++++ .../java/org/apache/kafka/image/MetadataDelta.java | 39 ++- .../java/org/apache/kafka/image/MetadataImage.java | 24 +- .../apache/kafka/image/ScramCredentialData.java | 118 ++++++++ .../java/org/apache/kafka/image/ScramDelta.java | 109 +++++++ .../java/org/apache/kafka/image/ScramImage.java | 178 +++++++++++ ...d.json => RemoveUserScramCredentialRecord.json} | 10 +- .../common/metadata/UserScramCredentialRecord.json | 18 +- .../org/apache/kafka/image/MetadataImageTest.java | 7 +- .../org/apache/kafka/image/ScramImageTest.java | 161 ++++++++++ .../kafka/server/common/MetadataVersion.java | 6 +- 29 files changed, 1252 insertions(+), 90 deletions(-) create mode 100644 metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java create mode 100644 metadata/src/main/java/org/apache/kafka/image/ScramCredentialData.java create mode 100644 metadata/src/main/java/org/apache/kafka/image/ScramDelta.java create mode 100644 metadata/src/main/java/org/apache/kafka/image/ScramImage.java copy metadata/src/main/resources/common/metadata/{RemoveAccessControlEntryRecord.json => RemoveUserScramCredentialRecord.json} (77%) create mode 100644 metadata/src/test/java/org/apache/kafka/image/ScramImageTest.java