From 0d0e3fd8ed185ebe3b6a75edc3d4e6ed9ed3b4d7 Mon Sep 17 00:00:00 2001 From: saltbo Date: Sun, 17 May 2020 23:09:33 +0800 Subject: [PATCH] chore: update the arg endpoint to the region --- .github/workflows/main.yml | 3 ++- README.md | 20 ++++++++++---------- action.yml | 6 +++--- cmd/main.go | 10 +++++----- scripts/entrypoint.sh | 2 +- uploader/driver.go | 1 + 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b098b4..ed3ebd3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,9 +25,10 @@ jobs: UPLOADER_OSS_SK: ${{ secrets.UPLOADER_OSS_SK }} UPLOADER_QINIU_AK: ${{ secrets.UPLOADER_QINIU_AK }} UPLOADER_QINIU_SK: ${{ secrets.UPLOADER_QINIU_SK }} + UPLOADER_STORAGE_AK: ${{ secrets.UPLOADER_STORAGE_AK }} + UPLOADER_STORAGE_SK: ${{ secrets.UPLOADER_STORAGE_SK }} UPLOADER_S3_AK: ${{ secrets.UPLOADER_S3_AK }} UPLOADER_S3_SK: ${{ secrets.UPLOADER_S3_SK }} - UPLOADER_GOOGLE_SK: ${{ secrets.UPLOADER_GOOGLE_SK }} - name: Upload Coverage report to CodeCov uses: codecov/codecov-action@v1.0.0 with: diff --git a/README.md b/README.md index 134543e..6f240a1 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ curl -sSf http://uptoc.saltbo.cn/install.sh | sh ### Basic ```bash -uptoc --endpoint oss-cn-beijing.aliyuncs.com --access_key LTAI4FxxxxxxxBXmS3 --access_secret Vt1FZgxxxxxxxxxxxxKp380AI --bucket demo-bucket /opt/blog/public +uptoc --driver oss --region cn-beijing --access_key LTAI4FxxxxxxxBXmS3 --access_secret Vt1FZgxxxxxxxxxxxxKp380AI --bucket demo-bucket /opt/blog/public ``` And the access-key and access-secret support settings by the system environment @@ -40,7 +40,7 @@ And the access-key and access-secret support settings by the system environment export UPTOC_UPLOADER_AK=LTAI4FxxxxxxxBXmS3 export UPTOC_UPLOADER_SK=Vt1FZgxxxxxxxxxxxxKp380AI -uptoc --endpoint oss-cn-beijing.aliyuncs.com --bucket blog-bucket /opt/blog/public +uptoc --driver oss --region cn-beijing --bucket blog-bucket /opt/blog/public ``` ### Github Actions @@ -50,7 +50,7 @@ steps: uses: saltbo/uptoc@master with: driver: oss - endpoint: oss-cn-zhangjiakou.aliyuncs.com + region: cn-zhangjiakou bucket: saltbo-blog dist: public env: @@ -61,17 +61,17 @@ steps: ```yaml after_success: - curl -sSf http://uptoc.saltbo.cn/install.sh | sh - - uptoc --endpoint uploader-cn-zhangjiakou.aliyuncs.com --bucket blog-bucket public + - uptoc --region cn-zhangjiakou --bucket blog-bucket public ``` ## Args Examples -| driver | bucket | endpoint | endpoint enum | +| driver | bucket | region | region enum | | ----- | --------- | ------ | ---- | -| oss | ut-uptoc | oss-cn-hangzhou.aliyuncs.com | [Regions and endpoints](https://help.aliyun.com/document_detail/31837.html?spm=a2c4g.11186623.2.12.5fdb25b7xyEcuF#concept-zt4-cvy-5db) | -| qiniu | ut-uptoc | huadong | huadong,huabei,huanan,beimei,xinjiapo | -| cos | ut-uptoc-1255970412 | ap-shanghai | [Regions and endpoints](https://cloud.tencent.com/document/product/436/6224) | -| s3 | ut-uptoc | ap-northeast-1 | [Regions and endpoints](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints) | -| google | ut-uptoc | - | - | +| oss | ut-uptoc | cn-hangzhou | [Regions](https://help.aliyun.com/document_detail/31837.html?spm=a2c4g.11186623.2.12.5fdb25b7xyEcuF#concept-zt4-cvy-5db) | +| cos | ut-uptoc-1255970412 | ap-shanghai | [Regions](https://cloud.tencent.com/document/product/436/6224) | +| qiniu | ut-uptoc | cn-east-1 | [Regions](https://developer.qiniu.com/kodo/manual/4088/s3-access-domainname) | +| google | ut-uptoc | auto | - | +| s3 | ut-uptoc | ap-northeast-1 | [Regions](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints) | ## Contact us diff --git a/action.yml b/action.yml index b33596d..8bc8d3f 100644 --- a/action.yml +++ b/action.yml @@ -9,8 +9,8 @@ inputs: driver: description: 'specify driver for the cloud platform' required: true - endpoint: - description: 'specify endpoint of the cloud platform' + region: + description: 'specify region of the cloud platform' required: true bucket: description: 'specify bucket name of the cloud platform' @@ -24,6 +24,6 @@ runs: image: 'Dockerfile' args: - ${{ inputs.driver }} - - ${{ inputs.endpoint }} + - ${{ inputs.region }} - ${{ inputs.bucket }} - ${{ inputs.dist }} diff --git a/cmd/main.go b/cmd/main.go index 3c74eb1..caaed53 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -16,7 +16,7 @@ import ( const ( // uploader flags uploaderFlagDriver = "driver" - uploaderFlagEndpoint = "endpoint" + uploaderFlagRegion = "region" uploaderFlagAccessKey = "access_key" uploaderFlagAccessSecret = "access_secret" uploaderFlagBucket = "bucket" @@ -41,8 +41,8 @@ var ( Value: "oss", }, cli.StringFlag{ - Name: uploaderFlagEndpoint, - Usage: "specify endpoint of the cloud platform", + Name: uploaderFlagRegion, + Usage: "specify region of the cloud platform", Required: true, }, cli.StringFlag{ @@ -81,11 +81,11 @@ func main() { func action(c *cli.Context) { driver := c.String(uploaderFlagDriver) - endpoint := c.String(uploaderFlagEndpoint) + region := c.String(uploaderFlagRegion) accessKey := c.String(uploaderFlagAccessKey) accessSecret := c.String(uploaderFlagAccessSecret) bucketName := c.String(uploaderFlagBucket) - uploadDriver, err := uploader.New(driver, endpoint, accessKey, accessSecret, bucketName) + uploadDriver, err := uploader.New(driver, region, accessKey, accessSecret, bucketName) if err != nil { log.Fatalln(err) } diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh index 1804cde..86c56c8 100755 --- a/scripts/entrypoint.sh +++ b/scripts/entrypoint.sh @@ -1,3 +1,3 @@ #!/bin/sh -l -uptoc --driver "$1" --endpoint "$2" --bucket "$3" "$4" +uptoc --driver "$1" --region "$2" --bucket "$3" "$4" diff --git a/uploader/driver.go b/uploader/driver.go index f2d373c..09b1e73 100644 --- a/uploader/driver.go +++ b/uploader/driver.go @@ -29,6 +29,7 @@ type Driver interface { Delete(object string) error } +// driver => endpoint format template var supportDrivers = map[string]string{ "cos": "cos.%s.myqcloud.com", "oss": "oss-%s.aliyuncs.com",