(incubator-streampark) branch dev-2.1.2 updated: [Improve] Rename yarn.http-auth option from 'sample' to 'simple'

[benjobs]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch dev-2.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev-2.1.2 by this push:
     new 3bb3e15e9 [Improve] Rename yarn.http-auth option from 'sample' to 
'simple'
3bb3e15e9 is described below

commit 3bb3e15e91a744f7771c4d50c8c6f5a3c565636c
Author: benjobs <benj...@gmail.com>
AuthorDate: Sun Oct 29 15:05:54 2023 +0800

    [Improve] Rename yarn.http-auth option from 'sample' to 'simple'
---
 .../scala/org/apache/streampark/common/conf/CommonConfig.scala    | 2 +-
 .../main/scala/org/apache/streampark/common/util/YarnUtils.scala  | 8 ++++----
 .../streampark-console-service/src/main/resources/application.yml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/streampark-common/src/main/scala/org/apache/streampark/common/conf/CommonConfig.scala
 
b/streampark-common/src/main/scala/org/apache/streampark/common/conf/CommonConfig.scala
index 18d53a35f..f6092814b 100644
--- 
a/streampark-common/src/main/scala/org/apache/streampark/common/conf/CommonConfig.scala
+++ 
b/streampark-common/src/main/scala/org/apache/streampark/common/conf/CommonConfig.scala
@@ -45,7 +45,7 @@ object CommonConfig {
     key = "streampark.yarn.http-auth",
     defaultValue = "",
     classType = classOf[String],
-    description = "yarn http auth type. ex: sample, kerberos")
+    description = "yarn http auth type. ex: simple, kerberos")
 
   val DOCKER_HOST: InternalOption = InternalOption(
     key = "streampark.docker.http-client.docker-host",
diff --git 
a/streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala
 
b/streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala
index 9eeac0643..83db1d78c 100644
--- 
a/streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala
+++ 
b/streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala
@@ -47,7 +47,7 @@ object YarnUtils extends Logger {
   lazy val PROXY_YARN_URL = 
InternalConfigHolder.get[String](CommonConfig.STREAMPARK_PROXY_YARN_URL)
 
   /**
-   * hadoop.http.authentication.type<br> get yarn http authentication 
mode.<br> ex: sample, kerberos
+   * hadoop.http.authentication.type<br> get yarn http authentication 
mode.<br> ex: simple, kerberos
    *
    * @return
    */
@@ -56,9 +56,9 @@ object YarnUtils extends Logger {
     "kerberos".equalsIgnoreCase(yarnHttpAuth)
   }
 
-  lazy val hasYarnHttpSampleAuth: Boolean = {
+  lazy val hasYarnHttpSimpleAuth: Boolean = {
     val yarnHttpAuth: String = 
InternalConfigHolder.get[String](CommonConfig.STREAMPARK_YARN_AUTH)
-    "sample".equalsIgnoreCase(yarnHttpAuth)
+    "simple".equalsIgnoreCase(yarnHttpAuth)
   }
 
   /**
@@ -300,7 +300,7 @@ object YarnUtils extends Logger {
         })
     } else {
       val url =
-        if (!hasYarnHttpSampleAuth) reqUrl
+        if (!hasYarnHttpSimpleAuth) reqUrl
         else {
           s"$reqUrl?user.name=${HadoopUtils.hadoopUserName}"
         }
diff --git 
a/streampark-console/streampark-console-service/src/main/resources/application.yml
 
b/streampark-console/streampark-console-service/src/main/resources/application.yml
index 6f00aa0da..db59bf85e 100644
--- 
a/streampark-console/streampark-console-service/src/main/resources/application.yml
+++ 
b/streampark-console/streampark-console-service/src/main/resources/application.yml
@@ -89,8 +89,8 @@ streampark:
     # lark alert proxy,default https://open.feishu.cn
     lark-url:
   yarn:
-      # default sample, or kerberos
-    http-auth: sample
+      # default simple, or kerberos
+    http-auth: simple
 
   # HADOOP_USER_NAME
   hadoop-user-name: hdfs