Compare commits

..

89 Commits
v3.0.1 ... main

Author SHA1 Message Date
dc9499494d
add deprecation notice 2023-08-29 21:37:10 +02:00
renovate[bot]
5b8ed49203 chore(docker): update golang:1.20 docker digest to 839ba88 2023-08-17 00:26:45 +00:00
renovate[bot]
1b81d9b309 chore(deps): update dependency golangci/golangci-lint to v1.54.1 2023-08-14 04:23:31 +00:00
renovate[bot]
ad0e5c20a7 chore(docker): update golang:1.20 docker digest to 37c7d85 2023-08-10 07:42:36 +00:00
renovate[bot]
6c3b703a75 chore(docker): update alpine:3.18 docker digest to 7144f7b 2023-08-08 00:04:36 +00:00
renovate[bot]
9c4cd6f4d8 chore(docker): update golang:1.20 docker digest to bc5f0b5 2023-08-02 03:04:15 +00:00
renovate[bot]
32fbf9a234 chore(docker): update golang:1.20 docker digest to 010a0ff 2023-07-30 01:13:29 +00:00
renovate[bot]
ae961b4cff chore(docker): update golang:1.20 docker digest to 3952625 2023-07-29 06:44:09 +00:00
renovate[bot]
0490fb3b83
fix(deps): update module github.com/urfave/cli/v2 to v2.25.7 (#140)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-19 09:54:49 +02:00
renovate[bot]
6ff0115c36
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.302 (#141)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-19 09:54:41 +02:00
renovate[bot]
29f45437b6 chore(docker): update golang:1.20 docker digest to cfc9d1b 2023-07-14 01:42:47 +00:00
renovate[bot]
22a176322a chore(docker): update golang:1.20 docker digest to 8e5a006 2023-07-12 00:33:32 +00:00
renovate[bot]
50fb140f66 chore(docker): update golang:1.20 docker digest to fd9306e 2023-07-06 04:46:20 +00:00
renovate[bot]
23e861b95f chore(docker): update golang:1.20 docker digest to 20ee7c8 2023-07-05 15:04:18 +00:00
renovate[bot]
98a0e95bfe chore(docker): update golang:1.20 docker digest to ff2cca5 2023-07-05 08:22:45 +00:00
renovate[bot]
91abeb92c8 chore(docker): update golang:1.20 docker digest to 7954299 2023-07-05 00:43:44 +00:00
renovate[bot]
997a6a16b5 chore(docker): update golang:1.20 docker digest to 344193a 2023-06-24 07:08:49 +00:00
renovate[bot]
e2ec69973b chore(docker): update golang:1.20 docker digest to 8f958bf 2023-06-22 13:30:37 +00:00
renovate[bot]
32ac157677 chore(docker): update golang:1.20 docker digest to 9d0422f 2023-06-22 08:21:26 +00:00
renovate[bot]
5f06938198
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.285 (#135)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-20 09:09:20 +02:00
renovate[bot]
7b855d26fd chore(deps): update dependency golangci/golangci-lint to v1.53.3 2023-06-19 04:23:09 +00:00
renovate[bot]
46f45b8494 chore(docker): update docker digests 2023-06-18 08:24:41 +00:00
renovate[bot]
97e5ae30e3 chore(docker): update golang:1.20 docker digest to e7bb4d1 2023-06-14 14:19:42 +00:00
renovate[bot]
25fd54bbcb chore(docker): update golang:1.20 docker digest to f28300f 2023-06-14 04:32:22 +00:00
renovate[bot]
89e06548b5
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.280 (#133)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-10 15:34:00 +02:00
renovate[bot]
ab492e5f01 chore(docker): update golang:1.20 docker digest to 4b1fc02 2023-06-07 02:04:12 +00:00
renovate[bot]
0027757cc6
fix(deps): update module github.com/thegeeklab/drone-plugin-lib/v2 to v2.3.4 (#132)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-05 14:08:26 +02:00
renovate[bot]
d93d5bf935
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.275 (#128)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-05 10:15:00 +02:00
renovate[bot]
769df02e4e
fix(deps): update module github.com/urfave/cli/v2 to v2.25.5 (#130)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-05 10:14:49 +02:00
renovate[bot]
24be32e9b8
fix(deps): update module github.com/sirupsen/logrus to v1.9.3 (#129)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-05 10:00:31 +02:00
renovate[bot]
5cb382dc18
chore(deps): update dependency golangci/golangci-lint to v1.53.2 (#131)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Robert Kaussow <mail@thegeeklab.de>
2023-06-05 09:54:56 +02:00
renovate[bot]
bc1574b319
fix(deps): update module github.com/thegeeklab/drone-plugin-lib/v2 to v2.3.3 (#127)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-29 13:08:05 +02:00
renovate[bot]
1ae37a2627
fix(deps): update module github.com/urfave/cli/v2 to v2.25.4 (#126)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-29 11:39:22 +02:00
renovate[bot]
37d3738266
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.271 (#115)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-28 23:09:47 +02:00
renovate[bot]
115764f40a
chore(deps): update alpine docker tag to v3.18 (#121)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-28 15:27:41 +02:00
renovate[bot]
338ce66c98
fix(deps): update module github.com/sirupsen/logrus to v1.9.2 (#123)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-26 10:58:38 +02:00
renovate[bot]
26b6178a16 chore(docker): update golang:1.20 docker digest to 690e413 2023-05-24 08:10:55 +00:00
renovate[bot]
5c4da224c5 chore(docker): update golang:1.20 docker digest to 3f1f050 2023-05-24 02:10:03 +00:00
renovate[bot]
3bd9d1df75
fix(deps): update module github.com/urfave/cli/v2 to v2.25.3 (#120)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-13 11:15:28 +02:00
renovate[bot]
5b4a0b74ee chore(docker): update golang:1.20 docker digest to 685a22e 2023-05-10 06:31:51 +00:00
renovate[bot]
f39bb55202 chore(docker): update golang:1.20 docker digest to 31a8f92 2023-05-05 05:55:58 +00:00
renovate[bot]
cc8fed3fce chore(docker): update golang:1.20 docker digest to 4dd688d 2023-05-04 22:58:47 +00:00
renovate[bot]
cb03a3d203 chore(docker): update golang:1.20 docker digest to 6876eff 2023-05-04 03:39:41 +00:00
236085b2f0
fix bare url in contribution file (#117) 2023-05-03 11:51:16 +02:00
renovate[bot]
54b4ee8562
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.249 (#114)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-25 09:52:13 +02:00
renovate[bot]
0940f4a5b5
fix(deps): update module github.com/thegeeklab/drone-plugin-lib/v2 to v2.3.2 (#113)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-14 23:26:51 +02:00
renovate[bot]
189386db93
fix(deps): update module github.com/urfave/cli/v2 to v2.25.1 (#110)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-14 08:53:32 +02:00
renovate[bot]
343b6e7234
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.243 (#108)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-14 08:49:06 +02:00
renovate[bot]
122c6a8c64 chore(docker): update golang:1.20 docker digest to 403f486 2023-04-13 12:48:48 +00:00
renovate[bot]
8330677c1c chore(docker): update golang:1.20 docker digest to b9709ec 2023-04-13 04:04:09 +00:00
renovate[bot]
4d88de0025 chore(deps): update golang devdeps non-major 2023-04-10 07:12:18 +00:00
renovate[bot]
0b1f2de73a
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.237 (#100)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-06 09:48:51 +02:00
renovate[bot]
c5d7f1fb9d chore(docker): update golang:1.20 docker digest to 23050c2 2023-04-05 09:18:42 +00:00
renovate[bot]
73b066bbc1 chore(docker): update alpine:3.17 docker digest to 124c7d2 2023-03-30 01:28:49 +00:00
renovate[bot]
d8603a6354 chore(docker): update golang:1.20 docker digest to f709934 2023-03-28 03:03:04 +00:00
renovate[bot]
88b40b546e chore(docker): update golang:1.20 docker digest to 1724dc3 2023-03-27 15:49:05 +00:00
renovate[bot]
3f6b05e178 chore(docker): update golang:1.20 docker digest to 80950aa 2023-03-24 06:37:30 +00:00
renovate[bot]
fb067ec1a0 chore(docker): update golang:1.20 docker digest to 8114f4a 2023-03-24 02:06:28 +00:00
renovate[bot]
3755380e29 chore(docker): update golang:1.20 docker digest to a13b5e3 2023-03-23 20:55:46 +00:00
renovate[bot]
ce55cbda96
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.224 (#97) 2023-03-20 09:36:34 +01:00
renovate[bot]
d744ce5174 chore(deps): update dependency golangci/golangci-lint to v1.52.0 2023-03-20 03:49:02 +00:00
renovate[bot]
c2efcd9335 chore(docker): update golang:1.20 docker digest to 5990c4f 2023-03-16 05:07:46 +00:00
renovate[bot]
2837e59a35 chore(docker): update alpine:3.17 docker digest to ff6bdca 2023-03-14 03:06:48 +00:00
renovate[bot]
509f35ee9d chore(docker): update golang:1.20 docker digest to 74a3829 2023-03-08 06:47:42 +00:00
renovate[bot]
4d4bf1db12 chore(docker): update golang:1.20 docker digest to 52921e6 2023-03-02 11:35:24 +00:00
renovate[bot]
f607610f44 chore(docker): update golang:1.20 docker digest to a83a6a3 2023-03-01 17:23:30 +00:00
renovate[bot]
3406d0d903
fix(deps): update module github.com/urfave/cli/v2 to v2.24.4 (#90) 2023-02-25 15:21:01 +01:00
renovate[bot]
e5f58105e6
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.209 (#89) 2023-02-25 15:07:43 +01:00
renovate[bot]
f45f5f02c7 chore(deps): update dependency golangci/golangci-lint to v1.51.2 2023-02-20 06:31:11 +00:00
renovate[bot]
e597746c33 chore(docker): update golang:1.20 docker digest to 2edf6aa 2023-02-16 10:16:39 +00:00
renovate[bot]
ebe1ce6eed chore(docker): update golang:1.20 docker digest to 9911e93 2023-02-15 06:49:28 +00:00
renovate[bot]
c063220478 chore(docker): update docker digests 2023-02-11 12:58:00 +00:00
renovate[bot]
b745b8daec chore(docker): update golang:1.20 docker digest to 53b7958 2023-02-10 12:40:57 +00:00
renovate[bot]
25b0714282 chore(docker): update golang:1.20 docker digest to 6e835db 2023-02-09 18:10:18 +00:00
2234e5d8f7
ci: bump container build plugin to drone-docker-buildx:23 (#81) 2023-02-09 08:54:22 +01:00
renovate[bot]
d147fea1c4
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.196 (#71) 2023-02-08 17:31:35 +01:00
renovate[bot]
559085f54c
fix(deps): update module github.com/thegeeklab/drone-plugin-lib/v2 to v2.3.1 (#79) 2023-02-08 17:19:10 +01:00
2aa7584420
fix drone-matrix template 2023-02-08 17:04:32 +01:00
renovate[bot]
b409f87689
fix(deps): update module github.com/joho/godotenv to v1.5.1 (#72) 2023-02-08 11:07:37 +01:00
renovate[bot]
c13939c820
chore(deps): update golang docker tag to v1.20 (#70) 2023-02-08 10:23:57 +01:00
d2730125d8
refactor: add more linters and fix findings (#78) 2023-02-08 10:14:25 +01:00
renovate[bot]
8f561ae1a0 chore(deps): update dependency golangci/golangci-lint to v1.51.1 2023-02-06 06:42:19 +00:00
renovate[bot]
2917bf9b57 chore(docker): update golang:1.19 docker digest to 09009d4 2023-02-05 15:11:53 +00:00
renovate[bot]
4d98876594 chore(docker): update golang:1.19 docker digest to 0ff9c06 2023-02-05 09:38:55 +00:00
renovate[bot]
a77ef85b99 chore(docker): update golang:1.19 docker digest to 101204a 2023-02-05 03:55:08 +00:00
renovate[bot]
b5e5d32d69 chore(docker): update golang:1.19 docker digest to 9e577b0 2023-02-04 14:56:06 +00:00
renovate[bot]
7b56fc2372
fix(deps): update module github.com/urfave/cli/v2 to v2.24.3 (#69) 2023-02-03 08:48:00 +01:00
renovate[bot]
c706deee99
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.192 (#68) 2023-02-02 08:51:06 +01:00
renovate[bot]
6cb88f2bba
fix(deps): update module github.com/aws/aws-sdk-go to v1.44.181 (#67) 2023-01-18 13:27:28 +01:00
15 changed files with 284 additions and 417 deletions

View File

@ -1,297 +0,0 @@
---
kind: pipeline
name: test
platform:
os: linux
arch: amd64
steps:
- name: deps
image: golang:1.19
commands:
- make deps
volumes:
- name: godeps
path: /go
- name: lint
image: golang:1.19
commands:
- make lint
volumes:
- name: godeps
path: /go
- name: test
image: golang:1.19
commands:
- make test
volumes:
- name: godeps
path: /go
volumes:
- name: godeps
temp: {}
trigger:
ref:
- refs/heads/main
- refs/tags/**
- refs/pull/**
---
kind: pipeline
name: build-binaries
platform:
os: linux
arch: amd64
steps:
- name: build
image: techknowlogick/xgo:go-1.19.x
commands:
- ln -s /drone/src /source
- make release
- name: executable
image: alpine
commands:
- $(find dist/ -executable -type f -iname ${DRONE_REPO_NAME}-linux-amd64) --help
- name: changelog-generate
image: thegeeklab/git-chglog
commands:
- git fetch -tq
- git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
- name: changelog-format
image: thegeeklab/alpine-tools
commands:
- prettier CHANGELOG.md
- prettier -w CHANGELOG.md
- name: publish
image: plugins/github-release
settings:
api_key:
from_secret: github_token
files:
- dist/*
note: CHANGELOG.md
overwrite: true
title: ${DRONE_TAG}
when:
ref:
- refs/tags/**
trigger:
ref:
- refs/heads/main
- refs/tags/**
- refs/pull/**
depends_on:
- test
---
kind: pipeline
name: build-container
platform:
os: linux
arch: amd64
steps:
- name: dryrun
image: thegeeklab/drone-docker-buildx:20
settings:
dockerfile: Dockerfile.multiarch
dry_run: true
platforms:
- linux/amd64
- linux/arm64
- linux/arm/v7
- linux/arm/v6
provenance: false
repo: thegeeklab/${DRONE_REPO_NAME}
when:
ref:
- refs/pull/**
- name: publish-dockerhub
image: thegeeklab/drone-docker-buildx:20
settings:
auto_tag: true
dockerfile: Dockerfile.multiarch
password:
from_secret: docker_password
platforms:
- linux/amd64
- linux/arm64
- linux/arm/v7
- linux/arm/v6
provenance: false
repo: thegeeklab/${DRONE_REPO_NAME}
username:
from_secret: docker_username
when:
ref:
- refs/heads/main
- refs/tags/**
depends_on:
- dryrun
- name: publish-quay
image: thegeeklab/drone-docker-buildx:20
settings:
auto_tag: true
dockerfile: Dockerfile.multiarch
password:
from_secret: quay_password
platforms:
- linux/amd64
- linux/arm64
- linux/arm/v7
- linux/arm/v6
provenance: false
registry: quay.io
repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
username:
from_secret: quay_username
when:
ref:
- refs/heads/main
- refs/tags/**
depends_on:
- dryrun
trigger:
ref:
- refs/heads/main
- refs/tags/**
- refs/pull/**
depends_on:
- test
---
kind: pipeline
name: docs
platform:
os: linux
arch: amd64
concurrency:
limit: 1
steps:
- name: markdownlint
image: thegeeklab/markdownlint-cli
commands:
- markdownlint 'docs/content/**/*.md' 'README.md' 'CONTRIBUTING.md'
- name: spellcheck
image: thegeeklab/alpine-tools
commands:
- spellchecker --files '_docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls --no-suggestions
environment:
FORCE_COLOR: true
NPM_CONFIG_LOGLEVEL: error
- name: publish
image: thegeeklab/drone-git-action
settings:
action:
- pages
author_email: bot@thegeeklab.de
author_name: thegeeklab-bot
branch: docs
message: auto-update documentation
netrc_password:
from_secret: github_token
pages_directory: _docs/
when:
ref:
- refs/heads/main
trigger:
ref:
- refs/heads/main
- refs/tags/**
- refs/pull/**
depends_on:
- build-binaries
- build-container
---
kind: pipeline
name: notifications
platform:
os: linux
arch: amd64
steps:
- name: pushrm-dockerhub
image: chko/docker-pushrm:1
environment:
DOCKER_PASS:
from_secret: docker_password
DOCKER_USER:
from_secret: docker_username
PUSHRM_FILE: README.md
PUSHRM_SHORT: Drone plugin to synchronize a directory with an S3 bucket
PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
when:
status:
- success
- name: pushrm-quay
image: chko/docker-pushrm:1
environment:
APIKEY__QUAY_IO:
from_secret: quay_token
PUSHRM_FILE: README.md
PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME}
when:
status:
- success
- name: matrix
image: thegeeklab/drone-matrix
settings:
homeserver:
from_secret: matrix_homeserver
password:
from_secret: matrix_password
roomid:
from_secret: matrix_roomid
template: "Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}"
username:
from_secret: matrix_username
when:
status:
- success
- failure
trigger:
ref:
- refs/heads/main
- refs/tags/**
status:
- success
- failure
depends_on:
- docs
---
kind: signature
hmac: 944cf1fa4e35a0f1a4634335ec63ed97dd0f9059d05311fd2211595a7f7626b7
...

View File

@ -1,25 +1,91 @@
linters:
enable:
- gosimple
- deadcode
- typecheck
- govet
- errcheck
- staticcheck
- unused
- structcheck
- varcheck
- dupl
- gofmt
- misspell
- gocritic
- bidichk
- ineffassign
- revive
- gofumpt
- depguard
enable-all: false
disable-all: true
enable:
- errcheck
- gosimple
- govet
- ineffassign
- staticcheck
- typecheck
- unused
- asasalint
- asciicheck
- bidichk
- bodyclose
- containedctx
- contextcheck
- decorder
- dogsled
- dupl
- dupword
- durationcheck
- errchkjson
- errname
- errorlint
- execinquery
- exhaustive
- exportloopref
- forcetypeassert
- ginkgolinter
- gocheckcompilerdirectives
- gochecknoglobals
- gochecknoinits
- gocognit
- goconst
- gocritic
- gocyclo
- godot
- godox
- goerr113
- gofmt
- gofumpt
- goheader
- goimports
- gomnd
- gomoddirectives
- gomodguard
- goprintffuncname
- gosec
- grouper
- importas
- interfacebloat
- ireturn
- lll
- loggercheck
- maintidx
- makezero
- misspell
- musttag
- nakedret
- nestif
- nilerr
- nilnil
- nlreturn
- noctx
- nolintlint
- nonamedreturns
- nosprintfhostport
- prealloc
- predeclared
- promlinter
- reassign
- revive
# - rowserrcheck
# - sqlclosecheck
# - structcheck
- stylecheck
- tagliatelle
- tenv
- testableexamples
- thelper
- tparallel
- unconvert
- unparam
- usestdlibvars
# - wastedassign
- whitespace
- wsl
fast: false
run:
@ -28,4 +94,4 @@ run:
linters-settings:
gofumpt:
extra-rules: true
lang-version: "1.18"
lang-version: "1.20"

View File

@ -3,7 +3,7 @@
## Security
If you think you have found a **security issue**, please do not mention it in this repository.
Instead, send an email to security@thegeeklab.de with as many details as possible so it can be handled confidential.
Instead, send an email to `security@thegeeklab.de` with as many details as possible so it can be handled confidential.
## Bug Reports and Feature Requests

View File

@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.19@sha256:bb9811fad43a7d6fd2173248d8331b2dcf5ac9af20976b1937ecd214c5b8c383 as build
FROM --platform=$BUILDPLATFORM golang:1.20@sha256:839ba88412b5d3e12d66ed4774a85fc6e6c644dce8074ab82c798e5db27d4a09 as build
ARG TARGETOS
ARG TARGETARCH
@ -8,7 +8,7 @@ WORKDIR /src
RUN make build
FROM alpine:3.17@sha256:f271e74b17ced29b915d351685fd4644785c6d1559dd1f2d4189a5e851ef753a
FROM alpine:3.18@sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"

View File

@ -1,7 +1,7 @@
# renovate: datasource=github-releases depName=mvdan/gofumpt
GOFUMPT_PACKAGE_VERSION := v0.4.0
GOFUMPT_PACKAGE_VERSION := v0.5.0
# renovate: datasource=github-releases depName=golangci/golangci-lint
GOLANGCI_LINT_PACKAGE_VERSION := v1.50.1
GOLANGCI_LINT_PACKAGE_VERSION := v1.54.1
EXECUTABLE := drone-s3-sync
@ -19,7 +19,7 @@ GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@$(G
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
GENERATE ?=
XGO_VERSION := go-1.19.x
XGO_VERSION := go-1.20.x
XGO_TARGETS ?= linux/amd64,linux/arm-6,linux/arm-7,linux/arm64
TARGETOS ?= linux

View File

@ -1,6 +1,6 @@
# drone-s3-sync
Drone plugin to synchronize a directory with an S3 bucket
DISCONTINUED: Drone plugin to synchronize a directory with an S3 bucket
[![Build Status](https://img.shields.io/drone/build/thegeeklab/drone-s3-sync?logo=drone&server=https%3A%2F%2Fdrone.thegeeklab.de)](https://drone.thegeeklab.de/thegeeklab/drone-s3-sync)
[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/drone-s3-sync)
@ -10,6 +10,8 @@ Drone plugin to synchronize a directory with an S3 bucket
[![Source: GitHub](https://img.shields.io/badge/source-github-blue.svg?logo=github&logoColor=white)](https://github.com/thegeeklab/drone-s3-sync)
[![License: MIT](https://img.shields.io/github/license/thegeeklab/drone-s3-sync)](https://github.com/thegeeklab/drone-s3-sync/blob/main/LICENSE)
> **DISCONTINUED:** As I don't use Drone CI anymore, this project is unmaintained. If you are interested in a free and open source CI system check out [Woodpecker CI](https://woodpecker-ci.org/).
Drone plugin to synchronize a directory with an S3 bucket. You can find the full documentation at [https://drone-plugin-index.geekdocs.de](https://drone-plugin-index.geekdocs.de/plugins/drone-s3-sync).
## Contributors

View File

@ -134,8 +134,9 @@ func settingsFlags(settings *plugin.Settings, category string) []cli.Flag {
Category: category,
},
&cli.IntFlag{
Name: "max-concurrency",
Usage: "customize number concurrent files to process",
Name: "max-concurrency",
Usage: "customize number concurrent files to process",
//nolint:gomnd
Value: 100,
EnvVars: []string{"PLUGIN_MAX_CONCURRENCY"},
Destination: &settings.MaxConcurrency,

View File

@ -1,6 +1,7 @@
package main
import (
"errors"
"fmt"
"os"
@ -11,11 +12,14 @@ import (
"github.com/urfave/cli/v2"
)
//nolint:gochecknoglobals
var (
BuildVersion = "devel"
BuildDate = "00000000"
)
var ErrTypeAssertionFailed = errors.New("type assertion failed")
func main() {
settings := &plugin.Settings{}
@ -44,12 +48,42 @@ func run(settings *plugin.Settings) cli.ActionFunc {
return func(ctx *cli.Context) error {
urfave.LoggingFromContext(ctx)
settings.ACL = ctx.Generic("acl").(*StringMapFlag).Get()
settings.CacheControl = ctx.Generic("cache-control").(*StringMapFlag).Get()
settings.ContentType = ctx.Generic("content-type").(*StringMapFlag).Get()
settings.ContentEncoding = ctx.Generic("content-encoding").(*StringMapFlag).Get()
settings.Metadata = ctx.Generic("metadata").(*DeepStringMapFlag).Get()
settings.Redirects = ctx.Generic("redirects").(*MapFlag).Get()
acl, ok := ctx.Generic("acl").(*StringMapFlag)
if !ok {
return fmt.Errorf("%w: failed to read acl input", ErrTypeAssertionFailed)
}
cacheControl, ok := ctx.Generic("cache-control").(*StringMapFlag)
if !ok {
return fmt.Errorf("%w: failed to read cache-control input", ErrTypeAssertionFailed)
}
contentType, ok := ctx.Generic("content-type").(*StringMapFlag)
if !ok {
return fmt.Errorf("%w: failed to read content-type input", ErrTypeAssertionFailed)
}
contentEncoding, ok := ctx.Generic("content-encoding").(*StringMapFlag)
if !ok {
return fmt.Errorf("%w: failed to read content-encoding input", ErrTypeAssertionFailed)
}
metadata, ok := ctx.Generic("metadata").(*DeepStringMapFlag)
if !ok {
return fmt.Errorf("%w: failed to read metadata input", ErrTypeAssertionFailed)
}
redirects, ok := ctx.Generic("redirects").(*MapFlag)
if !ok {
return fmt.Errorf("%w: failed to read redirects input", ErrTypeAssertionFailed)
}
settings.ACL = acl.Get()
settings.CacheControl = cacheControl.Get()
settings.ContentType = contentType.Get()
settings.ContentEncoding = contentEncoding.Get()
settings.Metadata = metadata.Get()
settings.Redirects = redirects.Get()
plugin := plugin.New(
*settings,

View File

@ -18,9 +18,11 @@ func (d *DeepStringMapFlag) Get() map[string]map[string]string {
func (d *DeepStringMapFlag) Set(value string) error {
d.parts = map[string]map[string]string{}
err := json.Unmarshal([]byte(value), &d.parts)
if err != nil {
single := map[string]string{}
err := json.Unmarshal([]byte(value), &single)
if err != nil {
return err
@ -46,10 +48,12 @@ func (s *StringMapFlag) Get() map[string]string {
func (s *StringMapFlag) Set(value string) error {
s.parts = map[string]string{}
err := json.Unmarshal([]byte(value), &s.parts)
if err != nil {
s.parts["*"] = value
}
return nil
}
@ -67,5 +71,6 @@ func (m *MapFlag) Get() map[string]string {
func (m *MapFlag) Set(value string) error {
m.parts = map[string]string{}
return json.Unmarshal([]byte(value), &m.parts)
}

14
go.mod
View File

@ -1,14 +1,14 @@
module github.com/thegeeklab/drone-s3-sync
go 1.19
go 1.20
require (
github.com/aws/aws-sdk-go v1.44.180
github.com/joho/godotenv v1.4.0
github.com/aws/aws-sdk-go v1.44.302
github.com/joho/godotenv v1.5.1
github.com/ryanuber/go-glob v1.0.0
github.com/sirupsen/logrus v1.9.0
github.com/thegeeklab/drone-plugin-lib/v2 v2.2.1
github.com/urfave/cli/v2 v2.23.7
github.com/sirupsen/logrus v1.9.3
github.com/thegeeklab/drone-plugin-lib/v2 v2.3.4
github.com/urfave/cli/v2 v2.25.7
)
require (
@ -16,5 +16,5 @@ require (
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/sys v0.2.0 // indirect
)

23
go.sum
View File

@ -1,5 +1,5 @@
github.com/aws/aws-sdk-go v1.44.180 h1:VLZuAHI9fa/3WME5JjpVjcPCNfpGHVMiHx8sLHWhMgI=
github.com/aws/aws-sdk-go v1.44.180/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/aws/aws-sdk-go v1.44.302 h1:ST3ko6GrJKn3Xi+nAvxjG3uk/V1pW8KC52WLeIxqqNk=
github.com/aws/aws-sdk-go v1.44.302/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@ -9,8 +9,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@ -18,15 +18,15 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/thegeeklab/drone-plugin-lib/v2 v2.2.1 h1:fta32M+y6aHG/BX+Kwxo9DQAcYpTyCBHn7sAm2qjfL0=
github.com/thegeeklab/drone-plugin-lib/v2 v2.2.1/go.mod h1:Bu++VS6GXEWCHQdzR65dPsGtBGOMuqAQPiRVBaa+HrY=
github.com/urfave/cli/v2 v2.23.7 h1:YHDQ46s3VghFHFf1DdF+Sh7H4RqhcM+t0TmZRJx4oJY=
github.com/urfave/cli/v2 v2.23.7/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
github.com/thegeeklab/drone-plugin-lib/v2 v2.3.4 h1:Quzrike/xRAR0izxQ0d+ocJyIUm4h1497Oyo9grcRzg=
github.com/thegeeklab/drone-plugin-lib/v2 v2.3.4/go.mod h1:qWVUZCmwL0Ntwa/hvyqM03EeIr1ReBR2XJsmIc7MGus=
github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@ -46,8 +46,9 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

View File

@ -1,7 +1,9 @@
package plugin
import (
//nolint:gosec
"crypto/md5"
"errors"
"fmt"
"io"
"mime"
@ -28,20 +30,20 @@ type AWS struct {
plugin *Plugin
}
func NewAWS(p *Plugin) AWS {
func NewAWS(plugin *Plugin) AWS {
sessCfg := &aws.Config{
S3ForcePathStyle: aws.Bool(p.settings.PathStyle),
Region: aws.String(p.settings.Region),
S3ForcePathStyle: aws.Bool(plugin.settings.PathStyle),
Region: aws.String(plugin.settings.Region),
}
if p.settings.Endpoint != "" {
sessCfg.Endpoint = &p.settings.Endpoint
sessCfg.DisableSSL = aws.Bool(strings.HasPrefix(p.settings.Endpoint, "http://"))
if plugin.settings.Endpoint != "" {
sessCfg.Endpoint = &plugin.settings.Endpoint
sessCfg.DisableSSL = aws.Bool(strings.HasPrefix(plugin.settings.Endpoint, "http://"))
}
// allowing to use the instance role or provide a key and secret
if p.settings.AccessKey != "" && p.settings.SecretKey != "" {
sessCfg.Credentials = credentials.NewStaticCredentials(p.settings.AccessKey, p.settings.SecretKey, "")
if plugin.settings.AccessKey != "" && plugin.settings.SecretKey != "" {
sessCfg.Credentials = credentials.NewStaticCredentials(plugin.settings.AccessKey, plugin.settings.SecretKey, "")
}
sess, _ := session.NewSession(sessCfg)
@ -51,11 +53,13 @@ func NewAWS(p *Plugin) AWS {
r := make([]string, 1)
l := make([]string, 1)
return AWS{c, cf, r, l, p}
return AWS{c, cf, r, l, plugin}
}
//nolint:gocognit,gocyclo,maintidx
func (a *AWS) Upload(local, remote string) error {
p := a.plugin
plugin := a.plugin
if local == "" {
return nil
}
@ -68,9 +72,11 @@ func (a *AWS) Upload(local, remote string) error {
defer file.Close()
var acl string
for pattern := range p.settings.ACL {
for pattern := range plugin.settings.ACL {
if match := glob.Glob(pattern, local); match {
acl = p.settings.ACL[pattern]
acl = plugin.settings.ACL[pattern]
break
}
}
@ -82,9 +88,11 @@ func (a *AWS) Upload(local, remote string) error {
fileExt := filepath.Ext(local)
var contentType string
for patternExt := range p.settings.ContentType {
for patternExt := range plugin.settings.ContentType {
if patternExt == fileExt {
contentType = p.settings.ContentType[patternExt]
contentType = plugin.settings.ContentType[patternExt]
break
}
}
@ -94,43 +102,58 @@ func (a *AWS) Upload(local, remote string) error {
}
var contentEncoding string
for patternExt := range p.settings.ContentEncoding {
for patternExt := range plugin.settings.ContentEncoding {
if patternExt == fileExt {
contentEncoding = p.settings.ContentEncoding[patternExt]
contentEncoding = plugin.settings.ContentEncoding[patternExt]
break
}
}
var cacheControl string
for pattern := range p.settings.CacheControl {
for pattern := range plugin.settings.CacheControl {
if match := glob.Glob(pattern, local); match {
cacheControl = p.settings.CacheControl[pattern]
cacheControl = plugin.settings.CacheControl[pattern]
break
}
}
metadata := map[string]*string{}
for pattern := range p.settings.Metadata {
for pattern := range plugin.settings.Metadata {
if match := glob.Glob(pattern, local); match {
for k, v := range p.settings.Metadata[pattern] {
for k, v := range plugin.settings.Metadata[pattern] {
metadata[k] = aws.String(v)
}
break
}
}
var AWSErr awserr.Error
head, err := a.client.HeadObject(&s3.HeadObjectInput{
Bucket: aws.String(p.settings.Bucket),
Bucket: aws.String(plugin.settings.Bucket),
Key: aws.String(remote),
})
if err != nil && err.(awserr.Error).Code() != "404" {
if err != nil && errors.As(err, &AWSErr) {
//nolint:errorlint,forcetypeassert
if err.(awserr.Error).Code() == "404" {
return err
}
logrus.Debugf("'%s' not found in bucket, uploading with content-type '%s' and permissions '%s'", local, contentType, acl)
logrus.Debugf(
"'%s' not found in bucket, uploading with content-type '%s' and permissions '%s'",
local,
contentType,
acl,
)
putObject := &s3.PutObjectInput{
Bucket: aws.String(p.settings.Bucket),
Bucket: aws.String(plugin.settings.Bucket),
Key: aws.String(remote),
Body: file,
ContentType: aws.String(contentType),
@ -152,48 +175,58 @@ func (a *AWS) Upload(local, remote string) error {
}
_, err = a.client.PutObject(putObject)
return err
}
//nolint:gosec
hash := md5.New()
_, _ = io.Copy(hash, file)
sum := fmt.Sprintf("'%x'", hash.Sum(nil))
//nolint:nestif
if sum == *head.ETag {
shouldCopy := false
if head.ContentType == nil && contentType != "" {
logrus.Debugf("content-type has changed from unset to %s", contentType)
shouldCopy = true
}
if !shouldCopy && head.ContentType != nil && contentType != *head.ContentType {
logrus.Debugf("content-type has changed from %s to %s", *head.ContentType, contentType)
shouldCopy = true
}
if !shouldCopy && head.ContentEncoding == nil && contentEncoding != "" {
logrus.Debugf("Content-Encoding has changed from unset to %s", contentEncoding)
shouldCopy = true
}
if !shouldCopy && head.ContentEncoding != nil && contentEncoding != *head.ContentEncoding {
logrus.Debugf("Content-Encoding has changed from %s to %s", *head.ContentEncoding, contentEncoding)
shouldCopy = true
}
if !shouldCopy && head.CacheControl == nil && cacheControl != "" {
logrus.Debugf("cache-control has changed from unset to %s", cacheControl)
shouldCopy = true
}
if !shouldCopy && head.CacheControl != nil && cacheControl != *head.CacheControl {
logrus.Debugf("cache-control has changed from %s to %s", *head.CacheControl, cacheControl)
shouldCopy = true
}
if !shouldCopy && len(head.Metadata) != len(metadata) {
logrus.Debugf("count of metadata values has changed for %s", local)
shouldCopy = true
}
@ -202,7 +235,9 @@ func (a *AWS) Upload(local, remote string) error {
if hv, ok := head.Metadata[k]; ok {
if *v != *hv {
logrus.Debugf("metadata values have changed for %s", local)
shouldCopy = true
break
}
}
@ -211,7 +246,7 @@ func (a *AWS) Upload(local, remote string) error {
if !shouldCopy {
grant, err := a.client.GetObjectAcl(&s3.GetObjectAclInput{
Bucket: aws.String(p.settings.Bucket),
Bucket: aws.String(plugin.settings.Bucket),
Key: aws.String(remote),
})
if err != nil {
@ -219,18 +254,20 @@ func (a *AWS) Upload(local, remote string) error {
}
previousACL := "private"
for _, g := range grant.Grants {
gt := *g.Grantee
if gt.URI != nil {
if *gt.URI == "http://acs.amazonaws.com/groups/global/AllUsers" {
if *g.Permission == "READ" {
for _, grant := range grant.Grants {
grantee := *grant.Grantee
if grantee.URI != nil {
if *grantee.URI == "http://acs.amazonaws.com/groups/global/AllUsers" {
if *grant.Permission == "READ" {
previousACL = "public-read"
} else if *g.Permission == "WRITE" {
} else if *grant.Permission == "WRITE" {
previousACL = "public-read-write"
}
}
if *gt.URI == "http://acs.amazonaws.com/groups/global/AuthenticatedUsers" {
if *g.Permission == "READ" {
if *grantee.URI == "http://acs.amazonaws.com/groups/global/AuthenticatedUsers" {
if *grant.Permission == "READ" {
previousACL = "authenticated-read"
}
}
@ -239,20 +276,23 @@ func (a *AWS) Upload(local, remote string) error {
if previousACL != acl {
logrus.Debugf("permissions for '%s' have changed from '%s' to '%s'", remote, previousACL, acl)
shouldCopy = true
}
}
if !shouldCopy {
logrus.Debugf("skipping '%s' because hashes and metadata match", local)
return nil
}
logrus.Debugf("updating metadata for '%s' content-type: '%s', ACL: '%s'", local, contentType, acl)
copyObject := &s3.CopyObjectInput{
Bucket: aws.String(p.settings.Bucket),
Bucket: aws.String(plugin.settings.Bucket),
Key: aws.String(remote),
CopySource: aws.String(fmt.Sprintf("%s/%s", p.settings.Bucket, remote)),
CopySource: aws.String(fmt.Sprintf("%s/%s", plugin.settings.Bucket, remote)),
ACL: aws.String(acl),
ContentType: aws.String(contentType),
Metadata: metadata,
@ -273,6 +313,7 @@ func (a *AWS) Upload(local, remote string) error {
}
_, err = a.client.CopyObject(copyObject)
return err
}
@ -282,8 +323,9 @@ func (a *AWS) Upload(local, remote string) error {
}
logrus.Debugf("uploading '%s' with content-type '%s' and permissions '%s'", local, contentType, acl)
putObject := &s3.PutObjectInput{
Bucket: aws.String(p.settings.Bucket),
Bucket: aws.String(plugin.settings.Bucket),
Key: aws.String(remote),
Body: file,
ContentType: aws.String(contentType),
@ -305,11 +347,13 @@ func (a *AWS) Upload(local, remote string) error {
}
_, err = a.client.PutObject(putObject)
return err
}
func (a *AWS) Redirect(path, location string) error {
p := a.plugin
plugin := a.plugin
logrus.Debugf("adding redirect from '%s' to '%s'", path, location)
if a.plugin.settings.DryRun {
@ -317,16 +361,18 @@ func (a *AWS) Redirect(path, location string) error {
}
_, err := a.client.PutObject(&s3.PutObjectInput{
Bucket: aws.String(p.settings.Bucket),
Bucket: aws.String(plugin.settings.Bucket),
Key: aws.String(path),
ACL: aws.String("public-read"),
WebsiteRedirectLocation: aws.String(location),
})
return err
}
func (a *AWS) Delete(remote string) error {
p := a.plugin
plugin := a.plugin
logrus.Debugf("removing remote file '%s'", remote)
if a.plugin.settings.DryRun {
@ -334,17 +380,20 @@ func (a *AWS) Delete(remote string) error {
}
_, err := a.client.DeleteObject(&s3.DeleteObjectInput{
Bucket: aws.String(p.settings.Bucket),
Bucket: aws.String(plugin.settings.Bucket),
Key: aws.String(remote),
})
return err
}
func (a *AWS) List(path string) ([]string, error) {
p := a.plugin
remote := make([]string, 1)
plugin := a.plugin
remote := make([]string, 0)
resp, err := a.client.ListObjects(&s3.ListObjectsInput{
Bucket: aws.String(p.settings.Bucket),
Bucket: aws.String(plugin.settings.Bucket),
Prefix: aws.String(path),
})
if err != nil {
@ -357,7 +406,7 @@ func (a *AWS) List(path string) ([]string, error) {
for *resp.IsTruncated {
resp, err = a.client.ListObjects(&s3.ListObjectsInput{
Bucket: aws.String(p.settings.Bucket),
Bucket: aws.String(plugin.settings.Bucket),
Prefix: aws.String(path),
Marker: aws.String(remote[len(remote)-1]),
})
@ -376,7 +425,9 @@ func (a *AWS) List(path string) ([]string, error) {
func (a *AWS) Invalidate(invalidatePath string) error {
p := a.plugin
logrus.Debugf("invalidating '%s'", invalidatePath)
_, err := a.cfClient.CreateInvalidation(&cloudfront.CreateInvalidationInput{
DistributionId: aws.String(p.settings.CloudFrontDistribution),
InvalidationBatch: &cloudfront.InvalidationBatch{
@ -389,5 +440,6 @@ func (a *AWS) Invalidate(invalidatePath string) error {
},
},
})
return err
}

View File

@ -44,14 +44,13 @@ type Result struct {
err error
}
var MissingAwsValuesMessage = "Must set 'bucket'"
// Validate handles the settings validation of the plugin.
func (p *Plugin) Validate() error {
wd, err := os.Getwd()
if err != nil {
return fmt.Errorf("error while retrieving working directory: %w", err)
}
p.settings.Source = filepath.Join(wd, p.settings.Source)
p.settings.Target = strings.TrimPrefix(p.settings.Target, "/")
@ -88,7 +87,7 @@ func (p *Plugin) createSyncJobs() error {
return err
}
local := make([]string, 1)
local := make([]string, 0)
err = filepath.Walk(p.settings.Source, func(path string, info os.FileInfo, err error) error {
if err != nil || info.IsDir() {
@ -122,13 +121,16 @@ func (p *Plugin) createSyncJobs() error {
action: "redirect",
})
}
if p.settings.Delete {
for _, r := range remote {
for _, remote := range remote {
found := false
rPath := strings.TrimPrefix(r, p.settings.Target+"/")
remotePath := strings.TrimPrefix(remote, p.settings.Target+"/")
for _, l := range local {
if l == rPath {
if l == remotePath {
found = true
break
}
}
@ -136,7 +138,7 @@ func (p *Plugin) createSyncJobs() error {
if !found {
p.settings.Jobs = append(p.settings.Jobs, Job{
local: "",
remote: r,
remote: remote,
action: "delete",
})
}
@ -150,41 +152,46 @@ func (p *Plugin) runJobs() error {
client := p.settings.Client
jobChan := make(chan struct{}, p.settings.MaxConcurrency)
results := make(chan *Result, len(p.settings.Jobs))
var invalidateJob *Job
logrus.Infof("Synchronizing with bucket '%s'", p.settings.Bucket)
for _, j := range p.settings.Jobs {
for _, job := range p.settings.Jobs {
jobChan <- struct{}{}
go func(j Job) {
go func(job Job) {
var err error
switch j.action {
switch job.action {
case "upload":
err = client.Upload(j.local, j.remote)
err = client.Upload(job.local, job.remote)
case "redirect":
err = client.Redirect(j.local, j.remote)
err = client.Redirect(job.local, job.remote)
case "delete":
err = client.Delete(j.remote)
err = client.Delete(job.remote)
case "invalidateCloudFront":
invalidateJob = &j
invalidateJob = &job
default:
err = nil
}
results <- &Result{j, err}
results <- &Result{job, err}
<-jobChan
}(j)
}(job)
}
for range p.settings.Jobs {
r := <-results
if r.err != nil {
return fmt.Errorf("failed to %s %s to %s: %+v", r.j.action, r.j.local, r.j.remote, r.err)
return fmt.Errorf("failed to %s %s to %s: %w", r.j.action, r.j.local, r.j.remote, r.err)
}
}
if invalidateJob != nil {
err := client.Invalidate(invalidateJob.remote)
if err != nil {
return fmt.Errorf("failed to %s %s to %s: %+v", invalidateJob.action, invalidateJob.local, invalidateJob.remote, err)
return fmt.Errorf("failed to %s %s to %s: %w", invalidateJob.action, invalidateJob.local, invalidateJob.remote, err)
}
}

View File

@ -12,7 +12,7 @@ type Plugin struct {
}
// New initializes a plugin from the given Settings, Pipeline, and Network.
func New(settings Settings, pipeline drone.Pipeline, network drone.Network) drone.Plugin {
func New(settings Settings, pipeline drone.Pipeline, network drone.Network) *Plugin {
return &Plugin{
settings: settings,
pipeline: pipeline,

View File

@ -1,4 +0,0 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["github>thegeeklab/renovate-presets:golang"]
}