Github user vanzin commented on a diff in the pull request:
https://github.com/apache/spark/pull/8880#discussion_r47139085
--- Diff:
core/src/test/scala/org/apache/spark/crypto/ShuffleEncryptionSuite.scala ---
@@ -0,0 +1,108 @@
+/*
+ * 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 org.apache.spark.crypto
+
+import java.security.PrivilegedExceptionAction
+
+import org.apache.hadoop.security.{Credentials, UserGroupInformation}
+import org.apache.spark.{SparkConf, SparkFunSuite}
+import org.apache.spark.crypto.CryptoConf._
+import org.apache.spark.crypto.CryptoStreamUtils.SPARK_CHIMERA_CONF_PREFIX
+
+private[spark] class ShuffleEncryptionSuite extends SparkFunSuite {
+ val ugi = UserGroupInformation.createUserForTesting("testuser",
Array[String] {
+ "testgroup"
+ })
+
+ test("Test Chimera configuration conversion") {
+ val sparkKey1 = "spark.shuffle.chimera.a.b.c"
+ val sparkVal1 = "val1"
+ val chimeraKey1 = "chimera.a.b.c"
+
+ val sparkKey2 = "spark.shuffle.chimeraA.b.c"
+ val sparkVal2 = "val2"
+ val chimeraKey2 = "chimera.A.b.c"
+ val conf = new SparkConf()
+ conf.set(sparkKey1, sparkVal1)
+ conf.set(sparkKey2, sparkVal2)
+ val props = CryptoStreamUtils.toChimeraConf(conf,
SPARK_CHIMERA_CONF_PREFIX)
+ assert(props.getProperty(chimeraKey1) === sparkVal1)
+ assert(!props.contains(chimeraKey2))
+ }
+
+ test("Test shuffle encryption is disabled by default"){
+ ugi.doAs(new PrivilegedExceptionAction[Unit]() {
+ override def run(): Unit = {
+ val credentials =
UserGroupInformation.getCurrentUser.getCredentials()
+ val conf = new SparkConf()
+ initCredentials(conf, credentials)
+ assert(credentials.getSecretKey(SPARK_SHUFFLE_TOKEN) === null)
+ }
+ })
+ }
+
+ test("Test shuffle encryption key length should be 128 by default") {
+ ugi.doAs(new PrivilegedExceptionAction[Unit]() {
+ override def run(): Unit = {
+ val credentials =
UserGroupInformation.getCurrentUser.getCredentials()
+ val conf = new SparkConf()
+ conf.set(SPARK_SHUFFLE_ENCRYPTION_ENABLED, String.valueOf(true))
--- End diff --
minor: you could just say `"true"`... or the more Scala-y `true.toString`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
