nizhikov commented on code in PR #15832: URL: https://github.com/apache/kafka/pull/15832#discussion_r1584714610
########## core/src/test/java/kafka/admin/UserScramCredentialsCommandTest.java: ########## @@ -0,0 +1,178 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package kafka.admin; + +import kafka.server.BaseRequestTest; +import kafka.utils.Exit; +import org.apache.kafka.test.TestUtils; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import scala.Console; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.OptionalInt; +import java.util.concurrent.atomic.AtomicReference; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@SuppressWarnings("dontUseSystemExit") +public class UserScramCredentialsCommandTest extends BaseRequestTest { + private static final Logger log = LoggerFactory.getLogger(UserScramCredentialsCommandTest.class); + + @Override + public int brokerCount() { + return 1; + } + + static class ConfigCommandResult { + public final String stdout; + public final OptionalInt exitStatus; + + public ConfigCommandResult(String stdout) { + this(stdout, OptionalInt.empty()); + } + + public ConfigCommandResult(String stdout, OptionalInt exitStatus) { + this.stdout = stdout; + this.exitStatus = exitStatus; + } + } + + private ConfigCommandResult runConfigCommandViaBroker(String...args) throws UnsupportedEncodingException { + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + String utf8 = StandardCharsets.UTF_8.name(); + PrintStream printStream = new PrintStream(byteArrayOutputStream, true, utf8); + AtomicReference<OptionalInt> exitStatus = new AtomicReference<>(OptionalInt.empty()); + Exit.setExitProcedure((status, __) -> { + exitStatus.set(OptionalInt.of((Integer) status)); + throw new RuntimeException(); + }); + + List<String> commandArgs = new ArrayList<>(Arrays.asList("--bootstrap-server", bootstrapServers(listenerName()))); + commandArgs.addAll(Arrays.asList(args)); + try { + Console.withOut(printStream, () -> { + ConfigCommand.main(commandArgs.toArray(new String[0])); + return null; + }); + return new ConfigCommandResult(byteArrayOutputStream.toString(utf8)); + } catch (Exception e) { + log.debug("Exception running ConfigCommand " + String.join(" ", commandArgs), e); + return new ConfigCommandResult("", exitStatus.get()); + } finally { + printStream.close(); + Exit.resetExitProcedure(); + } + } + + @ParameterizedTest + @ValueSource(strings = {"kraft", "zk"}) + public void testUserScramCredentialsRequests(String quorum) throws Exception { + String user1 = "user1"; + // create and describe a credential + ConfigCommandResult result = runConfigCommandViaBroker("--user", user1, "--alter", "--add-config", "SCRAM-SHA-256=[iterations=4096,password=foo-secret]"); + String alterConfigsUser1Out = "Completed updating config for user " + user1 + ".\n"; + assertEquals(alterConfigsUser1Out, result.stdout); + String scramCredentialConfigsUser1Out = "SCRAM credential configs for user-principal '" + user1 + "' are SCRAM-SHA-256=iterations=4096\n"; + TestUtils.waitForCondition( + () -> Objects.equals(runConfigCommandViaBroker("--user", user1, "--describe").stdout, scramCredentialConfigsUser1Out), + () -> "Failed to describe SCRAM credential change '" + user1 + "'"); + // create a user quota and describe the user again + result = runConfigCommandViaBroker("--user", user1, "--alter", "--add-config", "consumer_byte_rate=20000"); + assertEquals(alterConfigsUser1Out, result.stdout); + String quotaConfigsUser1Out = "Quota configs for user-principal '" + user1 + "' are consumer_byte_rate=20000.0\n"; + TestUtils.waitForCondition( + () -> Objects.equals(runConfigCommandViaBroker("--user", user1, "--describe").stdout, quotaConfigsUser1Out + scramCredentialConfigsUser1Out), + () -> "Failed to describe Quota change for '" + user1 + "'"); + + // now do the same thing for user2 + String user2 = "user2"; + // create and describe a credential + result = runConfigCommandViaBroker("--user", user2, "--alter", "--add-config", "SCRAM-SHA-256=[iterations=4096,password=foo-secret]"); + String alterConfigsUser2Out = "Completed updating config for user " + user2 + ".\n"; + assertEquals(alterConfigsUser2Out, result.stdout); + String scramCredentialConfigsUser2Out = "SCRAM credential configs for user-principal '" + user2 + "' are SCRAM-SHA-256=iterations=4096\n"; + TestUtils.waitForCondition( + () -> Objects.equals(runConfigCommandViaBroker("--user", user2, "--describe").stdout, scramCredentialConfigsUser2Out), + () -> "Failed to describe SCRAM credential change '" + user2 + "'"); + // create a user quota and describe the user again + result = runConfigCommandViaBroker("--user", user2, "--alter", "--add-config", "consumer_byte_rate=20000"); + assertEquals(alterConfigsUser2Out, result.stdout); + String quotaConfigsUser2Out = "Quota configs for user-principal '" + user2 + "' are consumer_byte_rate=20000.0\n"; + TestUtils.waitForCondition( + () -> Objects.equals(runConfigCommandViaBroker("--user", user2, "--describe").stdout, quotaConfigsUser2Out + scramCredentialConfigsUser2Out), + () -> "Failed to describe Quota change for '" + user2 + "'"); + + // describe both + result = runConfigCommandViaBroker("--entity-type", "users", "--describe"); Review Comment: I extract some common code into methods and this made tests much more readable in my opinion. Can you, please, take a look and tell me - if we still need to extract this to separate case? ########## core/src/test/java/kafka/admin/UserScramCredentialsCommandTest.java: ########## @@ -0,0 +1,178 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package kafka.admin; + +import kafka.server.BaseRequestTest; +import kafka.utils.Exit; +import org.apache.kafka.test.TestUtils; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import scala.Console; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.OptionalInt; +import java.util.concurrent.atomic.AtomicReference; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@SuppressWarnings("dontUseSystemExit") +public class UserScramCredentialsCommandTest extends BaseRequestTest { Review Comment: Yes. Will do it shortly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
