[kafka] branch trunk updated (c6d135e -> e8524cc)

[cm...@apache.org]

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 c6d135e  KAFKA-10133: MM2 readme update on config (#9215)
     add e8524cc  KAFKA-10259: KIP-554 Broker-side SCRAM Config API (#9032)

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/kafka/clients/admin/Admin.java |  92 +++++
 ....java => AlterUserScramCredentialsOptions.java} |   6 +-
 ...t.java => AlterUserScramCredentialsResult.java} |  28 +-
 ...va => DescribeUserScramCredentialsOptions.java} |   6 +-
 .../admin/DescribeUserScramCredentialsResult.java  | 150 +++++++
 .../kafka/clients/admin/KafkaAdminClient.java      | 188 +++++++++
 .../kafka/clients/admin/ScramCredentialInfo.java   |  78 ++++
 .../apache/kafka/clients/admin/ScramMechanism.java |  81 ++++
 ...ons.java => UserScramCredentialAlteration.java} |  28 +-
 ...cords.java => UserScramCredentialDeletion.java} |  29 +-
 .../admin/UserScramCredentialUpsertion.java        | 100 +++++
 .../admin/UserScramCredentialsDescription.java     |  82 ++++
 .../common/errors/DuplicateResourceException.java  |  77 ++++
 .../common/errors/ResourceNotFoundException.java   |  76 ++++
 ...n.java => UnacceptableCredentialException.java} |  23 +-
 .../org/apache/kafka/common/protocol/ApiKeys.java  |  10 +-
 .../org/apache/kafka/common/protocol/Errors.java   |   8 +-
 .../kafka/common/requests/AbstractRequest.java     |   4 +
 .../kafka/common/requests/AbstractResponse.java    |   4 +
 .../requests/AlterUserScramCredentialsRequest.java | 102 +++++
 ...java => AlterUserScramCredentialsResponse.java} |  24 +-
 .../DescribeUserScramCredentialsRequest.java       |  87 +++++
 ...a => DescribeUserScramCredentialsResponse.java} |  24 +-
 .../security/scram/internals/ScramFormatter.java   |  30 +-
 .../security/scram/internals/ScramSaslClient.java  |   4 +-
 .../security/scram/internals/ScramSaslServer.java  |   2 +-
 .../message/AlterUserScramCredentialsRequest.json  |  44 +++
 ...json => AlterUserScramCredentialsResponse.json} |  23 +-
 ...on => DescribeUserScramCredentialsRequest.json} |  18 +-
 ...n => DescribeUserScramCredentialsResponse.json} |  40 +-
 .../DescribeUserScramCredentialsResultTest.java    | 118 ++++++
 .../kafka/clients/admin/KafkaAdminClientTest.java  | 154 ++++++++
 .../kafka/clients/admin/MockAdminClient.java       |  10 +
 .../kafka/common/protocol/ProtoUtilsTest.java      |  18 +-
 .../scram/internals/ScramFormatterTest.java        |  12 +-
 .../scram/internals/ScramMessagesTest.java         |   4 +-
 .../src/main/scala/kafka/admin/ConfigCommand.scala | 163 +++++---
 .../src/main/scala/kafka/server/AdminManager.scala | 253 +++++++++++-
 core/src/main/scala/kafka/server/KafkaApis.scala   |  35 +-
 .../kafka/api/CustomQuotaCallbackTest.scala        |  20 +-
 .../DelegationTokenEndToEndAuthorizationTest.scala |  73 ++--
 .../kafka/api/EndToEndAuthorizationTest.scala      |  20 +-
 .../SaslClientsWithInvalidCredentialsTest.scala    |   7 +-
 .../SaslScramSslEndToEndAuthorizationTest.scala    |   6 +-
 .../scala/integration/kafka/api/SaslSetup.scala    |  43 ++
 .../server/DynamicBrokerReconfigurationTest.scala  |  14 +-
 .../scala/unit/kafka/admin/ConfigCommandTest.scala | 125 +++++-
 .../admin/UserScramCredentialsCommandTest.scala    | 137 +++++++
 .../kafka/integration/KafkaServerTestHarness.scala |   9 +
 .../AlterUserScramCredentialsRequestTest.scala     | 433 +++++++++++++++++++++
 .../kafka/server/ClientQuotasRequestTest.scala     |  13 +-
 .../DescribeUserScramCredentialsRequestTest.scala  | 149 +++++++
 .../scala/unit/kafka/server/RequestQuotaTest.scala |   6 +
 .../scala/unit/kafka/utils/JaasTestUtils.scala     |  47 ++-
 tests/kafkatest/services/kafka/kafka.py            |  21 +-
 .../kafkatest/services/security/security_config.py |  44 ++-
 .../templates/admin_client_as_broker_jaas.conf     |  16 +-
 tests/kafkatest/tests/client/quota_test.py         |   4 +-
 tests/kafkatest/tests/core/upgrade_test.py         |   2 +-
 tests/kafkatest/version.py                         |  11 +-
 60 files changed, 3151 insertions(+), 284 deletions(-)
 copy clients/src/main/java/org/apache/kafka/clients/admin/{ListPartitionReassignmentsOptions.java => AlterUserScramCredentialsOptions.java} (81%)
 copy clients/src/main/java/org/apache/kafka/clients/admin/{DeleteConsumerGroupsResult.java => AlterUserScramCredentialsResult.java} (60%)
 copy clients/src/main/java/org/apache/kafka/clients/admin/{AlterPartitionReassignmentsOptions.java => DescribeUserScramCredentialsOptions.java} (80%)
 create mode 100644 clients/src/main/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsResult.java
 create mode 100644 clients/src/main/java/org/apache/kafka/clients/admin/ScramCredentialInfo.java
 create mode 100644 clients/src/main/java/org/apache/kafka/clients/admin/ScramMechanism.java
 copy clients/src/main/java/org/apache/kafka/clients/admin/{RenewDelegationTokenOptions.java => UserScramCredentialAlteration.java} (58%)
 copy clients/src/main/java/org/apache/kafka/clients/admin/{DeletedRecords.java => UserScramCredentialDeletion.java} (55%)
 create mode 100644 clients/src/main/java/org/apache/kafka/clients/admin/UserScramCredentialUpsertion.java
 create mode 100644 clients/src/main/java/org/apache/kafka/clients/admin/UserScramCredentialsDescription.java
 create mode 100644 clients/src/main/java/org/apache/kafka/common/errors/DuplicateResourceException.java
 create mode 100644 clients/src/main/java/org/apache/kafka/common/errors/ResourceNotFoundException.java
 copy clients/src/main/java/org/apache/kafka/common/errors/{DelegationTokenExpiredException.java => UnacceptableCredentialException.java} (61%)
 create mode 100644 clients/src/main/java/org/apache/kafka/common/requests/AlterUserScramCredentialsRequest.java
 copy clients/src/main/java/org/apache/kafka/common/requests/{ListPartitionReassignmentsResponse.java => AlterUserScramCredentialsResponse.java} (60%)
 create mode 100644 clients/src/main/java/org/apache/kafka/common/requests/DescribeUserScramCredentialsRequest.java
 copy clients/src/main/java/org/apache/kafka/common/requests/{ListPartitionReassignmentsResponse.java => DescribeUserScramCredentialsResponse.java} (59%)
 create mode 100644 clients/src/main/resources/common/message/AlterUserScramCredentialsRequest.json
 copy clients/src/main/resources/common/message/{DeleteGroupsResponse.json => AlterUserScramCredentialsResponse.json} (65%)
 copy clients/src/main/resources/common/message/{DeleteGroupsRequest.json => DescribeUserScramCredentialsRequest.json} (71%)
 copy clients/src/main/resources/common/message/{DescribeClientQuotasResponse.json => DescribeUserScramCredentialsResponse.json} (51%)
 create mode 100644 clients/src/test/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsResultTest.java
 create mode 100644 core/src/test/scala/unit/kafka/admin/UserScramCredentialsCommandTest.scala
 create mode 100644 core/src/test/scala/unit/kafka/server/AlterUserScramCredentialsRequestTest.scala
 create mode 100644 core/src/test/scala/unit/kafka/server/DescribeUserScramCredentialsRequestTest.scala
 copy core/src/test/scala/kafka/server/BrokerMetadataCheckpointTest.scala => tests/kafkatest/services/security/templates/admin_client_as_broker_jaas.conf (72%)