This is an automated email from the ASF dual-hosted git repository. bmahler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit f78a6eaca250a14ff660b09757e244ae25490811 Author: Dong Zhu <d...@d2iq.com> AuthorDate: Mon Jul 27 13:14:32 2020 -0400 Deprecated tests plain text credential format. Review: https://reviews.apache.org/r/72620/ --- src/tests/credentials_tests.cpp | 47 ----------------------------------------- src/tests/script.cpp | 13 +++++++++--- 2 files changed, 10 insertions(+), 50 deletions(-) diff --git a/src/tests/credentials_tests.cpp b/src/tests/credentials_tests.cpp index 8fa26df..02013da 100644 --- a/src/tests/credentials_tests.cpp +++ b/src/tests/credentials_tests.cpp @@ -70,53 +70,6 @@ TEST_F(CredentialsTest, AuthenticatedSlave) ASSERT_NE("", slaveRegisteredMessage->slave_id().value()); } - -// Test verifing well executed credential authentication -// using text formatted credentials so as to test -// backwards compatibility. -TEST_F(CredentialsTest, AuthenticatedSlaveText) -{ - string path = path::join(os::getcwd(), "credentials"); - - Try<int_fd> fd = os::open( - path, - O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, - S_IRUSR | S_IWUSR | S_IRGRP); - - ASSERT_SOME(fd); - - string credentials = - DEFAULT_CREDENTIAL.principal() + " " + DEFAULT_CREDENTIAL.secret(); - - ASSERT_SOME(os::write(fd.get(), credentials)) - << "Failed to write credentials to '" << path << "'"; - - ASSERT_SOME(os::close(fd.get())); - - map<string, Option<string>> values{ - {"credentials", Some(uri::from_path(path))}}; - - master::Flags masterFlags = CreateMasterFlags(); - masterFlags.load(values, true); - - Try<Owned<cluster::Master>> master = StartMaster(masterFlags); - ASSERT_SOME(master); - - Future<SlaveRegisteredMessage> slaveRegisteredMessage = - FUTURE_PROTOBUF(SlaveRegisteredMessage(), _, _); - - slave::Flags slaveFlags = CreateSlaveFlags(); - slaveFlags.load(values, true); - - Owned<MasterDetector> detector = master.get()->createDetector(); - Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), slaveFlags); - ASSERT_SOME(slave); - - AWAIT_READY(slaveRegisteredMessage); - ASSERT_NE("", slaveRegisteredMessage->slave_id().value()); -} - - // Using JSON base file for authentication without // protobuf tools assistance. TEST_F(CredentialsTest, AuthenticatedSlaveJSON) diff --git a/src/tests/script.cpp b/src/tests/script.cpp index 038519c..6aadb78 100644 --- a/src/tests/script.cpp +++ b/src/tests/script.cpp @@ -123,13 +123,20 @@ void execute(const string& script) os::setenv("MESOS_REGISTRY", "replicated_log"); // Create test credentials. - const string& credentials = - DEFAULT_CREDENTIAL.principal() + " " + DEFAULT_CREDENTIAL.secret(); + JSON::Object credential; + credential.values["principal"] = DEFAULT_CREDENTIAL.principal(); + credential.values["secret"] = DEFAULT_CREDENTIAL.secret(); + + JSON::Array array; + array.values.push_back(credential); + + JSON::Object credentials; + credentials.values["credentials"] = array; const string& credentialsPath = path::join(directory.get(), "credentials"); - CHECK_SOME(os::write(credentialsPath, credentials)) + CHECK_SOME(os::write(credentialsPath, stringify(credentials))) << "Failed to write credentials to '" << credentialsPath << "'"; os::setenv("MESOS_CREDENTIALS", uri::from_path(credentialsPath));