Browse Source
* feat(resource manager): extend s3 to the storage of ds 1.fix some spell question 2.extend the type of storage 3.add the s3utils to manager resource 4.automatic inject the storage in addition to your config * fix(resource manager): update the dependency * fix(resource manager): extend s3 to the storage of ds fix the constant of hadooputils * fix(resource manager): extend s3 to the storage of ds 1.fix some spell question 2.delete the import * * fix(resource manager): merge the unitTest: 1.TenantServiceImpl 2.ResourceServiceImpl 3.UserServiceImpl * fix(resource manager): extend s3 to the storage of ds merge the resourceServiceTest * fix(resource manager): test cancel the test method createTenant verifyTenant * fix(resource manager): merge the code follow the check-result of sonar * fix(resource manager): extend s3 to the storage of ds fit the spell question * fix(resource manager): extend s3 to the storage of ds revert the common.properties * fix(resource manager): extend s3 to the storage of ds update the storageConfig with None * fix(resource manager): extend s3 to the storage of ds fix the judge of resourceType * fix(resource manager): extend s3 to the storage of ds undo the compile-mysql * fix(resource manager): extend s3 to the storage of ds delete hadoop aws * fix(resource manager): extend s3 to the storage of ds update the know-dependencies to delete aws 1.7.4 update the e2e file-manager common.properties * fix(resource manager): extend s3 to the storage of ds update the aws-region * fix(resource manager): extend s3 to the storage of ds fix the storageconfig init * fix(resource manager): update e2e docker-compose update e2e docker-compose * fix(resource manager): extend s3 to the storage of ds revent the e2e common.proprites print the resource type in propertyUtil * fix(resource manager): extend s3 to the storage of ds 1.println the properties * fix(resource manager): println the s3 info * fix(resource manager): extend s3 to the storage of ds delete the info and upgrade the s3 info to e2e * fix(resource manager): extend s3 to the storage of ds add the bucket init * fix(resource manager): extend s3 to the storage of ds 1.fix some spell question 2.delete the import * * fix(resource manager): extend s3 to the storage of ds upgrade the s3 endpoint * fix(resource manager): withPathStyleAccessEnabled(true) * fix(resource manager): extend s3 to the storage of ds 1.fix some spell question 2.delete the import * * fix(resource manager): upgrade the s3client builder * fix(resource manager): correct the s3 point to s3client * fix(resource manager): update the constant BUCKET_NAME * fix(resource manager): e2e s3 endpoint -> s3:9000 * fix(resource manager): extend s3 to the storage of ds 1.fix some spell question 2.delete the import * * style(resource manager): add info to createBucket * style(resource manager): debug the log * ci(resource manager): test test s3 * ci(ci): add INSERT INTO dolphinscheduler.t_ds_tenant (id, tenant_code, description, queue_id, create_time, update_time) VALUES(1, 'root', NULL, 1, NULL, NULL); to h2.sql * fix(resource manager): update the h2 sql * fix(resource manager): solve to delete the tenant * style(resource manager): merge the style end delete the unuse s3 config * fix(resource manager): extend s3 to the storage of ds UPDATE the rename resources when s3 * fix(resource manager): extend s3 to the storage of ds 1.fix the code style of QuartzImpl * fix(resource manager): extend s3 to the storage of ds 1.impoort restore_type to CommonUtils * fix(resource manager): update the work thread * fix(resource manager): update the baseTaskProcessor * fix(resource manager): upgrade dolphinscheduler-standalone-server.xml * fix(resource manager): add user Info to dolphinscheduler_h2.sql * fix(resource manager): merge the resourceType to NONE * style(upgrade the log level to info): * fix(resource manager): sysnc the h2.sql * fix(resource manager): update the merge the user tenant * fix(resource manager): merge the resourcesServiceImpl * fix(resource manager): when the storage is s3 ,that the directory can't be renamed * fix(resource manager): in s3 ,the directory cannot be renamed * fix(resource manager): delete the deleteRenameDirectory in E2E * fix(resource manager): check the style and recoverd the test * fix(resource manager): delete the log.print(LoginUser)3.0.0/version-upgrade
nobolity
3 years ago
committed by
GitHub
50 changed files with 1996 additions and 2629 deletions
@ -0,0 +1,52 @@
|
||||
/* |
||||
* 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.dolphinscheduler.common.config; |
||||
|
||||
import org.apache.dolphinscheduler.common.storage.StorageOperate; |
||||
import org.apache.dolphinscheduler.common.utils.HadoopUtils; |
||||
import org.apache.dolphinscheduler.common.utils.PropertyUtils; |
||||
import org.apache.dolphinscheduler.common.utils.S3Utils; |
||||
import org.springframework.context.annotation.Bean; |
||||
import org.springframework.context.annotation.Configuration; |
||||
import org.springframework.stereotype.Component; |
||||
|
||||
import static org.apache.dolphinscheduler.common.Constants.*; |
||||
|
||||
|
||||
/** |
||||
* choose the impl of storage by RESOURCE_STORAGE_TYPE |
||||
*/ |
||||
|
||||
@Component |
||||
@Configuration |
||||
public class StoreConfiguration { |
||||
|
||||
@Bean |
||||
public StorageOperate storageOperate() { |
||||
switch (PropertyUtils.getString(RESOURCE_STORAGE_TYPE)) { |
||||
case STORAGE_S3: |
||||
return S3Utils.getInstance(); |
||||
case STORAGE_HDFS: |
||||
return HadoopUtils.getInstance(); |
||||
default: |
||||
return null; |
||||
} |
||||
} |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,169 @@
|
||||
/* |
||||
* 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.dolphinscheduler.common.storage; |
||||
|
||||
import org.apache.dolphinscheduler.common.Constants; |
||||
import org.apache.dolphinscheduler.common.enums.ResUploadType; |
||||
import org.apache.dolphinscheduler.common.utils.PropertyUtils; |
||||
import org.apache.dolphinscheduler.spi.enums.ResourceType; |
||||
|
||||
import java.io.IOException; |
||||
import java.util.List; |
||||
|
||||
|
||||
public interface StorageOperate { |
||||
|
||||
public static final String RESOURCE_UPLOAD_PATH = PropertyUtils.getString(Constants.RESOURCE_UPLOAD_PATH, "/dolphinscheduler"); |
||||
|
||||
/** |
||||
* if the resource of tenant 's exist, the resource of folder will be created |
||||
* @param tenantCode |
||||
* @throws Exception |
||||
*/ |
||||
public void createTenantDirIfNotExists(String tenantCode) throws Exception; |
||||
|
||||
/** |
||||
* get the resource directory of tenant |
||||
* @param tenantCode |
||||
* @return |
||||
*/ |
||||
public String getResDir(String tenantCode); |
||||
|
||||
/** |
||||
* return the udf directory of tenant |
||||
* @param tenantCode |
||||
* @return |
||||
*/ |
||||
|
||||
public String getUdfDir(String tenantCode); |
||||
|
||||
/** |
||||
* create the directory that the path of tenant wanted to create |
||||
* @param tenantCode |
||||
* @param path |
||||
* @return |
||||
* @throws IOException |
||||
*/ |
||||
public boolean mkdir(String tenantCode,String path) throws IOException; |
||||
|
||||
/** |
||||
* get the path of the resource file |
||||
* @param tenantCode |
||||
* @param fullName |
||||
* @return |
||||
*/ |
||||
public String getResourceFileName(String tenantCode, String fullName); |
||||
|
||||
/** |
||||
* get the path of the file |
||||
* @param resourceType |
||||
* @param tenantCode |
||||
* @param fileName |
||||
* @return |
||||
*/ |
||||
public String getFileName(ResourceType resourceType, String tenantCode, String fileName); |
||||
|
||||
/** |
||||
* predicate if the resource of tenant exists |
||||
* @param tenantCode |
||||
* @param fileName |
||||
* @return |
||||
* @throws IOException |
||||
*/ |
||||
public boolean exists(String tenantCode,String fileName) throws IOException; |
||||
|
||||
/** |
||||
* delete the resource of filePath |
||||
* todo if the filePath is the type of directory ,the files in the filePath need to be deleted at all |
||||
* @param tenantCode |
||||
* @param filePath |
||||
* @param recursive |
||||
* @return |
||||
* @throws IOException |
||||
*/ |
||||
public boolean delete(String tenantCode,String filePath, boolean recursive) throws IOException; |
||||
|
||||
/** |
||||
* copy the file from srcPath to dstPath |
||||
* @param srcPath |
||||
* @param dstPath |
||||
* @param deleteSource if need to delete the file of srcPath |
||||
* @param overwrite |
||||
* @return |
||||
* @throws IOException |
||||
*/ |
||||
public boolean copy(String srcPath, String dstPath, boolean deleteSource, boolean overwrite) throws IOException; |
||||
|
||||
/** |
||||
* get the root path of the tenant with resourceType |
||||
* @param resourceType |
||||
* @param tenantCode |
||||
* @return |
||||
*/ |
||||
public String getDir(ResourceType resourceType, String tenantCode); |
||||
|
||||
/** |
||||
* upload the local srcFile to dstPath |
||||
* @param tenantCode |
||||
* @param srcFile |
||||
* @param dstPath |
||||
* @param deleteSource |
||||
* @param overwrite |
||||
* @return |
||||
* @throws IOException |
||||
*/ |
||||
public boolean upload(String tenantCode,String srcFile, String dstPath, boolean deleteSource, boolean overwrite) throws IOException; |
||||
|
||||
/** |
||||
* download the srcPath to local |
||||
* @param tenantCode |
||||
* @param srcFilePath the full path of the srcPath |
||||
* @param dstFile |
||||
* @param deleteSource |
||||
* @param overwrite |
||||
* @throws IOException |
||||
*/ |
||||
public void download(String tenantCode,String srcFilePath, String dstFile, boolean deleteSource, boolean overwrite)throws IOException; |
||||
|
||||
/** |
||||
* vim the context of filePath |
||||
* @param tenantCode |
||||
* @param filePath |
||||
* @param skipLineNums |
||||
* @param limit |
||||
* @return |
||||
* @throws IOException |
||||
*/ |
||||
public List<String> vimFile(String tenantCode, String filePath, int skipLineNums, int limit) throws IOException; |
||||
|
||||
/** |
||||
* delete the files and directory of the tenant |
||||
* |
||||
* @param tenantCode |
||||
* @throws Exception |
||||
*/ |
||||
public void deleteTenant(String tenantCode) throws Exception; |
||||
|
||||
/** |
||||
* return the storageType |
||||
* |
||||
* @return |
||||
*/ |
||||
public ResUploadType returnStorageType(); |
||||
|
||||
} |
||||
@ -0,0 +1,298 @@
|
||||
/* |
||||
* 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.dolphinscheduler.common.utils; |
||||
|
||||
import com.amazonaws.AmazonServiceException; |
||||
import com.amazonaws.auth.AWSStaticCredentialsProvider; |
||||
import com.amazonaws.auth.BasicAWSCredentials; |
||||
import com.amazonaws.client.builder.AwsClientBuilder; |
||||
import com.amazonaws.regions.Regions; |
||||
import com.amazonaws.services.s3.AmazonS3; |
||||
import com.amazonaws.services.s3.AmazonS3ClientBuilder; |
||||
import com.amazonaws.services.s3.model.*; |
||||
import com.amazonaws.services.s3.transfer.MultipleFileDownload; |
||||
import com.amazonaws.services.s3.transfer.TransferManager; |
||||
import com.amazonaws.services.s3.transfer.TransferManagerBuilder; |
||||
import org.apache.commons.lang.StringUtils; |
||||
import org.apache.dolphinscheduler.common.Constants; |
||||
import org.apache.dolphinscheduler.common.enums.ResUploadType; |
||||
import org.apache.dolphinscheduler.common.storage.StorageOperate; |
||||
import org.apache.dolphinscheduler.spi.enums.ResourceType; |
||||
import org.jets3t.service.ServiceException; |
||||
import org.slf4j.Logger; |
||||
import org.slf4j.LoggerFactory; |
||||
|
||||
import java.io.*; |
||||
import java.util.Collections; |
||||
import java.util.List; |
||||
import java.util.stream.Collectors; |
||||
import java.util.stream.Stream; |
||||
|
||||
import static org.apache.dolphinscheduler.common.Constants.*; |
||||
|
||||
public class S3Utils implements Closeable, StorageOperate { |
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(S3Utils.class); |
||||
|
||||
public static final String ACCESS_KEY_ID = PropertyUtils.getString(Constants.AWS_ACCESS_KEY_ID); |
||||
|
||||
public static final String SECRET_KEY_ID = PropertyUtils.getString(Constants.AWS_SECRET_ACCESS_KEY); |
||||
|
||||
public static final String REGION = PropertyUtils.getString(Constants.AWS_REGION); |
||||
|
||||
|
||||
private AmazonS3 s3Client = null; |
||||
|
||||
private S3Utils() { |
||||
if (PropertyUtils.getString(RESOURCE_STORAGE_TYPE).equals(STORAGE_S3)) { |
||||
|
||||
if (!StringUtils.isEmpty(PropertyUtils.getString(AWS_END_POINT))) { |
||||
s3Client = AmazonS3ClientBuilder |
||||
.standard() |
||||
.withPathStyleAccessEnabled(true) |
||||
.withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(PropertyUtils.getString(AWS_END_POINT), Regions.fromName(REGION).getName())) |
||||
.withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(ACCESS_KEY_ID, SECRET_KEY_ID))) |
||||
.build(); |
||||
} else { |
||||
s3Client = AmazonS3ClientBuilder |
||||
.standard() |
||||
.withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(ACCESS_KEY_ID, SECRET_KEY_ID))) |
||||
.withRegion(Regions.fromName(REGION)) |
||||
.build(); |
||||
} |
||||
checkBucketNameIfNotPresent(BUCKET_NAME); |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* S3Utils single |
||||
*/ |
||||
private enum S3Singleton { |
||||
INSTANCE; |
||||
|
||||
private final S3Utils instance; |
||||
|
||||
S3Singleton() { |
||||
instance = new S3Utils(); |
||||
} |
||||
|
||||
private S3Utils getInstance() { |
||||
return instance; |
||||
} |
||||
} |
||||
|
||||
public static S3Utils getInstance() { |
||||
return S3Singleton.INSTANCE.getInstance(); |
||||
} |
||||
|
||||
@Override |
||||
public void close() throws IOException { |
||||
s3Client.shutdown(); |
||||
} |
||||
|
||||
@Override |
||||
public void createTenantDirIfNotExists(String tenantCode) throws ServiceException { |
||||
createFolder(tenantCode+ FOLDER_SEPARATOR +RESOURCE_TYPE_UDF); |
||||
createFolder(tenantCode+ FOLDER_SEPARATOR +RESOURCE_TYPE_FILE); |
||||
} |
||||
|
||||
@Override |
||||
public String getResDir(String tenantCode) { |
||||
return tenantCode+ FOLDER_SEPARATOR +RESOURCE_TYPE_FILE+FOLDER_SEPARATOR; |
||||
} |
||||
|
||||
@Override |
||||
public String getUdfDir(String tenantCode) { |
||||
return tenantCode+ FOLDER_SEPARATOR +RESOURCE_TYPE_UDF+FOLDER_SEPARATOR; |
||||
} |
||||
|
||||
@Override |
||||
public boolean mkdir(String tenantCode, String path) throws IOException { |
||||
createFolder(path); |
||||
return true; |
||||
} |
||||
|
||||
@Override |
||||
public String getResourceFileName(String tenantCode, String fileName) { |
||||
if (fileName.startsWith(FOLDER_SEPARATOR)) { |
||||
fileName = fileName.replaceFirst(FOLDER_SEPARATOR, ""); |
||||
} |
||||
return String.format(FORMAT_S_S, tenantCode+FOLDER_SEPARATOR+RESOURCE_TYPE_FILE, fileName); |
||||
} |
||||
@Override |
||||
public String getFileName(ResourceType resourceType, String tenantCode, String fileName) { |
||||
if (fileName.startsWith(FOLDER_SEPARATOR)) { |
||||
fileName = fileName.replaceFirst(FOLDER_SEPARATOR, ""); |
||||
} |
||||
return getDir(resourceType, tenantCode)+fileName; |
||||
} |
||||
|
||||
@Override |
||||
public void download(String tenantCode, String srcFilePath, String dstFile, boolean deleteSource, boolean overwrite) throws IOException { |
||||
S3Object o = s3Client.getObject(BUCKET_NAME, srcFilePath); |
||||
try (S3ObjectInputStream s3is = o.getObjectContent(); |
||||
FileOutputStream fos = new FileOutputStream(new File(dstFile))) { |
||||
byte[] readBuf = new byte[1024]; |
||||
int readLen = 0; |
||||
while ((readLen = s3is.read(readBuf)) > 0) { |
||||
fos.write(readBuf, 0, readLen); |
||||
} |
||||
} catch (AmazonServiceException e) { |
||||
logger.error("the resource can`t be downloaded,the bucket is {},and the src is {}", tenantCode, srcFilePath); |
||||
throw new IOException(e.getMessage()); |
||||
} catch (FileNotFoundException e) { |
||||
logger.error("the file isn`t exists"); |
||||
throw new IOException("the file isn`t exists"); |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
public boolean exists(String tenantCode, String fileName) throws IOException { |
||||
return s3Client.doesObjectExist(BUCKET_NAME, fileName); |
||||
} |
||||
|
||||
@Override |
||||
public boolean delete(String tenantCode, String filePath, boolean recursive) throws IOException { |
||||
try { |
||||
s3Client.deleteObject(BUCKET_NAME, filePath); |
||||
return true; |
||||
} catch (AmazonServiceException e) { |
||||
logger.error("delete the object error,the resource path is {}", filePath); |
||||
return false; |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
public boolean copy(String srcPath, String dstPath, boolean deleteSource, boolean overwrite) throws IOException { |
||||
s3Client.copyObject(BUCKET_NAME, srcPath, BUCKET_NAME, dstPath); |
||||
s3Client.deleteObject(BUCKET_NAME, srcPath); |
||||
return true; |
||||
} |
||||
|
||||
@Override |
||||
public String getDir(ResourceType resourceType, String tenantCode) { |
||||
switch (resourceType) { |
||||
case UDF: |
||||
return getUdfDir(tenantCode); |
||||
case FILE: |
||||
return getResDir(tenantCode); |
||||
default: |
||||
return tenantCode+ FOLDER_SEPARATOR ; |
||||
} |
||||
|
||||
} |
||||
|
||||
@Override |
||||
public boolean upload(String tenantCode, String srcFile, String dstPath, boolean deleteSource, boolean overwrite) throws IOException { |
||||
try { |
||||
s3Client.putObject(BUCKET_NAME, dstPath, new File(srcFile)); |
||||
return true; |
||||
} catch (AmazonServiceException e) { |
||||
logger.error("upload failed,the bucketName is {},the dstPath is {}", BUCKET_NAME, tenantCode+ FOLDER_SEPARATOR +dstPath); |
||||
return false; |
||||
} |
||||
} |
||||
|
||||
|
||||
@Override |
||||
public List<String> vimFile(String tenantCode,String filePath, int skipLineNums, int limit) throws IOException { |
||||
if (StringUtils.isBlank(filePath)) { |
||||
logger.error("file path:{} is blank", filePath); |
||||
return Collections.emptyList(); |
||||
} |
||||
S3Object s3Object=s3Client.getObject(BUCKET_NAME,filePath); |
||||
try(BufferedReader bufferedReader=new BufferedReader(new InputStreamReader(s3Object.getObjectContent()))){ |
||||
Stream<String> stream = bufferedReader.lines().skip(skipLineNums).limit(limit); |
||||
return stream.collect(Collectors.toList()); |
||||
} |
||||
} |
||||
|
||||
private void |
||||
createFolder( String folderName) { |
||||
if (!s3Client.doesObjectExist(BUCKET_NAME, folderName + FOLDER_SEPARATOR)) { |
||||
ObjectMetadata metadata = new ObjectMetadata(); |
||||
metadata.setContentLength(0); |
||||
InputStream emptyContent = new ByteArrayInputStream(new byte[0]); |
||||
PutObjectRequest putObjectRequest = new PutObjectRequest(BUCKET_NAME, folderName + FOLDER_SEPARATOR, emptyContent, metadata); |
||||
s3Client.putObject(putObjectRequest); |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
public void deleteTenant(String tenantCode) throws Exception { |
||||
deleteTenantCode(tenantCode); |
||||
} |
||||
|
||||
private void deleteTenantCode(String tenantCode) { |
||||
deleteDirectory(getResDir(tenantCode)); |
||||
deleteDirectory(getUdfDir(tenantCode)); |
||||
} |
||||
|
||||
/** |
||||
* xxx untest |
||||
* upload local directory to S3 |
||||
* @param tenantCode |
||||
* @param keyPrefix the name of directory |
||||
* @param strPath |
||||
*/ |
||||
private void uploadDirectory(String tenantCode, String keyPrefix, String strPath) { |
||||
s3Client.putObject(BUCKET_NAME, tenantCode+ FOLDER_SEPARATOR +keyPrefix, new File(strPath)); |
||||
} |
||||
|
||||
|
||||
/** |
||||
* xxx untest |
||||
* download S3 Directory to local |
||||
* @param tenantCode |
||||
* @param keyPrefix the name of directory |
||||
* @param srcPath |
||||
*/ |
||||
private void downloadDirectory(String tenantCode, String keyPrefix, String srcPath){ |
||||
TransferManager tm= TransferManagerBuilder.standard().withS3Client(s3Client).build(); |
||||
try{ |
||||
MultipleFileDownload download = tm.downloadDirectory(BUCKET_NAME, tenantCode + FOLDER_SEPARATOR + keyPrefix, new File(srcPath)); |
||||
download.waitForCompletion(); |
||||
} catch (AmazonS3Exception | InterruptedException e) { |
||||
logger.error("download the directory failed with the bucketName is {} and the keyPrefix is {}", BUCKET_NAME, tenantCode + FOLDER_SEPARATOR + keyPrefix); |
||||
Thread.currentThread().interrupt(); |
||||
} finally { |
||||
tm.shutdownNow(); |
||||
} |
||||
} |
||||
|
||||
public void checkBucketNameIfNotPresent(String bucketName) { |
||||
if (!s3Client.doesBucketExistV2(bucketName)) { |
||||
logger.info("the current regionName is {}", s3Client.getRegionName()); |
||||
s3Client.createBucket(bucketName); |
||||
} |
||||
} |
||||
|
||||
/* |
||||
only delete the object of directory ,it`s better to delete the files in it -r |
||||
*/ |
||||
private void deleteDirectory(String directoryName) { |
||||
if (s3Client.doesObjectExist(BUCKET_NAME, directoryName)) { |
||||
s3Client.deleteObject(BUCKET_NAME, directoryName); |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
public ResUploadType returnStorageType() { |
||||
return ResUploadType.S3; |
||||
} |
||||
} |
||||
@ -0,0 +1,201 @@
|
||||
Apache License |
||||
Version 2.0, January 2004 |
||||
http://www.apache.org/licenses/ |
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION |
||||
|
||||
1. Definitions. |
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction, |
||||
and distribution as defined by Sections 1 through 9 of this document. |
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by |
||||
the copyright owner that is granting the License. |
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all |
||||
other entities that control, are controlled by, or are under common |
||||
control with that entity. For the purposes of this definition, |
||||
"control" means (i) the power, direct or indirect, to cause the |
||||
direction or management of such entity, whether by contract or |
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the |
||||
outstanding shares, or (iii) beneficial ownership of such entity. |
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity |
||||
exercising permissions granted by this License. |
||||
|
||||
"Source" form shall mean the preferred form for making modifications, |
||||
including but not limited to software source code, documentation |
||||
source, and configuration files. |
||||
|
||||
"Object" form shall mean any form resulting from mechanical |
||||
transformation or translation of a Source form, including but |
||||
not limited to compiled object code, generated documentation, |
||||
and conversions to other media types. |
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or |
||||
Object form, made available under the License, as indicated by a |
||||
copyright notice that is included in or attached to the work |
||||
(an example is provided in the Appendix below). |
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object |
||||
form, that is based on (or derived from) the Work and for which the |
||||
editorial revisions, annotations, elaborations, or other modifications |
||||
represent, as a whole, an original work of authorship. For the purposes |
||||
of this License, Derivative Works shall not include works that remain |
||||
separable from, or merely link (or bind by name) to the interfaces of, |
||||
the Work and Derivative Works thereof. |
||||
|
||||
"Contribution" shall mean any work of authorship, including |
||||
the original version of the Work and any modifications or additions |
||||
to that Work or Derivative Works thereof, that is intentionally |
||||
submitted to Licensor for inclusion in the Work by the copyright owner |
||||
or by an individual or Legal Entity authorized to submit on behalf of |
||||
the copyright owner. For the purposes of this definition, "submitted" |
||||
means any form of electronic, verbal, or written communication sent |
||||
to the Licensor or its representatives, including but not limited to |
||||
communication on electronic mailing lists, source code control systems, |
||||
and issue tracking systems that are managed by, or on behalf of, the |
||||
Licensor for the purpose of discussing and improving the Work, but |
||||
excluding communication that is conspicuously marked or otherwise |
||||
designated in writing by the copyright owner as "Not a Contribution." |
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity |
||||
on behalf of whom a Contribution has been received by Licensor and |
||||
subsequently incorporated within the Work. |
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of |
||||
this License, each Contributor hereby grants to You a perpetual, |
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
||||
copyright license to reproduce, prepare Derivative Works of, |
||||
publicly display, publicly perform, sublicense, and distribute the |
||||
Work and such Derivative Works in Source or Object form. |
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of |
||||
this License, each Contributor hereby grants to You a perpetual, |
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
||||
(except as stated in this section) patent license to make, have made, |
||||
use, offer to sell, sell, import, and otherwise transfer the Work, |
||||
where such license applies only to those patent claims licensable |
||||
by such Contributor that are necessarily infringed by their |
||||
Contribution(s) alone or by combination of their Contribution(s) |
||||
with the Work to which such Contribution(s) was submitted. If You |
||||
institute patent litigation against any entity (including a |
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work |
||||
or a Contribution incorporated within the Work constitutes direct |
||||
or contributory patent infringement, then any patent licenses |
||||
granted to You under this License for that Work shall terminate |
||||
as of the date such litigation is filed. |
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the |
||||
Work or Derivative Works thereof in any medium, with or without |
||||
modifications, and in Source or Object form, provided that You |
||||
meet the following conditions: |
||||
|
||||
(a) You must give any other recipients of the Work or |
||||
Derivative Works a copy of this License; and |
||||
|
||||
(b) You must cause any modified files to carry prominent notices |
||||
stating that You changed the files; and |
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works |
||||
that You distribute, all copyright, patent, trademark, and |
||||
attribution notices from the Source form of the Work, |
||||
excluding those notices that do not pertain to any part of |
||||
the Derivative Works; and |
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its |
||||
distribution, then any Derivative Works that You distribute must |
||||
include a readable copy of the attribution notices contained |
||||
within such NOTICE file, excluding those notices that do not |
||||
pertain to any part of the Derivative Works, in at least one |
||||
of the following places: within a NOTICE text file distributed |
||||
as part of the Derivative Works; within the Source form or |
||||
documentation, if provided along with the Derivative Works; or, |
||||
within a display generated by the Derivative Works, if and |
||||
wherever such third-party notices normally appear. The contents |
||||
of the NOTICE file are for informational purposes only and |
||||
do not modify the License. You may add Your own attribution |
||||
notices within Derivative Works that You distribute, alongside |
||||
or as an addendum to the NOTICE text from the Work, provided |
||||
that such additional attribution notices cannot be construed |
||||
as modifying the License. |
||||
|
||||
You may add Your own copyright statement to Your modifications and |
||||
may provide additional or different license terms and conditions |
||||
for use, reproduction, or distribution of Your modifications, or |
||||
for any such Derivative Works as a whole, provided Your use, |
||||
reproduction, and distribution of the Work otherwise complies with |
||||
the conditions stated in this License. |
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise, |
||||
any Contribution intentionally submitted for inclusion in the Work |
||||
by You to the Licensor shall be under the terms and conditions of |
||||
this License, without any additional terms or conditions. |
||||
Notwithstanding the above, nothing herein shall supersede or modify |
||||
the terms of any separate license agreement you may have executed |
||||
with Licensor regarding such Contributions. |
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade |
||||
names, trademarks, service marks, or product names of the Licensor, |
||||
except as required for reasonable and customary use in describing the |
||||
origin of the Work and reproducing the content of the NOTICE file. |
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or |
||||
agreed to in writing, Licensor provides the Work (and each |
||||
Contributor provides its Contributions) on an "AS IS" BASIS, |
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
||||
implied, including, without limitation, any warranties or conditions |
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A |
||||
PARTICULAR PURPOSE. You are solely responsible for determining the |
||||
appropriateness of using or redistributing the Work and assume any |
||||
risks associated with Your exercise of permissions under this License. |
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory, |
||||
whether in tort (including negligence), contract, or otherwise, |
||||
unless required by applicable law (such as deliberate and grossly |
||||
negligent acts) or agreed to in writing, shall any Contributor be |
||||
liable to You for damages, including any direct, indirect, special, |
||||
incidental, or consequential damages of any character arising as a |
||||
result of this License or out of the use or inability to use the |
||||
Work (including but not limited to damages for loss of goodwill, |
||||
work stoppage, computer failure or malfunction, or any and all |
||||
other commercial damages or losses), even if such Contributor |
||||
has been advised of the possibility of such damages. |
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing |
||||
the Work or Derivative Works thereof, You may choose to offer, |
||||
and charge a fee for, acceptance of support, warranty, indemnity, |
||||
or other liability obligations and/or rights consistent with this |
||||
License. However, in accepting such obligations, You may act only |
||||
on Your own behalf and on Your sole responsibility, not on behalf |
||||
of any other Contributor, and only if You agree to indemnify, |
||||
defend, and hold each Contributor harmless for any liability |
||||
incurred by, or claims asserted against, such Contributor by reason |
||||
of your accepting any such warranty or additional liability. |
||||
|
||||
END OF TERMS AND CONDITIONS |
||||
|
||||
APPENDIX: How to apply the Apache License to your work. |
||||
|
||||
To apply the Apache License to your work, attach the following |
||||
boilerplate notice, with the fields enclosed by brackets "[]" |
||||
replaced with your own identifying information. (Don't include |
||||
the brackets!) The text should be enclosed in the appropriate |
||||
comment syntax for the file format. We also recommend that a |
||||
file or class name and description of purpose be included on the |
||||
same "printed page" as the copyright notice for easier |
||||
identification within third-party archives. |
||||
|
||||
Copyright [yyyy] [name of copyright owner] |
||||
|
||||
Licensed 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. |
||||
@ -0,0 +1,201 @@
|
||||
Apache License |
||||
Version 2.0, January 2004 |
||||
http://www.apache.org/licenses/ |
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION |
||||
|
||||
1. Definitions. |
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction, |
||||
and distribution as defined by Sections 1 through 9 of this document. |
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by |
||||
the copyright owner that is granting the License. |
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all |
||||
other entities that control, are controlled by, or are under common |
||||
control with that entity. For the purposes of this definition, |
||||
"control" means (i) the power, direct or indirect, to cause the |
||||
direction or management of such entity, whether by contract or |
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the |
||||
outstanding shares, or (iii) beneficial ownership of such entity. |
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity |
||||
exercising permissions granted by this License. |
||||
|
||||
"Source" form shall mean the preferred form for making modifications, |
||||
including but not limited to software source code, documentation |
||||
source, and configuration files. |
||||
|
||||
"Object" form shall mean any form resulting from mechanical |
||||
transformation or translation of a Source form, including but |
||||
not limited to compiled object code, generated documentation, |
||||
and conversions to other media types. |
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or |
||||
Object form, made available under the License, as indicated by a |
||||
copyright notice that is included in or attached to the work |
||||
(an example is provided in the Appendix below). |
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object |
||||
form, that is based on (or derived from) the Work and for which the |
||||
editorial revisions, annotations, elaborations, or other modifications |
||||
represent, as a whole, an original work of authorship. For the purposes |
||||
of this License, Derivative Works shall not include works that remain |
||||
separable from, or merely link (or bind by name) to the interfaces of, |
||||
the Work and Derivative Works thereof. |
||||
|
||||
"Contribution" shall mean any work of authorship, including |
||||
the original version of the Work and any modifications or additions |
||||
to that Work or Derivative Works thereof, that is intentionally |
||||
submitted to Licensor for inclusion in the Work by the copyright owner |
||||
or by an individual or Legal Entity authorized to submit on behalf of |
||||
the copyright owner. For the purposes of this definition, "submitted" |
||||
means any form of electronic, verbal, or written communication sent |
||||
to the Licensor or its representatives, including but not limited to |
||||
communication on electronic mailing lists, source code control systems, |
||||
and issue tracking systems that are managed by, or on behalf of, the |
||||
Licensor for the purpose of discussing and improving the Work, but |
||||
excluding communication that is conspicuously marked or otherwise |
||||
designated in writing by the copyright owner as "Not a Contribution." |
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity |
||||
on behalf of whom a Contribution has been received by Licensor and |
||||
subsequently incorporated within the Work. |
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of |
||||
this License, each Contributor hereby grants to You a perpetual, |
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
||||
copyright license to reproduce, prepare Derivative Works of, |
||||
publicly display, publicly perform, sublicense, and distribute the |
||||
Work and such Derivative Works in Source or Object form. |
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of |
||||
this License, each Contributor hereby grants to You a perpetual, |
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
||||
(except as stated in this section) patent license to make, have made, |
||||
use, offer to sell, sell, import, and otherwise transfer the Work, |
||||
where such license applies only to those patent claims licensable |
||||
by such Contributor that are necessarily infringed by their |
||||
Contribution(s) alone or by combination of their Contribution(s) |
||||
with the Work to which such Contribution(s) was submitted. If You |
||||
institute patent litigation against any entity (including a |
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work |
||||
or a Contribution incorporated within the Work constitutes direct |
||||
or contributory patent infringement, then any patent licenses |
||||
granted to You under this License for that Work shall terminate |
||||
as of the date such litigation is filed. |
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the |
||||
Work or Derivative Works thereof in any medium, with or without |
||||
modifications, and in Source or Object form, provided that You |
||||
meet the following conditions: |
||||
|
||||
(a) You must give any other recipients of the Work or |
||||
Derivative Works a copy of this License; and |
||||
|
||||
(b) You must cause any modified files to carry prominent notices |
||||
stating that You changed the files; and |
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works |
||||
that You distribute, all copyright, patent, trademark, and |
||||
attribution notices from the Source form of the Work, |
||||
excluding those notices that do not pertain to any part of |
||||
the Derivative Works; and |
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its |
||||
distribution, then any Derivative Works that You distribute must |
||||
include a readable copy of the attribution notices contained |
||||
within such NOTICE file, excluding those notices that do not |
||||
pertain to any part of the Derivative Works, in at least one |
||||
of the following places: within a NOTICE text file distributed |
||||
as part of the Derivative Works; within the Source form or |
||||
documentation, if provided along with the Derivative Works; or, |
||||
within a display generated by the Derivative Works, if and |
||||
wherever such third-party notices normally appear. The contents |
||||
of the NOTICE file are for informational purposes only and |
||||
do not modify the License. You may add Your own attribution |
||||
notices within Derivative Works that You distribute, alongside |
||||
or as an addendum to the NOTICE text from the Work, provided |
||||
that such additional attribution notices cannot be construed |
||||
as modifying the License. |
||||
|
||||
You may add Your own copyright statement to Your modifications and |
||||
may provide additional or different license terms and conditions |
||||
for use, reproduction, or distribution of Your modifications, or |
||||
for any such Derivative Works as a whole, provided Your use, |
||||
reproduction, and distribution of the Work otherwise complies with |
||||
the conditions stated in this License. |
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise, |
||||
any Contribution intentionally submitted for inclusion in the Work |
||||
by You to the Licensor shall be under the terms and conditions of |
||||
this License, without any additional terms or conditions. |
||||
Notwithstanding the above, nothing herein shall supersede or modify |
||||
the terms of any separate license agreement you may have executed |
||||
with Licensor regarding such Contributions. |
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade |
||||
names, trademarks, service marks, or product names of the Licensor, |
||||
except as required for reasonable and customary use in describing the |
||||
origin of the Work and reproducing the content of the NOTICE file. |
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or |
||||
agreed to in writing, Licensor provides the Work (and each |
||||
Contributor provides its Contributions) on an "AS IS" BASIS, |
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
||||
implied, including, without limitation, any warranties or conditions |
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A |
||||
PARTICULAR PURPOSE. You are solely responsible for determining the |
||||
appropriateness of using or redistributing the Work and assume any |
||||
risks associated with Your exercise of permissions under this License. |
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory, |
||||
whether in tort (including negligence), contract, or otherwise, |
||||
unless required by applicable law (such as deliberate and grossly |
||||
negligent acts) or agreed to in writing, shall any Contributor be |
||||
liable to You for damages, including any direct, indirect, special, |
||||
incidental, or consequential damages of any character arising as a |
||||
result of this License or out of the use or inability to use the |
||||
Work (including but not limited to damages for loss of goodwill, |
||||
work stoppage, computer failure or malfunction, or any and all |
||||
other commercial damages or losses), even if such Contributor |
||||
has been advised of the possibility of such damages. |
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing |
||||
the Work or Derivative Works thereof, You may choose to offer, |
||||
and charge a fee for, acceptance of support, warranty, indemnity, |
||||
or other liability obligations and/or rights consistent with this |
||||
License. However, in accepting such obligations, You may act only |
||||
on Your own behalf and on Your sole responsibility, not on behalf |
||||
of any other Contributor, and only if You agree to indemnify, |
||||
defend, and hold each Contributor harmless for any liability |
||||
incurred by, or claims asserted against, such Contributor by reason |
||||
of your accepting any such warranty or additional liability. |
||||
|
||||
END OF TERMS AND CONDITIONS |
||||
|
||||
APPENDIX: How to apply the Apache License to your work. |
||||
|
||||
To apply the Apache License to your work, attach the following |
||||
boilerplate notice, with the fields enclosed by brackets "[]" |
||||
replaced with your own identifying information. (Don't include |
||||
the brackets!) The text should be enclosed in the appropriate |
||||
comment syntax for the file format. We also recommend that a |
||||
file or class name and description of purpose be included on the |
||||
same "printed page" as the copyright notice for easier |
||||
identification within third-party archives. |
||||
|
||||
Copyright [yyyy] [name of copyright owner] |
||||
|
||||
Licensed 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. |
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue