You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2023/03/20 12:44:52 UTC
[linkis] branch dev-1.3.2 updated: update version number (#4392)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 3d7e02faa update version number (#4392)
3d7e02faa is described below
commit 3d7e02faa14dd78c6c1c5b3db772f8752654d373
Author: aiceflower <ki...@gmail.com>
AuthorDate: Mon Mar 20 20:44:45 2023 +0800
update version number (#4392)
* update version number
* add file schema check
---------
Co-authored-by: aiceflower <ki...@sina.com>
---
.github/workflows/publish-docker.yaml | 2 +-
linkis-dist/deploy-config/linkis-env.sh | 2 +-
linkis-dist/helm/README.md | 4 ++--
linkis-dist/helm/README_CN.md | 4 ++--
linkis-dist/helm/charts/linkis/Chart.yaml | 2 +-
.../scala/org/apache/linkis/filesystem/validator/PathValidator.scala | 5 ++++-
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index c3b9b6e82..f06621a72 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -31,7 +31,7 @@ jobs:
TAG: ${{ github.sha }}
SKIP_TEST: true
HUB: ghcr.io/apache/linkis
- LINKIS_VERSION: 1.3.1
+ LINKIS_VERSION: 1.3.2
steps:
- name: Checkout
uses: actions/checkout@v2
diff --git a/linkis-dist/deploy-config/linkis-env.sh b/linkis-dist/deploy-config/linkis-env.sh
index 9197f7be9..e9f7bff4d 100644
--- a/linkis-dist/deploy-config/linkis-env.sh
+++ b/linkis-dist/deploy-config/linkis-env.sh
@@ -156,7 +156,7 @@ export SERVER_HEAP_SIZE="512M"
##The extended lib such mysql-connector-java-*.jar
#LINKIS_EXTENDED_LIB=/appcom/common/linkisExtendedLib
-LINKIS_VERSION=1.3.1
+LINKIS_VERSION=1.3.2
# for install
LINKIS_PUBLIC_MODULE=lib/linkis-commons/public-module
diff --git a/linkis-dist/helm/README.md b/linkis-dist/helm/README.md
index 274de3dc2..ad82a7805 100644
--- a/linkis-dist/helm/README.md
+++ b/linkis-dist/helm/README.md
@@ -78,14 +78,14 @@ REVISION: 1
TEST SUITE: None
NOTES:
---
-Welcome to Apache Linkis (v1.3.1)!
+Welcome to Apache Linkis (v1.3.2)!
.___ .___ .______ .____/\ .___ .________
| | : __|: \ : / \: __|| ___/
| | | : || ||. ___/| : ||___ \
| |/\ | || | || \ | || /
| / \| ||___| || \| ||__:___/
-|______/|___| |___||___\ /|___| : v1.3.1
+|______/|___| |___||___\ /|___| : v1.3.2
\/
Linkis builds a layer of computation middleware between upper applications and underlying engines.
diff --git a/linkis-dist/helm/README_CN.md b/linkis-dist/helm/README_CN.md
index e756dc73f..4ee3246e3 100644
--- a/linkis-dist/helm/README_CN.md
+++ b/linkis-dist/helm/README_CN.md
@@ -75,14 +75,14 @@ REVISION: 1
TEST SUITE: None
NOTES:
---
-Welcome to Apache Linkis (v1.3.1)!
+Welcome to Apache Linkis (v1.3.2)!
.___ .___ .______ .____/\ .___ .________
| | : __|: \ : / \: __|| ___/
| | | : || ||. ___/| : ||___ \
| |/\ | || | || \ | || /
| / \| ||___| || \| ||__:___/
-|______/|___| |___||___\ /|___| : v1.3.1
+|______/|___| |___||___\ /|___| : v1.3.2
\/
Linkis builds a layer of computation middleware between upper applications and underlying engines.
diff --git a/linkis-dist/helm/charts/linkis/Chart.yaml b/linkis-dist/helm/charts/linkis/Chart.yaml
index 62b9b7706..2a6776653 100644
--- a/linkis-dist/helm/charts/linkis/Chart.yaml
+++ b/linkis-dist/helm/charts/linkis/Chart.yaml
@@ -36,4 +36,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-appVersion: "1.3.1"
+appVersion: "1.3.2"
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala
index 6b63e3a71..6bdc48620 100644
--- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala
+++ b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala
@@ -85,13 +85,16 @@ class PathValidator extends Logging {
}
def checkPath(path: String, username: String): Unit = {
+ if (path.contains(StorageUtils.HDFS_SCHEMA)) {
+ return
+ }
// 校验path的逻辑
val userLocalRootPath: String = WorkspaceUtil.suffixTuning(LOCAL_USER_ROOT_PATH.getValue) +
username
var userHdfsRootPath: String =
WorkspaceUtil.suffixTuning(HDFS_USER_ROOT_PATH_PREFIX.getValue) +
username + HDFS_USER_ROOT_PATH_SUFFIX.getValue
- if (!(path.contains(StorageUtils.FILE_SCHEMA)) && !(path.contains(StorageUtils.HDFS_SCHEMA))) {
+ if (!(path.contains(StorageUtils.FILE_SCHEMA))) {
throw new WorkSpaceException(80025, "the path should contain schema")
}
userHdfsRootPath = StringUtils.trimTrailingCharacter(userHdfsRootPath, File.separatorChar)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org