-
Notifications
You must be signed in to change notification settings - Fork 986
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[feature] add alibaba cloud oss support #1999
Open
asd108908382
wants to merge
5
commits into
apache:master
Choose a base branch
from
asd108908382:feature/202405_oss_support
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ec01411
[feature] add alibaba cloud oss support
asd108908382 7955d97
Merge branch 'master' into feature/202405_oss_support
asd108908382 78cb876
[feature] update html support ali oss
asd108908382 7fbb1bf
[feature] update support ali oss config import
asd108908382 d494c75
[feature] change show store info
asd108908382 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
...er/src/main/java/org/apache/hertzbeat/manager/service/impl/OssObjectStoreServiceImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * 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.hertzbeat.manager.service.impl; | ||
|
|
||
| import com.aliyun.oss.OSS; | ||
| import com.aliyun.oss.model.ListObjectsRequest; | ||
| import com.aliyun.oss.model.OSSObjectSummary; | ||
| import java.io.InputStream; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.apache.hertzbeat.common.constants.SignConstants; | ||
| import org.apache.hertzbeat.manager.pojo.dto.FileDTO; | ||
| import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreDTO; | ||
| import org.apache.hertzbeat.manager.service.ObjectStoreService; | ||
|
|
||
| /** | ||
| * Alibaba cloud storage service | ||
| */ | ||
| @Slf4j | ||
| public class OssObjectStoreServiceImpl implements ObjectStoreService { | ||
|
|
||
| private final OSS ossClient; | ||
|
|
||
| private final String bucketName; | ||
| private final String rootPath; | ||
|
|
||
| public OssObjectStoreServiceImpl(OSS ossClient, String bucketName, String rootPath) { | ||
| this.ossClient = ossClient; | ||
| this.bucketName = bucketName; | ||
| if (rootPath.startsWith(SignConstants.RIGHT_DASH)) { | ||
| this.rootPath = rootPath.substring(1); | ||
| } else { | ||
| this.rootPath = rootPath; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean upload(String filePath, InputStream is) { | ||
| var objectKey = getObjectKey(filePath); | ||
| var response = ossClient.putObject(bucketName, objectKey, is); | ||
| return Objects.equals(response.getResponse().getStatusCode(), 200); | ||
| } | ||
|
|
||
| @Override | ||
| public FileDTO download(String filePath) { | ||
| var objectKey = getObjectKey(filePath); | ||
| try { | ||
| var ossObject = ossClient.getObject(bucketName, objectKey); | ||
| return new FileDTO(filePath, ossObject.getObjectContent()); | ||
| } catch (Exception ex) { | ||
| log.warn("download file from oss error {}", objectKey); | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public List<FileDTO> list(String dir) { | ||
| var request = new ListObjectsRequest(bucketName); | ||
| request.setPrefix(getObjectKey(dir)); | ||
| return ossClient.listObjects(request).getObjectSummaries().stream() | ||
| .map(OSSObjectSummary::getKey).toList().stream() | ||
| .map(k -> new FileDTO(k, ossClient.getObject(bucketName, k).getObjectContent())).toList(); | ||
| } | ||
|
|
||
| @Override | ||
| public ObjectStoreDTO.Type type() { | ||
| return ObjectStoreDTO.Type.OSS; | ||
| } | ||
|
|
||
|
|
||
| private String getObjectKey(String filePath) { | ||
| return rootPath + SignConstants.RIGHT_DASH + filePath; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hi, can we use http api instead of
aliyun sdk, the sdk will import many irrelevant dependencies may also cause compatibility issues between dependency packages and licenses. See https://github.com/apache/hertzbeat/tree/master/material/licenses. We plan to remove the dependency on the cloud service SDK likealiyun, tencent, huawei sdklater.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok，we can change it