You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by bo...@apache.org on 2023/04/26 00:49:35 UTC
[kyuubi] branch branch-1.7 updated: [KYUUBI #4770][1.7] Compilation fails with AdminResourceSuite
This is an automated email from the ASF dual-hosted git repository.
bowenliang pushed a commit to branch branch-1.7
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/branch-1.7 by this push:
new 8aff0180e [KYUUBI #4770][1.7] Compilation fails with AdminResourceSuite
8aff0180e is described below
commit 8aff0180e193540b9aebb0dc491c48234ed593df
Author: zwangsheng <22...@qq.com>
AuthorDate: Wed Apr 26 08:49:20 2023 +0800
[KYUUBI #4770][1.7] Compilation fails with AdminResourceSuite
### _Why are the changes needed?_
Close #4770
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
- [ ] Add screenshots for manual tests if appropriate
- [ ] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request
- [x] [CI]
Closes #4771 from zwangsheng/KYUUBI_4770.
Closes #4770
2ae803ddc [zwangsheng] fix comments
a7ab33eb7 [zwangsheng] fix comments
3815a2520 [zwangsheng] fix comments
7b612f186 [zwangsheng] fix comments
a4219e6fa [zwangsheng] [KYUUBI #4770] Compilation fails with AdminResourceSuite on branch 1.7
Authored-by: zwangsheng <22...@qq.com>
Signed-off-by: liangbowen <li...@gf.com.cn>
---
.../kyuubi/server/api/v1/AdminResourceSuite.scala | 41 ++++------------------
1 file changed, 6 insertions(+), 35 deletions(-)
diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/AdminResourceSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/AdminResourceSuite.scala
index c43bc2b30..1ae900882 100644
--- a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/AdminResourceSuite.scala
+++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/AdminResourceSuite.scala
@@ -17,6 +17,7 @@
package org.apache.kyuubi.server.api.v1
+import java.nio.charset.StandardCharsets
import java.util.{Base64, UUID}
import javax.ws.rs.core.{GenericType, MediaType}
@@ -32,12 +33,17 @@ import org.apache.kyuubi.ha.HighAvailabilityConf
import org.apache.kyuubi.ha.client.DiscoveryClientProvider.withDiscoveryClient
import org.apache.kyuubi.ha.client.DiscoveryPaths
import org.apache.kyuubi.plugin.PluginLoader
+import org.apache.kyuubi.server.KyuubiRestFrontendService
import org.apache.kyuubi.server.http.authentication.AuthenticationHandler.AUTHORIZATION_HEADER
class AdminResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper {
private val engineMgr = new KyuubiApplicationManager()
+ val encodeAuthorization = new String(
+ Base64.getEncoder.encode(s"${Utils.currentUser}:".getBytes()),
+ StandardCharsets.UTF_8)
+
override def beforeAll(): Unit = {
super.beforeAll()
engineMgr.initialize(KyuubiConf())
@@ -55,11 +61,6 @@ class AdminResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper {
.post(null)
assert(405 == response.getStatus)
- val adminUser = Utils.currentUser
- val encodeAuthorization = new String(
- Base64.getEncoder.encode(
- s"$adminUser:".getBytes()),
- "UTF-8")
response = webTarget.path("api/v1/admin/refresh/hadoop_conf")
.request()
.header(AUTHORIZATION_HEADER, s"BASIC $encodeAuthorization")
@@ -73,11 +74,6 @@ class AdminResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper {
.post(null)
assert(405 == response.getStatus)
- val adminUser = Utils.currentUser
- val encodeAuthorization = new String(
- Base64.getEncoder.encode(
- s"$adminUser:".getBytes()),
- "UTF-8")
response = webTarget.path("api/v1/admin/refresh/user_defaults_conf")
.request()
.header(AUTHORIZATION_HEADER, s"BASIC $encodeAuthorization")
@@ -91,11 +87,6 @@ class AdminResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper {
.post(null)
assert(405 == response.getStatus)
- val adminUser = Utils.currentUser
- val encodeAuthorization = new String(
- Base64.getEncoder.encode(
- s"$adminUser:".getBytes()),
- "UTF-8")
response = webTarget.path("api/v1/admin/refresh/unlimited_users")
.request()
.header(AUTHORIZATION_HEADER, s"BASIC $encodeAuthorization")
@@ -126,11 +117,6 @@ class AdminResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper {
assert(client.pathExists(engineSpace))
assert(client.getChildren(engineSpace).size == 1)
- val adminUser = Utils.currentUser
- val encodeAuthorization = new String(
- Base64.getEncoder.encode(
- s"$adminUser:".getBytes()),
- "UTF-8")
val response = webTarget.path("api/v1/admin/engine")
.queryParam("sharelevel", "USER")
.queryParam("type", "spark_sql")
@@ -220,11 +206,6 @@ class AdminResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper {
assert(client.pathExists(engineSpace))
assert(client.getChildren(engineSpace).size == 1)
- val adminUser = Utils.currentUser
- val encodeAuthorization = new String(
- Base64.getEncoder.encode(
- s"$adminUser:".getBytes()),
- "UTF-8")
val response = webTarget.path("api/v1/admin/engine")
.queryParam("sharelevel", "connection")
.queryParam("type", "spark_sql")
@@ -260,11 +241,6 @@ class AdminResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper {
assert(client.pathExists(engineSpace))
assert(client.getChildren(engineSpace).size == 1)
- val adminUser = Utils.currentUser
- val encodeAuthorization = new String(
- Base64.getEncoder.encode(
- s"$adminUser:".getBytes()),
- "UTF-8")
val response = webTarget.path("api/v1/admin/engine")
.queryParam("type", "spark_sql")
.request(MediaType.APPLICATION_JSON_TYPE)
@@ -370,11 +346,6 @@ class AdminResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper {
assert(client.pathExists(engineSpace1))
assert(client.pathExists(engineSpace2))
- val adminUser = Utils.currentUser
- val encodeAuthorization = new String(
- Base64.getEncoder.encode(
- s"$adminUser:".getBytes()),
- "UTF-8")
val response = webTarget.path("api/v1/admin/engine")
.queryParam("type", "spark_sql")
.request(MediaType.APPLICATION_JSON_TYPE)