Skip to content

Commit 1996116

Browse files
aiceflowercasiononekazutoirisv-kkhuang“v_kkhuang”
authored
Release 1.8.0 code merge (#5269)
* update version to 1.8.0 * Upgrade `LINKIS_VERSION` to `1.8.0` to Fix Integration Test Failure in GitHub Actions (#5250) * build(ci): update Linkis version to 1.8.0 Signed-off-by: kazutoiris <[email protected]> * build(ci): update Docker publish workflow to use the current repository Signed-off-by: kazutoiris <[email protected]> --------- Signed-off-by: kazutoiris <[email protected]> * Fix KIND image loading, script typo, and cache directory creation (#5251) * fix(ci): pass `USING_KIND` variable to `install-mysql.sh` Signed-off-by: kazutoiris <[email protected]> * fix(ci): correct typo in script name Signed-off-by: kazutoiris <[email protected]> * fix(ci): create `TAR_CACHE_ROOT` directory if not exists Signed-off-by: kazutoiris <[email protected]> --------- Signed-off-by: kazutoiris <[email protected]> * chore: prepare to release 1.8.0 (#5254) Signed-off-by: kazutoiris <[email protected]> * support azure (#5214) * support azure * remove file * add azure conf --------- Co-authored-by: “v_kkhuang” <“[email protected]”> * Add OAuth2 authentication support (#5253) * feat(mg-gateway): add OAuth2 authentication support - Add OAuth2 authentication configuration to GatewayConfiguration - Implement OAuth2Authentication - Update `SecurityFilter` and `UserRestful` to process OAuth2 request Signed-off-by: kazutoiris <[email protected]> * feat(mg-gateway): add OAuth configuration - Add OAuth-related properties to `linkis-mg-gateway.properties` - Include support for GitHub OAuth as an example Signed-off-by: kazutoiris <[email protected]> * style: reformat code Signed-off-by: kazutoiris <[email protected]> * feat(mg-gateway): add OAuth in frontend - Add OAuth login option to the login page - Implement OAuth callback route and component - Add translations for OAuth login text Signed-off-by: kazutoiris <[email protected]> * docs: add OAuth authentication documentation --------- Signed-off-by: kazutoiris <[email protected]> * fix azure compile error (#5264) * fix azure compile error * fix azure compile error * fix storage test error --------- Co-authored-by: aiceflower <[email protected]> * remove default token (#5265) * fix compile error * fix token security * fix token security --------- Co-authored-by: aiceflower <[email protected]> * fix token security (#5266) Co-authored-by: aiceflower <[email protected]> --------- Signed-off-by: kazutoiris <[email protected]> Co-authored-by: Casion <[email protected]> Co-authored-by: Kazuto Iris <[email protected]> Co-authored-by: v-kkhuang <[email protected]> Co-authored-by: “v_kkhuang” <“[email protected]”> Co-authored-by: aiceflower <[email protected]>
1 parent 5bd72d1 commit 1996116

File tree

47 files changed

+1561
-506
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1561
-506
lines changed

‎.github/workflows/integration-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
TAG: ${{ github.sha }}
4646
SKIP_TEST: true
4747
HUB: ghcr.io/apache/linkis
48-
LINKIS_VERSION: 1.7.0
48+
LINKIS_VERSION: 1.8.0
4949
steps:
5050
- name: Free up disk space
5151
run: |

‎.github/workflows/publish-docker.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
env:
3434
TAG: ${{ github.sha }}
3535
SKIP_TEST: true
36-
HUB: ghcr.io/apache/linkis
37-
LINKIS_VERSION: 1.7.0
36+
HUB: ghcr.io/${{ github.repository }}
37+
LINKIS_VERSION: 1.8.0
3838
steps:
3939
- name: Checkout
4040
uses: actions/checkout@v4

‎docs/configuration/linkis-gateway-core.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,11 @@
3636
|linkis-gateway-core|wds.linkis.gateway.this.schema| | gateway.this.schema|
3737
|linkis-gateway-core|wds.linkis.web.enable.water.mark|true| web.enable.water.mark|
3838
|linkis-gateway-core|wds.linkis.entrance.name| |linkis.entrance.name|
39+
|linkis-gateway-core|wds.linkis.gateway.conf.enable.oauth.auth| false |wds.linkis.gateway.conf.enable.oauth.auth|
40+
|linkis-gateway-core|wds.linkis.gateway.auth.oauth.authentication.url| |wds.linkis.gateway.auth.oauth.authentication.url|
41+
|linkis-gateway-core|wds.linkis.gateway.auth.oauth.exchange.url| |wds.linkis.gateway.auth.oauth.exchange.url|
42+
|linkis-gateway-core|wds.linkis.gateway.auth.oauth.validate.url| |wds.linkis.gateway.auth.oauth.validate.url|
43+
|linkis-gateway-core|wds.linkis.gateway.auth.oauth.validate.field| |wds.linkis.gateway.auth.oauth.validate.field|
44+
|linkis-gateway-core|wds.linkis.gateway.auth.oauth.client.id| |wds.linkis.gateway.auth.oauth.client.id|
45+
|linkis-gateway-core|wds.linkis.gateway.auth.oauth.client.secret| |wds.linkis.gateway.auth.oauth.client.secret|
46+
|linkis-gateway-core|wds.linkis.gateway.auth.oauth.scope| |wds.linkis.gateway.auth.oauth.scope|

‎linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ object Configuration extends Logging {
8181
"The request interface %s is abnormal. You can try to troubleshoot common problems in the knowledge base document"
8282
)
8383

84-
val LINKIS_TOKEN = CommonVars("wds.linkis.token", "LINKIS-AUTH")
84+
val LINKIS_TOKEN = CommonVars("wds.linkis.token", "")
8585

8686
val GLOBAL_CONF_CHN_NAME = "全局设置"
8787

‎linkis-commons/linkis-storage/pom.xml‎

Lines changed: 176 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -1,164 +1,176 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
~ Licensed to the Apache Software Foundation (ASF) under one or more
4-
~ contributor license agreements. See the NOTICE file distributed with
5-
~ this work for additional information regarding copyright ownership.
6-
~ The ASF licenses this file to You under the Apache License, Version 2.0
7-
~ (the "License"); you may not use this file except in compliance with
8-
~ the License. You may obtain a copy of the License at
9-
~
10-
~ http://www.apache.org/licenses/LICENSE-2.0
11-
~
12-
~ Unless required by applicable law or agreed to in writing, software
13-
~ distributed under the License is distributed on an "AS IS" BASIS,
14-
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
~ See the License for the specific language governing permissions and
16-
~ limitations under the License.
17-
-->
18-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19-
<modelVersion>4.0.0</modelVersion>
20-
21-
<parent>
22-
<groupId>org.apache.linkis</groupId>
23-
<artifactId>linkis</artifactId>
24-
<version>${revision}</version>
25-
<relativePath>../../pom.xml</relativePath>
26-
</parent>
27-
<artifactId>linkis-storage</artifactId>
28-
29-
<packaging>jar</packaging>
30-
31-
<dependencies>
32-
<dependency>
33-
<groupId>org.apache.linkis</groupId>
34-
<artifactId>linkis-common</artifactId>
35-
<version>${project.version}</version>
36-
</dependency>
37-
38-
<dependency>
39-
<groupId>org.apache.linkis</groupId>
40-
<artifactId>linkis-hadoop-common</artifactId>
41-
<version>${project.version}</version>
42-
<exclusions>
43-
<exclusion>
44-
<groupId>com.google.protobuf</groupId>
45-
<artifactId>protobuf-java</artifactId>
46-
</exclusion>
47-
<exclusion>
48-
<groupId>io.netty</groupId>
49-
<artifactId>netty</artifactId>
50-
</exclusion>
51-
</exclusions>
52-
</dependency>
53-
54-
<dependency>
55-
<groupId>com.google.protobuf</groupId>
56-
<artifactId>protobuf-java</artifactId>
57-
<version>${protobuf.version}</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.springframework</groupId>
61-
<artifactId>spring-core</artifactId>
62-
</dependency>
63-
64-
<dependency>
65-
<groupId>org.apache.poi</groupId>
66-
<artifactId>poi</artifactId>
67-
<version>${poi.version}</version>
68-
</dependency>
69-
70-
<dependency>
71-
<groupId>org.apache.poi</groupId>
72-
<artifactId>poi-ooxml</artifactId>
73-
<version>${poi.version}</version>
74-
</dependency>
75-
76-
<dependency>
77-
<groupId>com.github.pjfanning</groupId>
78-
<artifactId>excel-streaming-reader</artifactId>
79-
<version>5.0.2</version>
80-
</dependency>
81-
82-
<dependency>
83-
<groupId>org.apache.commons</groupId>
84-
<artifactId>commons-compress</artifactId>
85-
</dependency>
86-
87-
<dependency>
88-
<groupId>org.apache.hadoop</groupId>
89-
<artifactId>hadoop-aliyun</artifactId>
90-
<version>3.3.4</version>
91-
</dependency>
92-
<dependency>
93-
<groupId>com.aliyun.oss</groupId>
94-
<artifactId>aliyun-sdk-oss</artifactId>
95-
<version>3.16.0</version>
96-
</dependency>
97-
<dependency>
98-
<groupId>org.jdom</groupId>
99-
<artifactId>jdom2</artifactId>
100-
</dependency>
101-
102-
<dependency>
103-
<groupId>com.amazonaws</groupId>
104-
<artifactId>aws-java-sdk-s3</artifactId>
105-
<version>1.12.261</version>
106-
</dependency>
107-
108-
<dependency>
109-
<groupId>org.apache.parquet</groupId>
110-
<artifactId>parquet-avro</artifactId>
111-
<version>${parquet-avro.version}</version>
112-
<scope>${storage.parquet.scope}</scope>
113-
</dependency>
114-
<dependency>
115-
<groupId>org.apache.hadoop</groupId>
116-
<artifactId>hadoop-mapreduce-client-core</artifactId>
117-
<version>${hadoop.version}</version>
118-
<scope>${storage.parquet.scope}</scope>
119-
<exclusions>
120-
<exclusion>
121-
<groupId>log4j</groupId>
122-
<artifactId>log4j</artifactId>
123-
</exclusion>
124-
<exclusion>
125-
<groupId>org.slf4j</groupId>
126-
<artifactId>slf4j-log4j12</artifactId>
127-
</exclusion>
128-
<!-- for hadoop 3.3.3 -->
129-
<exclusion>
130-
<groupId>ch.qos.reload4j</groupId>
131-
<artifactId>reload4j</artifactId>
132-
</exclusion>
133-
<exclusion>
134-
<groupId>org.slf4j</groupId>
135-
<artifactId>slf4j-reload4j</artifactId>
136-
</exclusion>
137-
</exclusions>
138-
</dependency>
139-
<dependency>
140-
<groupId>org.apache.orc</groupId>
141-
<artifactId>orc-core</artifactId>
142-
<version>${orc-core.version}</version>
143-
<classifier>nohive</classifier>
144-
<scope>${storage.orc.scope}</scope>
145-
<exclusions>
146-
<exclusion>
147-
<groupId>org.apache.hive</groupId>
148-
<artifactId>hive-storage-api</artifactId>
149-
</exclusion>
150-
</exclusions>
151-
</dependency>
152-
153-
</dependencies>
154-
155-
<build>
156-
<plugins>
157-
<plugin>
158-
<groupId>net.alchim31.maven</groupId>
159-
<artifactId>scala-maven-plugin</artifactId>
160-
</plugin>
161-
</plugins>
162-
</build>
163-
164-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
<modelVersion>4.0.0</modelVersion>
20+
21+
<parent>
22+
<groupId>org.apache.linkis</groupId>
23+
<artifactId>linkis</artifactId>
24+
<version>${revision}</version>
25+
<relativePath>../../pom.xml</relativePath>
26+
</parent>
27+
<artifactId>linkis-storage</artifactId>
28+
29+
<packaging>jar</packaging>
30+
31+
<dependencies>
32+
<dependency>
33+
<groupId>org.apache.linkis</groupId>
34+
<artifactId>linkis-common</artifactId>
35+
<version>${project.version}</version>
36+
</dependency>
37+
38+
<dependency>
39+
<groupId>org.apache.linkis</groupId>
40+
<artifactId>linkis-hadoop-common</artifactId>
41+
<version>${project.version}</version>
42+
<exclusions>
43+
<exclusion>
44+
<groupId>com.google.protobuf</groupId>
45+
<artifactId>protobuf-java</artifactId>
46+
</exclusion>
47+
<exclusion>
48+
<groupId>io.netty</groupId>
49+
<artifactId>netty</artifactId>
50+
</exclusion>
51+
</exclusions>
52+
</dependency>
53+
54+
<dependency>
55+
<groupId>com.google.protobuf</groupId>
56+
<artifactId>protobuf-java</artifactId>
57+
<version>${protobuf.version}</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.springframework</groupId>
61+
<artifactId>spring-core</artifactId>
62+
</dependency>
63+
64+
<dependency>
65+
<groupId>org.apache.poi</groupId>
66+
<artifactId>poi</artifactId>
67+
<version>${poi.version}</version>
68+
</dependency>
69+
70+
<dependency>
71+
<groupId>org.apache.poi</groupId>
72+
<artifactId>poi-ooxml</artifactId>
73+
<version>${poi.version}</version>
74+
</dependency>
75+
76+
<dependency>
77+
<groupId>com.github.pjfanning</groupId>
78+
<artifactId>excel-streaming-reader</artifactId>
79+
<version>5.0.2</version>
80+
</dependency>
81+
82+
<dependency>
83+
<groupId>org.apache.commons</groupId>
84+
<artifactId>commons-compress</artifactId>
85+
</dependency>
86+
87+
<dependency>
88+
<groupId>org.apache.hadoop</groupId>
89+
<artifactId>hadoop-aliyun</artifactId>
90+
<version>3.3.4</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>com.aliyun.oss</groupId>
94+
<artifactId>aliyun-sdk-oss</artifactId>
95+
<version>3.16.0</version>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.jdom</groupId>
99+
<artifactId>jdom2</artifactId>
100+
</dependency>
101+
102+
<dependency>
103+
<groupId>com.amazonaws</groupId>
104+
<artifactId>aws-java-sdk-s3</artifactId>
105+
<version>1.12.261</version>
106+
</dependency>
107+
108+
<dependency>
109+
<groupId>com.azure</groupId>
110+
<artifactId>azure-storage-blob</artifactId>
111+
</dependency>
112+
<dependency>
113+
<groupId>com.azure</groupId>
114+
<artifactId>azure-storage-common</artifactId>
115+
</dependency>
116+
<dependency>
117+
<groupId>com.azure</groupId>
118+
<artifactId>azure-identity</artifactId>
119+
</dependency>
120+
<dependency>
121+
<groupId>org.apache.parquet</groupId>
122+
<artifactId>parquet-avro</artifactId>
123+
<version>${parquet-avro.version}</version>
124+
<scope>${storage.parquet.scope}</scope>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.apache.hadoop</groupId>
128+
<artifactId>hadoop-mapreduce-client-core</artifactId>
129+
<version>${hadoop.version}</version>
130+
<scope>${storage.parquet.scope}</scope>
131+
<exclusions>
132+
<exclusion>
133+
<groupId>log4j</groupId>
134+
<artifactId>log4j</artifactId>
135+
</exclusion>
136+
<exclusion>
137+
<groupId>org.slf4j</groupId>
138+
<artifactId>slf4j-log4j12</artifactId>
139+
</exclusion>
140+
<!-- for hadoop 3.3.3 -->
141+
<exclusion>
142+
<groupId>ch.qos.reload4j</groupId>
143+
<artifactId>reload4j</artifactId>
144+
</exclusion>
145+
<exclusion>
146+
<groupId>org.slf4j</groupId>
147+
<artifactId>slf4j-reload4j</artifactId>
148+
</exclusion>
149+
</exclusions>
150+
</dependency>
151+
<dependency>
152+
<groupId>org.apache.orc</groupId>
153+
<artifactId>orc-core</artifactId>
154+
<version>${orc-core.version}</version>
155+
<classifier>nohive</classifier>
156+
<scope>${storage.orc.scope}</scope>
157+
<exclusions>
158+
<exclusion>
159+
<groupId>org.apache.hive</groupId>
160+
<artifactId>hive-storage-api</artifactId>
161+
</exclusion>
162+
</exclusions>
163+
</dependency>
164+
165+
</dependencies>
166+
167+
<build>
168+
<plugins>
169+
<plugin>
170+
<groupId>net.alchim31.maven</groupId>
171+
<artifactId>scala-maven-plugin</artifactId>
172+
</plugin>
173+
</plugins>
174+
</build>
175+
176+
</project>

0 commit comments

Comments
 (0)