From bcde10aca83164578d63b52afb93451bdc844b14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 02:13:20 +0000 Subject: [PATCH 01/21] Bump github.com/essentialkaos/ek/v13 in the all group Bumps the all group with 1 update: [github.com/essentialkaos/ek/v13](https://github.com/essentialkaos/ek). Updates `github.com/essentialkaos/ek/v13` from 13.2.0 to 13.2.1 - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v13.2.0...v13.2.1) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7043e3f..35e203f 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.30.3 github.com/aws/aws-sdk-go-v2/credentials v1.17.27 github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 - github.com/essentialkaos/ek/v13 v13.2.0 + github.com/essentialkaos/ek/v13 v13.2.1 github.com/essentialkaos/katana v0.2.0 github.com/pkg/sftp v1.13.6 golang.org/x/crypto v0.25.0 diff --git a/go.sum b/go.sum index b04bb0d..79b2544 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v13 v13.2.0 h1:Ra6segoyFYjtdz5eh0mQxJMeIso7h61A7IyG9B4R6bI= -github.com/essentialkaos/ek/v13 v13.2.0/go.mod h1:RVf1NpNyK04xkBJ3NTUD1wNLWemY9/naVD4iEVjU2fA= +github.com/essentialkaos/ek/v13 v13.2.1 h1:EPxxVSTo+AZW/8TKbR20W+M5n5/atsc5mGYYWr3hmLM= +github.com/essentialkaos/ek/v13 v13.2.1/go.mod h1:RVf1NpNyK04xkBJ3NTUD1wNLWemY9/naVD4iEVjU2fA= github.com/essentialkaos/katana v0.2.0 h1:LRnKyEHFET9P45L718DI704oUBHcOjW+/bWBstPb9qg= github.com/essentialkaos/katana v0.2.0/go.mod h1:B0IUikFvR6Iutx93iSu3xezHfHvIuIgXJSO6Agujp+0= github.com/essentialkaos/sio v1.0.0 h1:+VZg0Z7+Cx8F/FmlczzTJYM6rq/LhTR45Rsditmu0Ec= From edcb056346d25d75cdf8349fd8f55cfef96322b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 02:38:24 +0000 Subject: [PATCH 02/21] Bump github.com/essentialkaos/ek/v13 in the all group across 1 directory Bumps the all group with 1 update in the / directory: [github.com/essentialkaos/ek/v13](https://github.com/essentialkaos/ek). Updates `github.com/essentialkaos/ek/v13` from 13.2.1 to 13.3.1 - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v13.2.1...v13.3.1) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v13 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 35e203f..f9dfd6c 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.30.3 github.com/aws/aws-sdk-go-v2/credentials v1.17.27 github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 - github.com/essentialkaos/ek/v13 v13.2.1 + github.com/essentialkaos/ek/v13 v13.3.1 github.com/essentialkaos/katana v0.2.0 github.com/pkg/sftp v1.13.6 golang.org/x/crypto v0.25.0 diff --git a/go.sum b/go.sum index 79b2544..060d1fc 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v13 v13.2.1 h1:EPxxVSTo+AZW/8TKbR20W+M5n5/atsc5mGYYWr3hmLM= -github.com/essentialkaos/ek/v13 v13.2.1/go.mod h1:RVf1NpNyK04xkBJ3NTUD1wNLWemY9/naVD4iEVjU2fA= +github.com/essentialkaos/ek/v13 v13.3.1 h1:RcBJrBeEKby4I8386FHYxbVhj3XbJP2SS0uz2AJH+1Q= +github.com/essentialkaos/ek/v13 v13.3.1/go.mod h1:RVf1NpNyK04xkBJ3NTUD1wNLWemY9/naVD4iEVjU2fA= github.com/essentialkaos/katana v0.2.0 h1:LRnKyEHFET9P45L718DI704oUBHcOjW+/bWBstPb9qg= github.com/essentialkaos/katana v0.2.0/go.mod h1:B0IUikFvR6Iutx93iSu3xezHfHvIuIgXJSO6Agujp+0= github.com/essentialkaos/sio v1.0.0 h1:+VZg0Z7+Cx8F/FmlczzTJYM6rq/LhTR45Rsditmu0Ec= From ed4ab539853c999f41b294243c8c0f89c6a26dba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 02:11:36 +0000 Subject: [PATCH 03/21] Bump github.com/aws/aws-sdk-go-v2/service/s3 in the all group Bumps the all group with 1 update: [github.com/aws/aws-sdk-go-v2/service/s3](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/service/s3` from 1.58.2 to 1.58.3 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.58.2...service/s3/v1.58.3) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f9dfd6c..841368f 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/aws/aws-sdk-go-v2 v1.30.3 github.com/aws/aws-sdk-go-v2/credentials v1.17.27 - github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 + github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 github.com/essentialkaos/ek/v13 v13.3.1 github.com/essentialkaos/katana v0.2.0 github.com/pkg/sftp v1.13.6 diff --git a/go.sum b/go.sum index 060d1fc..9280f2d 100644 --- a/go.sum +++ b/go.sum @@ -18,8 +18,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 h1:HGErhhrx github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17/go.mod h1:RkZEx4l0EHYDJpWppMJ3nD9wZJAa8/0lq9aVC+r2UII= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 h1:246A4lSTXWJw/rmlQI+TT2OcqeDMKBdyjEQrafMaQdA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15/go.mod h1:haVfg3761/WF7YPuJOER2MP0k4UAXyHaLclKXB6usDg= -github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 h1:sZXIzO38GZOU+O0C+INqbH7C2yALwfMWpd64tONS/NE= -github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2/go.mod h1:Lcxzg5rojyVPU/0eFwLtcyTaek/6Mtic5B1gJo7e/zE= +github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 h1:hT8ZAZRIfqBqHbzKTII+CIiY8G2oC9OpLedkZ51DWl8= +github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3/go.mod h1:Lcxzg5rojyVPU/0eFwLtcyTaek/6Mtic5B1gJo7e/zE= github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE= github.com/aws/smithy-go v1.20.3/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From d5d5f49a0c81aed9c537e91104a54300df590409 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 02:33:11 +0000 Subject: [PATCH 04/21] Bump the all group across 1 directory with 2 updates Bumps the all group with 1 update in the / directory: [github.com/essentialkaos/ek/v13](https://github.com/essentialkaos/ek). Updates `github.com/essentialkaos/ek/v13` from 13.3.1 to 13.3.2 - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v13.3.1...v13.3.2) Updates `golang.org/x/crypto` from 0.25.0 to 0.26.0 - [Commits](https://github.com/golang/crypto/compare/v0.25.0...v0.26.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 841368f..78cfd2e 100644 --- a/go.mod +++ b/go.mod @@ -6,10 +6,10 @@ require ( github.com/aws/aws-sdk-go-v2 v1.30.3 github.com/aws/aws-sdk-go-v2/credentials v1.17.27 github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 - github.com/essentialkaos/ek/v13 v13.3.1 + github.com/essentialkaos/ek/v13 v13.3.2 github.com/essentialkaos/katana v0.2.0 github.com/pkg/sftp v1.13.6 - golang.org/x/crypto v0.25.0 + golang.org/x/crypto v0.26.0 ) require ( @@ -25,5 +25,5 @@ require ( github.com/essentialkaos/depsy v1.3.0 // indirect github.com/essentialkaos/sio v1.0.0 // indirect github.com/kr/fs v0.1.0 // indirect - golang.org/x/sys v0.22.0 // indirect + golang.org/x/sys v0.24.0 // indirect ) diff --git a/go.sum b/go.sum index 9280f2d..5256399 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v13 v13.3.1 h1:RcBJrBeEKby4I8386FHYxbVhj3XbJP2SS0uz2AJH+1Q= -github.com/essentialkaos/ek/v13 v13.3.1/go.mod h1:RVf1NpNyK04xkBJ3NTUD1wNLWemY9/naVD4iEVjU2fA= +github.com/essentialkaos/ek/v13 v13.3.2 h1:Dl2o8a2tQbMFkkLRXRK1Piuuk/gjLRIXXC2r4ORQYSA= +github.com/essentialkaos/ek/v13 v13.3.2/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM= github.com/essentialkaos/katana v0.2.0 h1:LRnKyEHFET9P45L718DI704oUBHcOjW+/bWBstPb9qg= github.com/essentialkaos/katana v0.2.0/go.mod h1:B0IUikFvR6Iutx93iSu3xezHfHvIuIgXJSO6Agujp+0= github.com/essentialkaos/sio v1.0.0 h1:+VZg0Z7+Cx8F/FmlczzTJYM6rq/LhTR45Rsditmu0Ec= @@ -52,8 +52,8 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= -golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= -golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -67,12 +67,12 @@ 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-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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= -golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= From b7734e29e35d783f4e55e202c821bc33405ea0c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 03:03:30 +0000 Subject: [PATCH 05/21] Bump github.com/essentialkaos/ek/v13 in the all group Bumps the all group with 1 update: [github.com/essentialkaos/ek/v13](https://github.com/essentialkaos/ek). Updates `github.com/essentialkaos/ek/v13` from 13.3.2 to 13.3.3 - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v13.3.2...v13.3.3) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 78cfd2e..677a262 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.30.3 github.com/aws/aws-sdk-go-v2/credentials v1.17.27 github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 - github.com/essentialkaos/ek/v13 v13.3.2 + github.com/essentialkaos/ek/v13 v13.3.3 github.com/essentialkaos/katana v0.2.0 github.com/pkg/sftp v1.13.6 golang.org/x/crypto v0.26.0 diff --git a/go.sum b/go.sum index 5256399..b224dbb 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v13 v13.3.2 h1:Dl2o8a2tQbMFkkLRXRK1Piuuk/gjLRIXXC2r4ORQYSA= -github.com/essentialkaos/ek/v13 v13.3.2/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM= +github.com/essentialkaos/ek/v13 v13.3.3 h1:5I53QQnyG8hjVOlh5q8F3bNwrtN02wiPpoSocTU6JHA= +github.com/essentialkaos/ek/v13 v13.3.3/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM= github.com/essentialkaos/katana v0.2.0 h1:LRnKyEHFET9P45L718DI704oUBHcOjW+/bWBstPb9qg= github.com/essentialkaos/katana v0.2.0/go.mod h1:B0IUikFvR6Iutx93iSu3xezHfHvIuIgXJSO6Agujp+0= github.com/essentialkaos/sio v1.0.0 h1:+VZg0Z7+Cx8F/FmlczzTJYM6rq/LhTR45Rsditmu0Ec= From 4e752a9cf00159e02401e8c78acdad0940a97df3 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 13 Aug 2024 14:00:31 +0300 Subject: [PATCH 06/21] Improve Dependabot configuration --- .github/dependabot.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d0ad1de..1141609 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,8 +6,8 @@ updates: target-branch: "develop" schedule: interval: "daily" - timezone: "Europe/London" - time: "03:00" + timezone: "Etc/UTC" + time: "07:00" labels: - "PR • MAINTENANCE" assignees: @@ -26,8 +26,8 @@ updates: target-branch: "develop" schedule: interval: "daily" - timezone: "Europe/London" - time: "04:00" + timezone: "Etc/UTC" + time: "08:00" labels: - "PR • MAINTENANCE" assignees: From 9d69c23315f136ab2f35bb02c33eeef1ebf3c09b Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 13 Aug 2024 14:05:01 +0300 Subject: [PATCH 07/21] Regenerate Makefile with the latest version of gomakegen --- Makefile | 4 ++-- go.mod | 2 +- go.sum | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 02c3bad..1e69618 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ################################################################################ -# This Makefile generated by GoMakeGen 3.0.5 using next command: +# This Makefile generated by GoMakeGen 3.0.6 using next command: # gomakegen --mod . # # More info: https://kaos.sh/gomakegen @@ -109,6 +109,6 @@ help: ## Show this info | sed 's/ifdef //' \ | awk 'BEGIN {FS = " .*?## "}; {printf " \033[32m%-11s\033[0m %s\n", $$1, $$2}' @echo -e '' - @echo -e '\033[90mGenerated by GoMakeGen 3.0.5\033[0m\n' + @echo -e '\033[90mGenerated by GoMakeGen 3.0.6\033[0m\n' ################################################################################ diff --git a/go.mod b/go.mod index 677a262..7056108 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/essentialkaos/atlassian-cloud-backuper -go 1.19 +go 1.21 require ( github.com/aws/aws-sdk-go-v2 v1.30.3 diff --git a/go.sum b/go.sum index b224dbb..33a8119 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,7 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= +github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= github.com/essentialkaos/ek/v13 v13.3.3 h1:5I53QQnyG8hjVOlh5q8F3bNwrtN02wiPpoSocTU6JHA= @@ -37,12 +38,15 @@ github.com/essentialkaos/sio v1.0.0/go.mod h1:lKaW6IPMJ8GAEAiXe175zcEld370u3Nr54 github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/pkg/sftp v1.13.6 h1:JFZT4XbOU7l77xGSpOdW+pwIMqP044IyjXX6FGyEKFo= github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -73,6 +77,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn 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= golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= From 529b6d094b50ffb18c2ba95e373ab1c64daf8300 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 13 Aug 2024 14:41:48 +0300 Subject: [PATCH 08/21] Add option and query param to force backup creation --- .github/images/usage-container.svg | 85 +++++++++++----------- .github/images/usage.svg | 15 ++-- app/app.go | 4 +- app/basic.go | 2 +- app/server.go | 3 +- backuper/backuper.go | 4 +- backuper/confluence/confluence-backuper.go | 14 ++-- backuper/jira/jira-backuper.go | 21 ++++-- 8 files changed, 81 insertions(+), 67 deletions(-) diff --git a/.github/images/usage-container.svg b/.github/images/usage-container.svg index 506b518..f0f8b9f 100644 --- a/.github/images/usage-container.svg +++ b/.github/images/usage-container.svg @@ -1,5 +1,5 @@ - - + + Atlassian Cloud Backuper Usage @@ -68,7 +68,7 @@ } - + @@ -83,44 +83,45 @@ --config, -c file ........................ Path to configuration file --interactive, -I ........................ Interactive mode --server, -S ............................. Server mode - --no-color, -nc .......................... Disable colors in output - --help, -h ............................... Show this help message - --version, -v ............................ Show version - --access-account name .................... Account name (ACCESS_ACCOUNT) - --access-email email ..................... User email with access to API (ACCESS_EMAIL) - --access-api-key key ..................... API key (ACCESS_API_KEY) - --server-ip ip ........................... HTTP server IP (SERVER_IP) - --server-port port ....................... HTTP server port (SERVER_PORT) - --server-access-token token .............. HTTP access token (SERVER_ACCESS_TOKEN) - --storage-type fs/sftp/s3 ................ Storage type (STORAGE_TYPE) - --storage-encryption-key key ............. Data encryption key (STORAGE_ENCRYPTION_KEY) - --storage-fs-path path ................... Path on system for backups (STORAGE_FS_PATH) - --storage-fs-mode mode ................... File mode on system (STORAGE_FS_MODE) - --storage-sftp-host host ................. SFTP host (STORAGE_SFTP_HOST) - --storage-sftp-user name ................. SFTP user name (STORAGE_SFTP_USER) - --storage-sftp-key key ................... Base64-encoded private key (STORAGE_SFTP_KEY) - --storage-sftp-path path ................. Path on SFTP (STORAGE_SFTP_PATH) - --storage-sftp-mode mode ................. File mode on SFTP (STORAGE_SFTP_MODE) - --storage-s3-host host ................... S3 host (STORAGE_S3_HOST) - --storage-s3-region region ............... S3 region (STORAGE_S3_REGION) - --storage-s3-access-key id ............... S3 access key ID (STORAGE_S3_ACCESS_KEY) - --storage-s3-secret-key key .............. S3 access secret key (STORAGE_S3_SECRET_KEY) - --storage-s3-bucket name ................. S3 bucket (STORAGE_S3_BUCKET) - --storage-s3-path path ................... Path for backups (STORAGE_S3_PATH) - --jira-output-file template .............. Jira backup output file name template - (JIRA_OUTPUT_FILE) - --jira-include-attachments yes/no ........ Include attachments to Jira backup - (JIRA_INCLUDE_ATTACHMENTS) - --jira-cloud-format yes/no ............... Create Jira backup for Cloud (JIRA_CLOUD_FORMAT) - --confluence-output-file template ........ Confluence backup output file name template - (CONFLUENCE_OUTPUT_FILE) - --confluence-include-attachments yes/no .. Include attachments to Confluence backup - (CONFLUENCE_INCLUDE_ATTACHMENTS) - --confluence-cloud-format yes/no ......... Create Confluence backup for Cloud - (CONFLUENCE_CLOUD_FORMAT) - --temp-dir path .......................... Path to directory for temporary data (TEMP_DIR) - --log-format text/json ................... Log format (LOG_FORMAT) - --log-level level ........................ Log level (LOG_LEVEL) + --force, -F .............................. Force backup generation + --no-color, -nc .......................... Disable colors in output + --help, -h ............................... Show this help message + --version, -v ............................ Show version + --access-account name .................... Account name (ACCESS_ACCOUNT) + --access-email email ..................... User email with access to API (ACCESS_EMAIL) + --access-api-key key ..................... API key (ACCESS_API_KEY) + --server-ip ip ........................... HTTP server IP (SERVER_IP) + --server-port port ....................... HTTP server port (SERVER_PORT) + --server-access-token token .............. HTTP access token (SERVER_ACCESS_TOKEN) + --storage-type fs/sftp/s3 ................ Storage type (STORAGE_TYPE) + --storage-encryption-key key ............. Data encryption key (STORAGE_ENCRYPTION_KEY) + --storage-fs-path path ................... Path on system for backups (STORAGE_FS_PATH) + --storage-fs-mode mode ................... File mode on system (STORAGE_FS_MODE) + --storage-sftp-host host ................. SFTP host (STORAGE_SFTP_HOST) + --storage-sftp-user name ................. SFTP user name (STORAGE_SFTP_USER) + --storage-sftp-key key ................... Base64-encoded private key (STORAGE_SFTP_KEY) + --storage-sftp-path path ................. Path on SFTP (STORAGE_SFTP_PATH) + --storage-sftp-mode mode ................. File mode on SFTP (STORAGE_SFTP_MODE) + --storage-s3-host host ................... S3 host (STORAGE_S3_HOST) + --storage-s3-region region ............... S3 region (STORAGE_S3_REGION) + --storage-s3-access-key id ............... S3 access key ID (STORAGE_S3_ACCESS_KEY) + --storage-s3-secret-key key .............. S3 access secret key (STORAGE_S3_SECRET_KEY) + --storage-s3-bucket name ................. S3 bucket (STORAGE_S3_BUCKET) + --storage-s3-path path ................... Path for backups (STORAGE_S3_PATH) + --jira-output-file template .............. Jira backup output file name template + (JIRA_OUTPUT_FILE) + --jira-include-attachments yes/no ........ Include attachments to Jira backup + (JIRA_INCLUDE_ATTACHMENTS) + --jira-cloud-format yes/no ............... Create Jira backup for Cloud (JIRA_CLOUD_FORMAT) + --confluence-output-file template ........ Confluence backup output file name template + (CONFLUENCE_OUTPUT_FILE) + --confluence-include-attachments yes/no .. Include attachments to Confluence backup + (CONFLUENCE_INCLUDE_ATTACHMENTS) + --confluence-cloud-format yes/no ......... Create Confluence backup for Cloud + (CONFLUENCE_CLOUD_FORMAT) + --temp-dir path .......................... Path to directory for temporary data (TEMP_DIR) + --log-format text/json ................... Log format (LOG_FORMAT) + --log-level level ........................ Log level (LOG_LEVEL) - + diff --git a/.github/images/usage.svg b/.github/images/usage.svg index 6512674..21c2566 100644 --- a/.github/images/usage.svg +++ b/.github/images/usage.svg @@ -1,5 +1,5 @@ - - + + Atlassian Cloud Backuper Usage @@ -68,7 +68,7 @@ } - + @@ -83,9 +83,10 @@ --config, -c file .. Path to configuration file --interactive, -I .. Interactive mode --server, -S ....... Server mode - --no-color, -nc .... Disable colors in output - --help, -h ......... Show this help message - --version, -v ...... Show version + --force, -F ........ Force backup generation + --no-color, -nc .... Disable colors in output + --help, -h ......... Show this help message + --version, -v ...... Show version - + diff --git a/app/app.go b/app/app.go index e95231c..101178f 100644 --- a/app/app.go +++ b/app/app.go @@ -42,7 +42,7 @@ import ( // Basic utility info const ( APP = "Atlassian Cloud Backuper" - VER = "0.1.0" + VER = "0.2.0" DESC = "Tool for backuping Atlassian cloud services (Jira and Confluence)" ) @@ -53,6 +53,7 @@ const ( OPT_CONFIG = "c:config" OPT_INTERACTIVE = "I:interactive" OPT_SERVER = "S:server" + OPT_FORCE = "F:force" OPT_NO_COLOR = "nc:no-color" OPT_HELP = "h:help" OPT_VER = "v:version" @@ -498,6 +499,7 @@ func genUsage(section string) *usage.Info { info.AddOption(OPT_CONFIG, "Path to configuration file", "file") info.AddOption(OPT_INTERACTIVE, "Interactive mode") info.AddOption(OPT_SERVER, "Server mode") + info.AddOption(OPT_FORCE, "Force backup generation") info.AddOption(OPT_NO_COLOR, "Disable colors in output") info.AddOption(OPT_HELP, "Show this help message") info.AddOption(OPT_VER, "Show version") diff --git a/app/basic.go b/app/basic.go index 876078b..9d15704 100644 --- a/app/basic.go +++ b/app/basic.go @@ -73,7 +73,7 @@ func startApp(args options.Arguments) error { tmpFile := path.Join(tmpDir, outputFileName) - err = bkpr.Backup(tmpFile) + err = bkpr.Backup(tmpFile, options.GetB(OPT_FORCE)) if err != nil { spinner.Done(false) diff --git a/app/server.go b/app/server.go index 8d25121..194816d 100644 --- a/app/server.go +++ b/app/server.go @@ -58,6 +58,7 @@ func createBackupHandler(rw http.ResponseWriter, r *http.Request) { target := strings.ToLower(r.URL.Query().Get("target")) token := r.URL.Query().Get("token") + force := r.URL.Query().Get("force") != "" err := validateRequestQuery(target, token) @@ -75,7 +76,7 @@ func createBackupHandler(rw http.ResponseWriter, r *http.Request) { return } - taskID, err := bkpr.Start() + taskID, err := bkpr.Start(force) if err != nil { log.Error("Can't create backup: %v", err) diff --git a/backuper/backuper.go b/backuper/backuper.go index a7f8821..0d34413 100644 --- a/backuper/backuper.go +++ b/backuper/backuper.go @@ -28,13 +28,13 @@ const ( // Backuper is generic backuper interface type Backuper interface { // Backup runs backup process - Backup(outputFile string) error + Backup(outputFile string, force bool) error // SetDispatcher sets events dispatcher SetDispatcher(d *events.Dispatcher) // Start creates task for backuping data - Start() (string, error) + Start(force bool) (string, error) // Progress monitors backup creation progress Progress(taskID string) (string, error) diff --git a/backuper/confluence/confluence-backuper.go b/backuper/confluence/confluence-backuper.go index e445c70..5888205 100644 --- a/backuper/confluence/confluence-backuper.go +++ b/backuper/confluence/confluence-backuper.go @@ -74,8 +74,8 @@ func (b *ConfluenceBackuper) SetDispatcher(d *events.Dispatcher) { } // Backup starts backup process -func (b *ConfluenceBackuper) Backup(outputFile string) error { - _, err := b.Start() +func (b *ConfluenceBackuper) Backup(outputFile string, force bool) error { + _, err := b.Start(force) if err != nil { return err @@ -91,13 +91,13 @@ func (b *ConfluenceBackuper) Backup(outputFile string) error { } // Start creates task for backuping data -func (b *ConfluenceBackuper) Start() (string, error) { +func (b *ConfluenceBackuper) Start(force bool) (string, error) { log.Info("Starting Confluence backup process for account %s…", b.config.Account) log.Info("Checking for existing backup task…") info, _ := b.getBackupProgress() - if info != nil && !info.IsOutdated { + if !force && info != nil && !info.IsOutdated { log.Info( "Found previously created backup task", log.F{"backup-status", info.CurrentStatus}, @@ -107,7 +107,11 @@ func (b *ConfluenceBackuper) Start() (string, error) { log.F{"backup-outdated", info.IsOutdated}, ) } else { - log.Info("No previously created backup task or task is outdated, starting new backup…") + if force { + log.Info("Starting new backup…") + } else { + log.Info("No previously created backup task or task is outdated, starting new backup…") + } err := b.startBackup() diff --git a/backuper/jira/jira-backuper.go b/backuper/jira/jira-backuper.go index a189d56..fc5b765 100644 --- a/backuper/jira/jira-backuper.go +++ b/backuper/jira/jira-backuper.go @@ -75,8 +75,8 @@ func (b *JiraBackuper) SetDispatcher(d *events.Dispatcher) { } // Backup starts backup process -func (b *JiraBackuper) Backup(outputFile string) error { - backupTaskID, err := b.Start() +func (b *JiraBackuper) Backup(outputFile string, force bool) error { + backupTaskID, err := b.Start(force) if err != nil { return err @@ -92,20 +92,25 @@ func (b *JiraBackuper) Backup(outputFile string) error { } // Start creates task for backuping data -func (b *JiraBackuper) Start() (string, error) { +func (b *JiraBackuper) Start(force bool) (string, error) { var err error var backupTaskID string log.Info("Starting Jira backup process for account %s…", b.config.Account) - log.Info("Checking for existing backup task…") - backupTaskID, _ = b.getLastTaskID() + if !force { + log.Info("Checking for existing backup task…") - if backupTaskID != "" { - log.Info("Found previously created backup task with ID %s", backupTaskID) + backupTaskID, _ = b.getLastTaskID() + + if backupTaskID == "" { + log.Info("No previously created task found, starting new backup…") + } } else { - log.Info("No previously created task found, starting new backup…") + log.Info("Starting new backup…") + } + if backupTaskID == "" { backupTaskID, err = b.startBackup() if err != nil { From 8dad6d8c3b7f8910aed84caf67c5547b94729c27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 02:32:52 +0000 Subject: [PATCH 09/21] Bump github.com/essentialkaos/ek/v13 in the all group Bumps the all group with 1 update: [github.com/essentialkaos/ek/v13](https://github.com/essentialkaos/ek). Updates `github.com/essentialkaos/ek/v13` from 13.3.3 to 13.3.5 - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v13.3.3...v13.3.5) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7056108..0dd4312 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.30.3 github.com/aws/aws-sdk-go-v2/credentials v1.17.27 github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 - github.com/essentialkaos/ek/v13 v13.3.3 + github.com/essentialkaos/ek/v13 v13.3.5 github.com/essentialkaos/katana v0.2.0 github.com/pkg/sftp v1.13.6 golang.org/x/crypto v0.26.0 diff --git a/go.sum b/go.sum index 33a8119..027663a 100644 --- a/go.sum +++ b/go.sum @@ -29,8 +29,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v13 v13.3.3 h1:5I53QQnyG8hjVOlh5q8F3bNwrtN02wiPpoSocTU6JHA= -github.com/essentialkaos/ek/v13 v13.3.3/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM= +github.com/essentialkaos/ek/v13 v13.3.5 h1:k/lfDIpgE+8dOc+eF37m1hOi8eEMHYYTEzD5KHH3xxU= +github.com/essentialkaos/ek/v13 v13.3.5/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM= github.com/essentialkaos/katana v0.2.0 h1:LRnKyEHFET9P45L718DI704oUBHcOjW+/bWBstPb9qg= github.com/essentialkaos/katana v0.2.0/go.mod h1:B0IUikFvR6Iutx93iSu3xezHfHvIuIgXJSO6Agujp+0= github.com/essentialkaos/sio v1.0.0 h1:+VZg0Z7+Cx8F/FmlczzTJYM6rq/LhTR45Rsditmu0Ec= From cab7055dc9d1bbac68f444cd6b79dcdd7541773a Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 20 Aug 2024 23:07:23 +0300 Subject: [PATCH 10/21] Add multipart uploading to S3 storage --- .github/images/usage-container.svg | 40 +++++------ app/app.go | 11 +++- app/common.go | 8 ++- common/atlassian-cloud-backuper-container.knf | 6 ++ common/atlassian-cloud-backuper.knf | 6 ++ common/atlassian-cloud-backuper.spec | 3 +- go.mod | 27 ++++---- go.sum | 66 +++++++++++-------- uploader/fs/fs.go | 2 +- uploader/s3/s3.go | 13 +++- uploader/sftp/sftp.go | 2 +- 11 files changed, 117 insertions(+), 67 deletions(-) diff --git a/.github/images/usage-container.svg b/.github/images/usage-container.svg index f0f8b9f..249e93f 100644 --- a/.github/images/usage-container.svg +++ b/.github/images/usage-container.svg @@ -1,5 +1,5 @@ - + Atlassian Cloud Backuper Usage @@ -68,9 +68,9 @@ } - - - + + + @@ -108,20 +108,22 @@ --storage-s3-secret-key key .............. S3 access secret key (STORAGE_S3_SECRET_KEY) --storage-s3-bucket name ................. S3 bucket (STORAGE_S3_BUCKET) --storage-s3-path path ................... Path for backups (STORAGE_S3_PATH) - --jira-output-file template .............. Jira backup output file name template - (JIRA_OUTPUT_FILE) - --jira-include-attachments yes/no ........ Include attachments to Jira backup - (JIRA_INCLUDE_ATTACHMENTS) - --jira-cloud-format yes/no ............... Create Jira backup for Cloud (JIRA_CLOUD_FORMAT) - --confluence-output-file template ........ Confluence backup output file name template - (CONFLUENCE_OUTPUT_FILE) - --confluence-include-attachments yes/no .. Include attachments to Confluence backup - (CONFLUENCE_INCLUDE_ATTACHMENTS) - --confluence-cloud-format yes/no ......... Create Confluence backup for Cloud - (CONFLUENCE_CLOUD_FORMAT) - --temp-dir path .......................... Path to directory for temporary data (TEMP_DIR) - --log-format text/json ................... Log format (LOG_FORMAT) - --log-level level ........................ Log level (LOG_LEVEL) + --storage-s3-threads num ................. Uploading threads (STORAGE_S3_THREADS) + --storage-s3-part-size num ............... Uploading part size (in MB) (STORAGE_S3_PART_SIZE) + --jira-output-file template .............. Jira backup output file name template + (JIRA_OUTPUT_FILE) + --jira-include-attachments yes/no ........ Include attachments to Jira backup + (JIRA_INCLUDE_ATTACHMENTS) + --jira-cloud-format yes/no ............... Create Jira backup for Cloud (JIRA_CLOUD_FORMAT) + --confluence-output-file template ........ Confluence backup output file name template + (CONFLUENCE_OUTPUT_FILE) + --confluence-include-attachments yes/no .. Include attachments to Confluence backup + (CONFLUENCE_INCLUDE_ATTACHMENTS) + --confluence-cloud-format yes/no ......... Create Confluence backup for Cloud + (CONFLUENCE_CLOUD_FORMAT) + --temp-dir path .......................... Path to directory for temporary data (TEMP_DIR) + --log-format text/json ................... Log format (LOG_FORMAT) + --log-level level ........................ Log level (LOG_LEVEL) - + diff --git a/app/app.go b/app/app.go index 101178f..78bd969 100644 --- a/app/app.go +++ b/app/app.go @@ -85,6 +85,8 @@ const ( STORAGE_S3_SECRET_KEY = "storage-s3:secret-key" STORAGE_S3_BUCKET = "storage-s3:bucket" STORAGE_S3_PATH = "storage-s3:path" + STORAGE_S3_THREADS = "storage-s3:threads" + STORAGE_S3_PART_SIZE = "storage-s3:part-size" JIRA_OUTPUT_FILE = "jira:output-file" JIRA_INCLUDE_ATTACHMENTS = "jira:include-attachments" JIRA_CLOUD_FORMAT = "jira:cloud-format" @@ -250,7 +252,7 @@ func addExtraOptions(m options.Map) { STORAGE_SFTP_HOST, STORAGE_SFTP_USER, STORAGE_SFTP_KEY, STORAGE_SFTP_PATH, STORAGE_SFTP_MODE, STORAGE_S3_HOST, STORAGE_S3_ACCESS_KEY, STORAGE_S3_SECRET_KEY, - STORAGE_S3_BUCKET, STORAGE_S3_PATH, + STORAGE_S3_BUCKET, STORAGE_S3_PATH, STORAGE_S3_PART_SIZE, STORAGE_S3_THREADS, JIRA_OUTPUT_FILE, JIRA_INCLUDE_ATTACHMENTS, JIRA_CLOUD_FORMAT, CONFLUENCE_OUTPUT_FILE, CONFLUENCE_INCLUDE_ATTACHMENTS, CONFLUENCE_CLOUD_FORMAT, TEMP_DIR, @@ -286,6 +288,7 @@ func loadConfig() error { STORAGE_SFTP_PATH, STORAGE_SFTP_MODE, STORAGE_S3_HOST, STORAGE_S3_REGION, STORAGE_S3_ACCESS_KEY, STORAGE_S3_SECRET_KEY, STORAGE_S3_BUCKET, STORAGE_S3_PATH, + STORAGE_S3_PART_SIZE, STORAGE_S3_THREADS, JIRA_OUTPUT_FILE, JIRA_INCLUDE_ATTACHMENTS, JIRA_CLOUD_FORMAT, CONFLUENCE_OUTPUT_FILE, CONFLUENCE_INCLUDE_ATTACHMENTS, CONFLUENCE_CLOUD_FORMAT, TEMP_DIR, @@ -335,6 +338,10 @@ func validateConfig() error { &knf.Validator{STORAGE_S3_ACCESS_KEY, knfv.Set, nil}, &knf.Validator{STORAGE_S3_SECRET_KEY, knfv.Set, nil}, &knf.Validator{STORAGE_S3_BUCKET, knfv.Set, nil}, + &knf.Validator{STORAGE_S3_PART_SIZE, knfv.Greater, 5}, + &knf.Validator{STORAGE_S3_PART_SIZE, knfv.Less, 5_000}, + &knf.Validator{STORAGE_S3_THREADS, knfv.Greater, 1}, + &knf.Validator{STORAGE_S3_THREADS, knfv.Less, 96}, ) } @@ -526,6 +533,8 @@ func genUsage(section string) *usage.Info { addUnitedOption(info, STORAGE_S3_SECRET_KEY, "S3 access secret key", "key") addUnitedOption(info, STORAGE_S3_BUCKET, "S3 bucket", "name") addUnitedOption(info, STORAGE_S3_PATH, "Path for backups", "path") + addUnitedOption(info, STORAGE_S3_THREADS, "Uploading threads", "num") + addUnitedOption(info, STORAGE_S3_PART_SIZE, "Uploading part size (in MB)", "num") addUnitedOption(info, JIRA_OUTPUT_FILE, "Jira backup output file name template", "template") addUnitedOption(info, JIRA_INCLUDE_ATTACHMENTS, "Include attachments to Jira backup", "yes/no") addUnitedOption(info, JIRA_CLOUD_FORMAT, "Create Jira backup for Cloud", "yes/no") diff --git a/app/common.go b/app/common.go index 4fe873a..0d461e7 100644 --- a/app/common.go +++ b/app/common.go @@ -104,9 +104,9 @@ func getUploader(target string) (uploader.Uploader, error) { switch strings.ToLower(knfu.GetS(STORAGE_TYPE)) { case STORAGE_FS: return fs.NewUploader(&fs.Config{ + Secret: secret, Path: path.Join(knfu.GetS(STORAGE_FS_PATH), target), Mode: knfu.GetM(STORAGE_FS_MODE, 0600), - Secret: secret, }) case STORAGE_SFTP: @@ -117,23 +117,25 @@ func getUploader(target string) (uploader.Uploader, error) { } return sftp.NewUploader(&sftp.Config{ + Secret: secret, Host: knfu.GetS(STORAGE_SFTP_HOST), User: knfu.GetS(STORAGE_SFTP_USER), Key: keyData, Path: path.Join(knfu.GetS(STORAGE_SFTP_PATH), target), Mode: knfu.GetM(STORAGE_SFTP_MODE, 0600), - Secret: secret, }) case STORAGE_S3: return s3.NewUploader(&s3.Config{ + Secret: secret, Host: knfu.GetS(STORAGE_S3_HOST), Region: knfu.GetS(STORAGE_S3_REGION), AccessKeyID: knfu.GetS(STORAGE_S3_ACCESS_KEY), SecretKey: knfu.GetS(STORAGE_S3_SECRET_KEY), Bucket: knfu.GetS(STORAGE_S3_BUCKET), Path: path.Join(knfu.GetS(STORAGE_S3_PATH), target), - Secret: secret, + Threads: knfu.GetI(STORAGE_S3_THREADS, 3), + PartSize: knfu.GetI64(STORAGE_S3_PART_SIZE, 32), }) } diff --git a/common/atlassian-cloud-backuper-container.knf b/common/atlassian-cloud-backuper-container.knf index ea8d82f..17448ac 100644 --- a/common/atlassian-cloud-backuper-container.knf +++ b/common/atlassian-cloud-backuper-container.knf @@ -73,6 +73,12 @@ # Path to directory with backups path: + # Uploading threads (default: 3) + threads: 3 + + # Part size in MB (default: 32) + part-size: 32 + [jira] # Backup file name with date tags (default: jira-backup-%Y-%m-%d.zip) diff --git a/common/atlassian-cloud-backuper.knf b/common/atlassian-cloud-backuper.knf index fa40a4a..abf37c0 100644 --- a/common/atlassian-cloud-backuper.knf +++ b/common/atlassian-cloud-backuper.knf @@ -73,6 +73,12 @@ # Path to directory with backups path: + # Uploading threads (default: 3) + threads: 3 + + # Part size in MB (default: 32) + part-size: 32 + [jira] # Backup file name with date tags (default: jira-backup-%Y-%m-%d.zip) diff --git a/common/atlassian-cloud-backuper.spec b/common/atlassian-cloud-backuper.spec index b2bef66..b933e20 100644 --- a/common/atlassian-cloud-backuper.spec +++ b/common/atlassian-cloud-backuper.spec @@ -10,7 +10,7 @@ Summary: Tool for backuping Atlassian cloud services Name: atlassian-cloud-backuper -Version: 0.1.0 +Version: 0.2.0 Release: 0%{?dist} Group: Applications/System License: Apache License, Version 2.0 @@ -115,6 +115,7 @@ rm -rf %{buildroot} %changelog * Tue Jul 23 2024 Anton Novojilov - 0.1.0-0 - Added data encryption feature +- Added multipart uploading to S3 storage - Added server mode - Code refactoring - Dependencies update diff --git a/go.mod b/go.mod index 7056108..16a3a87 100644 --- a/go.mod +++ b/go.mod @@ -3,25 +3,26 @@ module github.com/essentialkaos/atlassian-cloud-backuper go 1.21 require ( - github.com/aws/aws-sdk-go-v2 v1.30.3 - github.com/aws/aws-sdk-go-v2/credentials v1.17.27 - github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 - github.com/essentialkaos/ek/v13 v13.3.3 + github.com/aws/aws-sdk-go-v2 v1.30.4 + github.com/aws/aws-sdk-go-v2/credentials v1.17.28 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.11 + github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 + github.com/essentialkaos/ek/v13 v13.3.5 github.com/essentialkaos/katana v0.2.0 github.com/pkg/sftp v1.13.6 golang.org/x/crypto v0.26.0 ) require ( - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 // indirect - github.com/aws/smithy-go v1.20.3 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect + github.com/aws/smithy-go v1.20.4 // indirect github.com/essentialkaos/depsy v1.3.0 // indirect github.com/essentialkaos/sio v1.0.0 // indirect github.com/kr/fs v0.1.0 // indirect diff --git a/go.sum b/go.sum index 33a8119..b61aac7 100644 --- a/go.sum +++ b/go.sum @@ -1,27 +1,41 @@ -github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP8dY= -github.com/aws/aws-sdk-go-v2 v1.30.3/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3/go.mod h1:UbnqO+zjqk3uIt9yCACHJ9IVNhyhOCnYk8yA19SAWrM= -github.com/aws/aws-sdk-go-v2/credentials v1.17.27 h1:2raNba6gr2IfA0eqqiP2XiQ0UVOpGPgDSi0I9iAP+UI= -github.com/aws/aws-sdk-go-v2/credentials v1.17.27/go.mod h1:gniiwbGahQByxan6YjQUMcW4Aov6bLC3m+evgcoN4r4= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 h1:SoNJ4RlFEQEbtDcCEt+QG56MY4fm4W8rYirAmq+/DdU= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15/go.mod h1:U9ke74k1n2bf+RIgoX1SXFed1HLs51OgUSs+Ph0KJP8= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 h1:C6WHdGnTDIYETAm5iErQUiVNsclNx9qbJVPIt03B6bI= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15/go.mod h1:ZQLZqhcu+JhSrA9/NXRm8SkDvsycE+JkV3WGY41e+IM= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 h1:Z5r7SycxmSllHYmaAZPpmN8GviDrSGhMS6bldqtXZPw= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15/go.mod h1:CetW7bDE00QoGEmPUoZuRog07SGVAUVW6LFpNP0YfIg= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 h1:dT3MqvGhSoaIhRseqw2I0yH81l7wiR2vjs57O51EAm8= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3/go.mod h1:GlAeCkHwugxdHaueRr4nhPuY+WW+gR8UjlcqzPr1SPI= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 h1:YPYe6ZmvUfDDDELqEKtAd6bo8zxhkm+XEFEzQisqUIE= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17/go.mod h1:oBtcnYua/CgzCWYN7NZ5j7PotFDaFSUjCYVTtfyn7vw= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 h1:HGErhhrxZlQ044RiM+WdoZxp0p+EGM62y3L6pwA4olE= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17/go.mod h1:RkZEx4l0EHYDJpWppMJ3nD9wZJAa8/0lq9aVC+r2UII= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 h1:246A4lSTXWJw/rmlQI+TT2OcqeDMKBdyjEQrafMaQdA= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15/go.mod h1:haVfg3761/WF7YPuJOER2MP0k4UAXyHaLclKXB6usDg= -github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 h1:hT8ZAZRIfqBqHbzKTII+CIiY8G2oC9OpLedkZ51DWl8= -github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3/go.mod h1:Lcxzg5rojyVPU/0eFwLtcyTaek/6Mtic5B1gJo7e/zE= -github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE= -github.com/aws/smithy-go v1.20.3/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= +github.com/aws/aws-sdk-go-v2 v1.30.4 h1:frhcagrVNrzmT95RJImMHgabt99vkXGslubDaDagTk8= +github.com/aws/aws-sdk-go-v2 v1.30.4/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5LThwgXdSQorVr91L127ttckI9QQU= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4/go.mod h1:/MQxMqci8tlqDH+pjmoLu1i0tbWCUP1hhyMRuFxpQCw= +github.com/aws/aws-sdk-go-v2/config v1.27.28 h1:OTxWGW/91C61QlneCtnD62NLb4W616/NM1jA8LhJqbg= +github.com/aws/aws-sdk-go-v2/config v1.27.28/go.mod h1:uzVRVtJSU5EFv6Fu82AoVFKozJi2ZCY6WRCXj06rbvs= +github.com/aws/aws-sdk-go-v2/credentials v1.17.28 h1:m8+AHY/ND8CMHJnPoH7PJIRakWGa4gbfbxuY9TGTUXM= +github.com/aws/aws-sdk-go-v2/credentials v1.17.28/go.mod h1:6TF7dSc78ehD1SL6KpRIPKMA1GyyWflIkjqg+qmf4+c= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 h1:yjwoSyDZF8Jth+mUk5lSPJCkMC0lMy6FaCD51jm6ayE= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12/go.mod h1:fuR57fAgMk7ot3WcNQfb6rSEn+SUffl7ri+aa8uKysI= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.11 h1:FEDZD/Axt5tKSkPAs967KZ++MkvYdBqr0a+cetRbjLM= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.11/go.mod h1:dvlsbA32KfvCzqwTiX7maABgFek2RyUuYEJ3kyn/PmQ= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 h1:TNyt/+X43KJ9IJJMjKfa3bNTiZbUP7DeCxfbTROESwY= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16/go.mod h1:2DwJF39FlNAUiX5pAc0UNeiz16lK2t7IaFcm0LFHEgc= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 h1:jYfy8UPmd+6kJW5YhY0L1/KftReOGxI/4NtVSTh9O/I= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16/go.mod h1:7ZfEPZxkW42Afq4uQB8H2E2e6ebh6mXTueEpYzjCzcs= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 h1:mimdLQkIX1zr8GIPY1ZtALdBQGxcASiBd2MOp8m/dMc= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16/go.mod h1:YHk6owoSwrIsok+cAH9PENCOGoH5PU2EllX4vLtSrsY= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 h1:KypMCbLPPHEmf9DgMGw51jMj77VfGPAN2Kv4cfhlfgI= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4/go.mod h1:Vz1JQXliGcQktFTN/LN6uGppAIRoLBR2bMvIMP0gOjc= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 h1:GckUnpm4EJOAio1c8o25a+b3lVfwVzC9gnSBqiiNmZM= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18/go.mod h1:Br6+bxfG33Dk3ynmkhsW2Z/t9D4+lRqdLDNCKi85w0U= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 h1:tJ5RnkHCiSH0jyd6gROjlJtNwov0eGYNz8s8nFcR0jQ= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18/go.mod h1:++NHzT+nAF7ZPrHPsA+ENvsXkOO8wEu+C6RXltAG4/c= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 h1:jg16PhLPUiHIj8zYIW6bqzeQSuHVEiWnGA0Brz5Xv2I= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16/go.mod h1:Uyk1zE1VVdsHSU7096h/rwnXDzOzYQVl+FNPhPw7ShY= +github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 h1:Cso4Ev/XauMVsbwdhYEoxg8rxZWw43CFqqaPB5w3W2c= +github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 h1:zCsFCKvbj25i7p1u94imVoO447I/sFv8qq+lGJhRN0c= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.5/go.mod h1:ZeDX1SnKsVlejeuz41GiajjZpRSWR7/42q/EyA/QEiM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 h1:SKvPgvdvmiTWoi0GAJ7AsJfOz3ngVkD/ERbs5pUnHNI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5/go.mod h1:20sz31hv/WsPa3HhU3hfrIet2kxM4Pe0r20eBZ20Tac= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.4 h1:iAckBT2OeEK/kBDyN/jDtpEExhjeeA/Im2q4X0rJZT8= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.4/go.mod h1:vmSqFK+BVIwVpDAGZB3CoCXHzurt4qBE8lf+I/kRTh0= +github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= +github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -29,8 +43,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v13 v13.3.3 h1:5I53QQnyG8hjVOlh5q8F3bNwrtN02wiPpoSocTU6JHA= -github.com/essentialkaos/ek/v13 v13.3.3/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM= +github.com/essentialkaos/ek/v13 v13.3.5 h1:k/lfDIpgE+8dOc+eF37m1hOi8eEMHYYTEzD5KHH3xxU= +github.com/essentialkaos/ek/v13 v13.3.5/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM= github.com/essentialkaos/katana v0.2.0 h1:LRnKyEHFET9P45L718DI704oUBHcOjW+/bWBstPb9qg= github.com/essentialkaos/katana v0.2.0/go.mod h1:B0IUikFvR6Iutx93iSu3xezHfHvIuIgXJSO6Agujp+0= github.com/essentialkaos/sio v1.0.0 h1:+VZg0Z7+Cx8F/FmlczzTJYM6rq/LhTR45Rsditmu0Ec= diff --git a/uploader/fs/fs.go b/uploader/fs/fs.go index f9166b2..9f79226 100644 --- a/uploader/fs/fs.go +++ b/uploader/fs/fs.go @@ -29,9 +29,9 @@ import ( // Config is configuration for FS uploader type Config struct { + Secret *katana.Secret Path string Mode os.FileMode - Secret *katana.Secret } // FSUploader is FS uploader instance diff --git a/uploader/s3/s3.go b/uploader/s3/s3.go index 669682b..ef4b345 100644 --- a/uploader/s3/s3.go +++ b/uploader/s3/s3.go @@ -23,6 +23,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/credentials" + "github.com/aws/aws-sdk-go-v2/feature/s3/manager" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/essentialkaos/katana" @@ -34,13 +35,16 @@ import ( // Config is configuration for S3 uploader type Config struct { + Secret *katana.Secret + Host string Region string AccessKeyID string SecretKey string Bucket string Path string - Secret *katana.Secret + Threads int + PartSize int64 } // S3Uploader is S3 uploader instance @@ -155,7 +159,12 @@ func (u *S3Uploader) Write(r io.ReadCloser, fileName string, fileSize int64) err )), }) - _, err = client.PutObject(context.TODO(), &s3.PutObjectInput{ + manager := manager.NewUploader(client, func(c *manager.Uploader) { + c.Concurrency = u.config.Threads + c.PartSize = u.config.PartSize * 1024 * 1024 + }) + + _, err = manager.Upload(context.TODO(), &s3.PutObjectInput{ Bucket: aws.String(u.config.Bucket), Key: aws.String(outputFile), Body: rr, diff --git a/uploader/sftp/sftp.go b/uploader/sftp/sftp.go index 08e7ee1..11c1148 100644 --- a/uploader/sftp/sftp.go +++ b/uploader/sftp/sftp.go @@ -32,12 +32,12 @@ import ( // Config is configuration for SFTP uploader type Config struct { + Secret *katana.Secret Host string User string Key []byte Path string Mode os.FileMode - Secret *katana.Secret } // SFTPUploader is SFTP uploader instance From 199ddeccf68742e6a03f790ce929d53c9d7c0245 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 20 Aug 2024 23:19:53 +0300 Subject: [PATCH 11/21] Update supported Go versions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d1f55c..dfcbd25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - go: [ '1.21.x', '1.22.x' ] + go: [ '1.22.x', '1.23.x' ] steps: - name: Checkout From d5a884b09f3200901347c3624f1dbf3a04897319 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 20 Aug 2024 23:28:37 +0300 Subject: [PATCH 12/21] Add multipart uploading to S3 storage --- .github/images/usage-container.svg | 37 +++++++++---------- app/app.go | 9 +---- app/common.go | 1 - common/atlassian-cloud-backuper-container.knf | 3 -- common/atlassian-cloud-backuper.knf | 3 -- common/atlassian-cloud-backuper.spec | 1 + 6 files changed, 21 insertions(+), 33 deletions(-) diff --git a/.github/images/usage-container.svg b/.github/images/usage-container.svg index 249e93f..3eba0d6 100644 --- a/.github/images/usage-container.svg +++ b/.github/images/usage-container.svg @@ -1,5 +1,5 @@ - + Atlassian Cloud Backuper Usage @@ -68,7 +68,7 @@ } - + @@ -108,22 +108,21 @@ --storage-s3-secret-key key .............. S3 access secret key (STORAGE_S3_SECRET_KEY) --storage-s3-bucket name ................. S3 bucket (STORAGE_S3_BUCKET) --storage-s3-path path ................... Path for backups (STORAGE_S3_PATH) - --storage-s3-threads num ................. Uploading threads (STORAGE_S3_THREADS) - --storage-s3-part-size num ............... Uploading part size (in MB) (STORAGE_S3_PART_SIZE) - --jira-output-file template .............. Jira backup output file name template - (JIRA_OUTPUT_FILE) - --jira-include-attachments yes/no ........ Include attachments to Jira backup - (JIRA_INCLUDE_ATTACHMENTS) - --jira-cloud-format yes/no ............... Create Jira backup for Cloud (JIRA_CLOUD_FORMAT) - --confluence-output-file template ........ Confluence backup output file name template - (CONFLUENCE_OUTPUT_FILE) - --confluence-include-attachments yes/no .. Include attachments to Confluence backup - (CONFLUENCE_INCLUDE_ATTACHMENTS) - --confluence-cloud-format yes/no ......... Create Confluence backup for Cloud - (CONFLUENCE_CLOUD_FORMAT) - --temp-dir path .......................... Path to directory for temporary data (TEMP_DIR) - --log-format text/json ................... Log format (LOG_FORMAT) - --log-level level ........................ Log level (LOG_LEVEL) + --storage-s3-part-size num ............... Uploading part size (in MB) (STORAGE_S3_PART_SIZE) + --jira-output-file template .............. Jira backup output file name template + (JIRA_OUTPUT_FILE) + --jira-include-attachments yes/no ........ Include attachments to Jira backup + (JIRA_INCLUDE_ATTACHMENTS) + --jira-cloud-format yes/no ............... Create Jira backup for Cloud (JIRA_CLOUD_FORMAT) + --confluence-output-file template ........ Confluence backup output file name template + (CONFLUENCE_OUTPUT_FILE) + --confluence-include-attachments yes/no .. Include attachments to Confluence backup + (CONFLUENCE_INCLUDE_ATTACHMENTS) + --confluence-cloud-format yes/no ......... Create Confluence backup for Cloud + (CONFLUENCE_CLOUD_FORMAT) + --temp-dir path .......................... Path to directory for temporary data (TEMP_DIR) + --log-format text/json ................... Log format (LOG_FORMAT) + --log-level level ........................ Log level (LOG_LEVEL) - + diff --git a/app/app.go b/app/app.go index 78bd969..f70fb8f 100644 --- a/app/app.go +++ b/app/app.go @@ -85,7 +85,6 @@ const ( STORAGE_S3_SECRET_KEY = "storage-s3:secret-key" STORAGE_S3_BUCKET = "storage-s3:bucket" STORAGE_S3_PATH = "storage-s3:path" - STORAGE_S3_THREADS = "storage-s3:threads" STORAGE_S3_PART_SIZE = "storage-s3:part-size" JIRA_OUTPUT_FILE = "jira:output-file" JIRA_INCLUDE_ATTACHMENTS = "jira:include-attachments" @@ -252,7 +251,7 @@ func addExtraOptions(m options.Map) { STORAGE_SFTP_HOST, STORAGE_SFTP_USER, STORAGE_SFTP_KEY, STORAGE_SFTP_PATH, STORAGE_SFTP_MODE, STORAGE_S3_HOST, STORAGE_S3_ACCESS_KEY, STORAGE_S3_SECRET_KEY, - STORAGE_S3_BUCKET, STORAGE_S3_PATH, STORAGE_S3_PART_SIZE, STORAGE_S3_THREADS, + STORAGE_S3_BUCKET, STORAGE_S3_PATH, STORAGE_S3_PART_SIZE, JIRA_OUTPUT_FILE, JIRA_INCLUDE_ATTACHMENTS, JIRA_CLOUD_FORMAT, CONFLUENCE_OUTPUT_FILE, CONFLUENCE_INCLUDE_ATTACHMENTS, CONFLUENCE_CLOUD_FORMAT, TEMP_DIR, @@ -287,8 +286,7 @@ func loadConfig() error { STORAGE_SFTP_HOST, STORAGE_SFTP_USER, STORAGE_SFTP_KEY, STORAGE_SFTP_PATH, STORAGE_SFTP_MODE, STORAGE_S3_HOST, STORAGE_S3_REGION, STORAGE_S3_ACCESS_KEY, - STORAGE_S3_SECRET_KEY, STORAGE_S3_BUCKET, STORAGE_S3_PATH, - STORAGE_S3_PART_SIZE, STORAGE_S3_THREADS, + STORAGE_S3_SECRET_KEY, STORAGE_S3_BUCKET, STORAGE_S3_PATH, STORAGE_S3_PART_SIZE, JIRA_OUTPUT_FILE, JIRA_INCLUDE_ATTACHMENTS, JIRA_CLOUD_FORMAT, CONFLUENCE_OUTPUT_FILE, CONFLUENCE_INCLUDE_ATTACHMENTS, CONFLUENCE_CLOUD_FORMAT, TEMP_DIR, @@ -340,8 +338,6 @@ func validateConfig() error { &knf.Validator{STORAGE_S3_BUCKET, knfv.Set, nil}, &knf.Validator{STORAGE_S3_PART_SIZE, knfv.Greater, 5}, &knf.Validator{STORAGE_S3_PART_SIZE, knfv.Less, 5_000}, - &knf.Validator{STORAGE_S3_THREADS, knfv.Greater, 1}, - &knf.Validator{STORAGE_S3_THREADS, knfv.Less, 96}, ) } @@ -533,7 +529,6 @@ func genUsage(section string) *usage.Info { addUnitedOption(info, STORAGE_S3_SECRET_KEY, "S3 access secret key", "key") addUnitedOption(info, STORAGE_S3_BUCKET, "S3 bucket", "name") addUnitedOption(info, STORAGE_S3_PATH, "Path for backups", "path") - addUnitedOption(info, STORAGE_S3_THREADS, "Uploading threads", "num") addUnitedOption(info, STORAGE_S3_PART_SIZE, "Uploading part size (in MB)", "num") addUnitedOption(info, JIRA_OUTPUT_FILE, "Jira backup output file name template", "template") addUnitedOption(info, JIRA_INCLUDE_ATTACHMENTS, "Include attachments to Jira backup", "yes/no") diff --git a/app/common.go b/app/common.go index 0d461e7..d122a45 100644 --- a/app/common.go +++ b/app/common.go @@ -134,7 +134,6 @@ func getUploader(target string) (uploader.Uploader, error) { SecretKey: knfu.GetS(STORAGE_S3_SECRET_KEY), Bucket: knfu.GetS(STORAGE_S3_BUCKET), Path: path.Join(knfu.GetS(STORAGE_S3_PATH), target), - Threads: knfu.GetI(STORAGE_S3_THREADS, 3), PartSize: knfu.GetI64(STORAGE_S3_PART_SIZE, 32), }) } diff --git a/common/atlassian-cloud-backuper-container.knf b/common/atlassian-cloud-backuper-container.knf index 17448ac..e7258f9 100644 --- a/common/atlassian-cloud-backuper-container.knf +++ b/common/atlassian-cloud-backuper-container.knf @@ -73,9 +73,6 @@ # Path to directory with backups path: - # Uploading threads (default: 3) - threads: 3 - # Part size in MB (default: 32) part-size: 32 diff --git a/common/atlassian-cloud-backuper.knf b/common/atlassian-cloud-backuper.knf index abf37c0..7f3dbf2 100644 --- a/common/atlassian-cloud-backuper.knf +++ b/common/atlassian-cloud-backuper.knf @@ -73,9 +73,6 @@ # Path to directory with backups path: - # Uploading threads (default: 3) - threads: 3 - # Part size in MB (default: 32) part-size: 32 diff --git a/common/atlassian-cloud-backuper.spec b/common/atlassian-cloud-backuper.spec index b933e20..a374885 100644 --- a/common/atlassian-cloud-backuper.spec +++ b/common/atlassian-cloud-backuper.spec @@ -114,6 +114,7 @@ rm -rf %{buildroot} %changelog * Tue Jul 23 2024 Anton Novojilov - 0.1.0-0 +- Added option (-F/--force) and query param (force) to force backup creation - Added data encryption feature - Added multipart uploading to S3 storage - Added server mode From a6e1828c119313b66c88672fade3f0bbed9585da Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 20 Aug 2024 23:42:06 +0300 Subject: [PATCH 13/21] Add multipart uploading to S3 storage --- uploader/s3/s3.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/uploader/s3/s3.go b/uploader/s3/s3.go index ef4b345..e188497 100644 --- a/uploader/s3/s3.go +++ b/uploader/s3/s3.go @@ -43,7 +43,6 @@ type Config struct { SecretKey string Bucket string Path string - Threads int PartSize int64 } @@ -160,7 +159,6 @@ func (u *S3Uploader) Write(r io.ReadCloser, fileName string, fileSize int64) err }) manager := manager.NewUploader(client, func(c *manager.Uploader) { - c.Concurrency = u.config.Threads c.PartSize = u.config.PartSize * 1024 * 1024 }) From 2b191699589a55d3b9d575c48d1619875be5a1d9 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 20 Aug 2024 23:42:40 +0300 Subject: [PATCH 14/21] Regenerate Makefile with the latest version of gomakegen --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1e69618..4b23501 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ################################################################################ -# This Makefile generated by GoMakeGen 3.0.6 using next command: +# This Makefile generated by GoMakeGen 3.1.0 using next command: # gomakegen --mod . # # More info: https://kaos.sh/gomakegen @@ -11,6 +11,10 @@ ifdef VERBOSE ## Print verbose information (Flag) VERBOSE_FLAG = -v endif +ifdef PROXY ## Force proxy usage for downloading dependencies (Flag) +export GOPROXY=https://proxy.golang.org/cached-only,direct +endif + COMPAT ?= 1.19 MAKEDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD) @@ -109,6 +113,6 @@ help: ## Show this info | sed 's/ifdef //' \ | awk 'BEGIN {FS = " .*?## "}; {printf " \033[32m%-11s\033[0m %s\n", $$1, $$2}' @echo -e '' - @echo -e '\033[90mGenerated by GoMakeGen 3.0.6\033[0m\n' + @echo -e '\033[90mGenerated by GoMakeGen 3.1.0\033[0m\n' ################################################################################ From bdad540d643056a278a823d265900573e52a478e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 02:30:15 +0000 Subject: [PATCH 15/21] Bump the all group across 1 directory with 3 updates Bumps the all group with 2 updates in the / directory: [github.com/aws/aws-sdk-go-v2/credentials](https://github.com/aws/aws-sdk-go-v2) and [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/credentials` from 1.17.28 to 1.17.29 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/credentials/v1.17.28...credentials/v1.17.29) Updates `github.com/aws/aws-sdk-go-v2/feature/s3/manager` from 1.17.11 to 1.17.13 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.17.11...credentials/v1.17.13) Updates `github.com/aws/aws-sdk-go-v2/service/s3` from 1.59.0 to 1.60.1 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.59.0...service/s3/v1.60.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/credentials dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/aws/aws-sdk-go-v2/feature/s3/manager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 16a3a87..e5a019a 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.21 require ( github.com/aws/aws-sdk-go-v2 v1.30.4 - github.com/aws/aws-sdk-go-v2/credentials v1.17.28 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.11 - github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 + github.com/aws/aws-sdk-go-v2/credentials v1.17.29 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.13 + github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 github.com/essentialkaos/ek/v13 v13.3.5 github.com/essentialkaos/katana v0.2.0 github.com/pkg/sftp v1.13.6 diff --git a/go.sum b/go.sum index b61aac7..a776188 100644 --- a/go.sum +++ b/go.sum @@ -2,14 +2,14 @@ github.com/aws/aws-sdk-go-v2 v1.30.4 h1:frhcagrVNrzmT95RJImMHgabt99vkXGslubDaDag github.com/aws/aws-sdk-go-v2 v1.30.4/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5LThwgXdSQorVr91L127ttckI9QQU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4/go.mod h1:/MQxMqci8tlqDH+pjmoLu1i0tbWCUP1hhyMRuFxpQCw= -github.com/aws/aws-sdk-go-v2/config v1.27.28 h1:OTxWGW/91C61QlneCtnD62NLb4W616/NM1jA8LhJqbg= -github.com/aws/aws-sdk-go-v2/config v1.27.28/go.mod h1:uzVRVtJSU5EFv6Fu82AoVFKozJi2ZCY6WRCXj06rbvs= -github.com/aws/aws-sdk-go-v2/credentials v1.17.28 h1:m8+AHY/ND8CMHJnPoH7PJIRakWGa4gbfbxuY9TGTUXM= -github.com/aws/aws-sdk-go-v2/credentials v1.17.28/go.mod h1:6TF7dSc78ehD1SL6KpRIPKMA1GyyWflIkjqg+qmf4+c= +github.com/aws/aws-sdk-go-v2/config v1.27.29 h1:+ZPKb3u9Up4KZWLGTtpTmC5T3XmRD1ZQ8XQjRCHUvJw= +github.com/aws/aws-sdk-go-v2/config v1.27.29/go.mod h1:yxqvuubha9Vw8stEgNiStO+yZpP68Wm9hLmcm+R/Qk4= +github.com/aws/aws-sdk-go-v2/credentials v1.17.29 h1:CwGsupsXIlAFYuDVHv1nnK0wnxO0wZ/g1L8DSK/xiIw= +github.com/aws/aws-sdk-go-v2/credentials v1.17.29/go.mod h1:BPJ/yXV92ZVq6G8uYvbU0gSl8q94UB63nMT5ctNO38g= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 h1:yjwoSyDZF8Jth+mUk5lSPJCkMC0lMy6FaCD51jm6ayE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12/go.mod h1:fuR57fAgMk7ot3WcNQfb6rSEn+SUffl7ri+aa8uKysI= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.11 h1:FEDZD/Axt5tKSkPAs967KZ++MkvYdBqr0a+cetRbjLM= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.11/go.mod h1:dvlsbA32KfvCzqwTiX7maABgFek2RyUuYEJ3kyn/PmQ= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.13 h1:X8EeaOjl91c8sP14NG8EHx5ZxXLJg0tHDp+KQSghp28= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.13/go.mod h1:kEI/h2bETfm09LSd7xEEH2qcU1cd//+5HH4Le7p9JgY= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 h1:TNyt/+X43KJ9IJJMjKfa3bNTiZbUP7DeCxfbTROESwY= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16/go.mod h1:2DwJF39FlNAUiX5pAc0UNeiz16lK2t7IaFcm0LFHEgc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 h1:jYfy8UPmd+6kJW5YhY0L1/KftReOGxI/4NtVSTh9O/I= @@ -26,14 +26,14 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 h1:tJ5RnkHC github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18/go.mod h1:++NHzT+nAF7ZPrHPsA+ENvsXkOO8wEu+C6RXltAG4/c= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 h1:jg16PhLPUiHIj8zYIW6bqzeQSuHVEiWnGA0Brz5Xv2I= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16/go.mod h1:Uyk1zE1VVdsHSU7096h/rwnXDzOzYQVl+FNPhPw7ShY= -github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 h1:Cso4Ev/XauMVsbwdhYEoxg8rxZWw43CFqqaPB5w3W2c= -github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 h1:mx2ucgtv+MWzJesJY9Ig/8AFHgoE5FwLXwUVgW/FGdI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 h1:zCsFCKvbj25i7p1u94imVoO447I/sFv8qq+lGJhRN0c= github.com/aws/aws-sdk-go-v2/service/sso v1.22.5/go.mod h1:ZeDX1SnKsVlejeuz41GiajjZpRSWR7/42q/EyA/QEiM= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 h1:SKvPgvdvmiTWoi0GAJ7AsJfOz3ngVkD/ERbs5pUnHNI= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5/go.mod h1:20sz31hv/WsPa3HhU3hfrIet2kxM4Pe0r20eBZ20Tac= -github.com/aws/aws-sdk-go-v2/service/sts v1.30.4 h1:iAckBT2OeEK/kBDyN/jDtpEExhjeeA/Im2q4X0rJZT8= -github.com/aws/aws-sdk-go-v2/service/sts v1.30.4/go.mod h1:vmSqFK+BVIwVpDAGZB3CoCXHzurt4qBE8lf+I/kRTh0= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 h1:OMsEmCyz2i89XwRwPouAJvhj81wINh+4UK+k/0Yo/q8= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.5/go.mod h1:vmSqFK+BVIwVpDAGZB3CoCXHzurt4qBE8lf+I/kRTh0= github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From 698a494bccade533da1afbd47752a302fed643d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 02:23:16 +0000 Subject: [PATCH 16/21] Bump github.com/aws/aws-sdk-go-v2/feature/s3/manager in the all group Bumps the all group with 1 update: [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/feature/s3/manager` from 1.17.13 to 1.17.14 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/credentials/v1.17.13...credentials/v1.17.14) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/feature/s3/manager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index e5a019a..609e568 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/aws/aws-sdk-go-v2 v1.30.4 github.com/aws/aws-sdk-go-v2/credentials v1.17.29 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.13 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.14 github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 github.com/essentialkaos/ek/v13 v13.3.5 github.com/essentialkaos/katana v0.2.0 diff --git a/go.sum b/go.sum index a776188..bec148b 100644 --- a/go.sum +++ b/go.sum @@ -2,14 +2,14 @@ github.com/aws/aws-sdk-go-v2 v1.30.4 h1:frhcagrVNrzmT95RJImMHgabt99vkXGslubDaDag github.com/aws/aws-sdk-go-v2 v1.30.4/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5LThwgXdSQorVr91L127ttckI9QQU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4/go.mod h1:/MQxMqci8tlqDH+pjmoLu1i0tbWCUP1hhyMRuFxpQCw= -github.com/aws/aws-sdk-go-v2/config v1.27.29 h1:+ZPKb3u9Up4KZWLGTtpTmC5T3XmRD1ZQ8XQjRCHUvJw= -github.com/aws/aws-sdk-go-v2/config v1.27.29/go.mod h1:yxqvuubha9Vw8stEgNiStO+yZpP68Wm9hLmcm+R/Qk4= +github.com/aws/aws-sdk-go-v2/config v1.27.30 h1:AQF3/+rOgeJBQP3iI4vojlPib5X6eeOYoa/af7OxAYg= +github.com/aws/aws-sdk-go-v2/config v1.27.30/go.mod h1:yxqvuubha9Vw8stEgNiStO+yZpP68Wm9hLmcm+R/Qk4= github.com/aws/aws-sdk-go-v2/credentials v1.17.29 h1:CwGsupsXIlAFYuDVHv1nnK0wnxO0wZ/g1L8DSK/xiIw= github.com/aws/aws-sdk-go-v2/credentials v1.17.29/go.mod h1:BPJ/yXV92ZVq6G8uYvbU0gSl8q94UB63nMT5ctNO38g= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 h1:yjwoSyDZF8Jth+mUk5lSPJCkMC0lMy6FaCD51jm6ayE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12/go.mod h1:fuR57fAgMk7ot3WcNQfb6rSEn+SUffl7ri+aa8uKysI= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.13 h1:X8EeaOjl91c8sP14NG8EHx5ZxXLJg0tHDp+KQSghp28= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.13/go.mod h1:kEI/h2bETfm09LSd7xEEH2qcU1cd//+5HH4Le7p9JgY= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.14 h1:dQa4KkoEVgk3oLL9IeoW9qrXijyQ6lWa+DX6Vn32Lhw= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.14/go.mod h1:aRKW0B+zH8J6cz3FFiQ9JbUQc7UroLx6lwfvNqIsPOs= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 h1:TNyt/+X43KJ9IJJMjKfa3bNTiZbUP7DeCxfbTROESwY= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16/go.mod h1:2DwJF39FlNAUiX5pAc0UNeiz16lK2t7IaFcm0LFHEgc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 h1:jYfy8UPmd+6kJW5YhY0L1/KftReOGxI/4NtVSTh9O/I= From 8c05eb6f9dd337db324e54e32b4f7bd5d26294b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 02:50:25 +0000 Subject: [PATCH 17/21] Bump the all group with 2 updates Bumps the all group with 2 updates: [github.com/aws/aws-sdk-go-v2/credentials](https://github.com/aws/aws-sdk-go-v2) and [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/credentials` from 1.17.29 to 1.17.30 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/credentials/v1.17.29...credentials/v1.17.30) Updates `github.com/aws/aws-sdk-go-v2/feature/s3/manager` from 1.17.14 to 1.17.15 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/credentials/v1.17.14...credentials/v1.17.15) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/credentials dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/aws/aws-sdk-go-v2/feature/s3/manager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 609e568..ca95196 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/aws/aws-sdk-go-v2 v1.30.4 - github.com/aws/aws-sdk-go-v2/credentials v1.17.29 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.14 + github.com/aws/aws-sdk-go-v2/credentials v1.17.30 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.15 github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 github.com/essentialkaos/ek/v13 v13.3.5 github.com/essentialkaos/katana v0.2.0 diff --git a/go.sum b/go.sum index bec148b..58813b3 100644 --- a/go.sum +++ b/go.sum @@ -2,14 +2,14 @@ github.com/aws/aws-sdk-go-v2 v1.30.4 h1:frhcagrVNrzmT95RJImMHgabt99vkXGslubDaDag github.com/aws/aws-sdk-go-v2 v1.30.4/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5LThwgXdSQorVr91L127ttckI9QQU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4/go.mod h1:/MQxMqci8tlqDH+pjmoLu1i0tbWCUP1hhyMRuFxpQCw= -github.com/aws/aws-sdk-go-v2/config v1.27.30 h1:AQF3/+rOgeJBQP3iI4vojlPib5X6eeOYoa/af7OxAYg= -github.com/aws/aws-sdk-go-v2/config v1.27.30/go.mod h1:yxqvuubha9Vw8stEgNiStO+yZpP68Wm9hLmcm+R/Qk4= -github.com/aws/aws-sdk-go-v2/credentials v1.17.29 h1:CwGsupsXIlAFYuDVHv1nnK0wnxO0wZ/g1L8DSK/xiIw= -github.com/aws/aws-sdk-go-v2/credentials v1.17.29/go.mod h1:BPJ/yXV92ZVq6G8uYvbU0gSl8q94UB63nMT5ctNO38g= +github.com/aws/aws-sdk-go-v2/config v1.27.31 h1:kxBoRsjhT3pq0cKthgj6RU6bXTm/2SgdoUMyrVw0rAI= +github.com/aws/aws-sdk-go-v2/config v1.27.31/go.mod h1:z04nZdSWFPaDwK3DdJOG2r+scLQzMYuJeW0CujEm9FM= +github.com/aws/aws-sdk-go-v2/credentials v1.17.30 h1:aau/oYFtibVovr2rDt8FHlU17BTicFEMAi29V1U+L5Q= +github.com/aws/aws-sdk-go-v2/credentials v1.17.30/go.mod h1:BPJ/yXV92ZVq6G8uYvbU0gSl8q94UB63nMT5ctNO38g= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 h1:yjwoSyDZF8Jth+mUk5lSPJCkMC0lMy6FaCD51jm6ayE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12/go.mod h1:fuR57fAgMk7ot3WcNQfb6rSEn+SUffl7ri+aa8uKysI= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.14 h1:dQa4KkoEVgk3oLL9IeoW9qrXijyQ6lWa+DX6Vn32Lhw= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.14/go.mod h1:aRKW0B+zH8J6cz3FFiQ9JbUQc7UroLx6lwfvNqIsPOs= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.15 h1:ijB7hr56MngOiELJe0C5aQRaBQ11LveNgWFyG02AUto= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.15/go.mod h1:0QEmQSSWMVfiAk93l1/ayR9DQ9+jwni7gHS2NARZXB0= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 h1:TNyt/+X43KJ9IJJMjKfa3bNTiZbUP7DeCxfbTROESwY= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16/go.mod h1:2DwJF39FlNAUiX5pAc0UNeiz16lK2t7IaFcm0LFHEgc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 h1:jYfy8UPmd+6kJW5YhY0L1/KftReOGxI/4NtVSTh9O/I= From e65b3da93338433b1f55853f43a0b6ffbe660ae7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 02:22:07 +0000 Subject: [PATCH 18/21] Bump the all group with 2 updates Bumps the all group with 2 updates: [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://github.com/aws/aws-sdk-go-v2) and [github.com/aws/aws-sdk-go-v2/service/s3](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/feature/s3/manager` from 1.17.15 to 1.17.16 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/credentials/v1.17.15...credentials/v1.17.16) Updates `github.com/aws/aws-sdk-go-v2/service/s3` from 1.60.1 to 1.61.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.60.1...service/s3/v1.61.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/feature/s3/manager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index ca95196..329548d 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.21 require ( github.com/aws/aws-sdk-go-v2 v1.30.4 github.com/aws/aws-sdk-go-v2/credentials v1.17.30 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.15 - github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.16 + github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0 github.com/essentialkaos/ek/v13 v13.3.5 github.com/essentialkaos/katana v0.2.0 github.com/pkg/sftp v1.13.6 diff --git a/go.sum b/go.sum index 58813b3..78c3727 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/aws/aws-sdk-go-v2/credentials v1.17.30 h1:aau/oYFtibVovr2rDt8FHlU17BT github.com/aws/aws-sdk-go-v2/credentials v1.17.30/go.mod h1:BPJ/yXV92ZVq6G8uYvbU0gSl8q94UB63nMT5ctNO38g= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 h1:yjwoSyDZF8Jth+mUk5lSPJCkMC0lMy6FaCD51jm6ayE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12/go.mod h1:fuR57fAgMk7ot3WcNQfb6rSEn+SUffl7ri+aa8uKysI= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.15 h1:ijB7hr56MngOiELJe0C5aQRaBQ11LveNgWFyG02AUto= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.15/go.mod h1:0QEmQSSWMVfiAk93l1/ayR9DQ9+jwni7gHS2NARZXB0= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.16 h1:1FWqcOnvnO0lRsv0kLACwwQquoZIoS5tD0MtfoNdnkk= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.16/go.mod h1:+E8OuB446P/5Swajo40TqenLMzm6aYDEEz6FZDn/u1E= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 h1:TNyt/+X43KJ9IJJMjKfa3bNTiZbUP7DeCxfbTROESwY= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16/go.mod h1:2DwJF39FlNAUiX5pAc0UNeiz16lK2t7IaFcm0LFHEgc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 h1:jYfy8UPmd+6kJW5YhY0L1/KftReOGxI/4NtVSTh9O/I= @@ -26,8 +26,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 h1:tJ5RnkHC github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18/go.mod h1:++NHzT+nAF7ZPrHPsA+ENvsXkOO8wEu+C6RXltAG4/c= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 h1:jg16PhLPUiHIj8zYIW6bqzeQSuHVEiWnGA0Brz5Xv2I= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16/go.mod h1:Uyk1zE1VVdsHSU7096h/rwnXDzOzYQVl+FNPhPw7ShY= -github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 h1:mx2ucgtv+MWzJesJY9Ig/8AFHgoE5FwLXwUVgW/FGdI= -github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0 h1:Wb544Wh+xfSXqJ/j3R4aX9wrKUoZsJNmilBYZb3mKQ4= +github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 h1:zCsFCKvbj25i7p1u94imVoO447I/sFv8qq+lGJhRN0c= github.com/aws/aws-sdk-go-v2/service/sso v1.22.5/go.mod h1:ZeDX1SnKsVlejeuz41GiajjZpRSWR7/42q/EyA/QEiM= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 h1:SKvPgvdvmiTWoi0GAJ7AsJfOz3ngVkD/ERbs5pUnHNI= From 66da6081fdc33ef9826771677a1fb36666ae25c3 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 3 Sep 2024 16:42:42 +0300 Subject: [PATCH 19/21] Fix handling -F/--force option --- app/app.go | 1 + 1 file changed, 1 insertion(+) diff --git a/app/app.go b/app/app.go index f70fb8f..3348382 100644 --- a/app/app.go +++ b/app/app.go @@ -118,6 +118,7 @@ const ( // optMap contains information about all supported options var optMap = options.Map{ OPT_CONFIG: {Value: "/etc/atlassian-cloud-backuper.knf"}, + OPT_FORCE: {Type: options.BOOL}, OPT_INTERACTIVE: {Type: options.BOOL}, OPT_SERVER: {Type: options.BOOL}, OPT_NO_COLOR: {Type: options.BOOL}, From bb32fb283a486de1862e9112b6ac846e85b6e973 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 03:07:30 +0000 Subject: [PATCH 20/21] Bump the all group across 1 directory with 4 updates Bumps the all group with 3 updates in the / directory: [github.com/aws/aws-sdk-go-v2](https://github.com/aws/aws-sdk-go-v2), [github.com/aws/aws-sdk-go-v2/credentials](https://github.com/aws/aws-sdk-go-v2) and [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2` from 1.30.4 to 1.30.5 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.30.4...v1.30.5) Updates `github.com/aws/aws-sdk-go-v2/credentials` from 1.17.30 to 1.17.32 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/credentials/v1.17.30...credentials/v1.17.32) Updates `github.com/aws/aws-sdk-go-v2/feature/s3/manager` from 1.17.16 to 1.17.18 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/credentials/v1.17.16...credentials/v1.17.18) Updates `github.com/aws/aws-sdk-go-v2/service/s3` from 1.61.0 to 1.61.2 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.61.0...service/s3/v1.61.2) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/aws/aws-sdk-go-v2/credentials dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/aws/aws-sdk-go-v2/feature/s3/manager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 20 ++++++++++---------- go.sum | 60 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/go.mod b/go.mod index 329548d..26eca94 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module github.com/essentialkaos/atlassian-cloud-backuper go 1.21 require ( - github.com/aws/aws-sdk-go-v2 v1.30.4 - github.com/aws/aws-sdk-go-v2/credentials v1.17.30 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.16 - github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0 + github.com/aws/aws-sdk-go-v2 v1.30.5 + github.com/aws/aws-sdk-go-v2/credentials v1.17.32 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.18 + github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2 github.com/essentialkaos/ek/v13 v13.3.5 github.com/essentialkaos/katana v0.2.0 github.com/pkg/sftp v1.13.6 @@ -15,13 +15,13 @@ require ( require ( github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 // indirect github.com/aws/smithy-go v1.20.4 // indirect github.com/essentialkaos/depsy v1.3.0 // indirect github.com/essentialkaos/sio v1.0.0 // indirect diff --git a/go.sum b/go.sum index 78c3727..90a5af2 100644 --- a/go.sum +++ b/go.sum @@ -1,39 +1,39 @@ -github.com/aws/aws-sdk-go-v2 v1.30.4 h1:frhcagrVNrzmT95RJImMHgabt99vkXGslubDaDagTk8= -github.com/aws/aws-sdk-go-v2 v1.30.4/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0= +github.com/aws/aws-sdk-go-v2 v1.30.5 h1:mWSRTwQAb0aLE17dSzztCVJWI9+cRMgqebndjwDyK0g= +github.com/aws/aws-sdk-go-v2 v1.30.5/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5LThwgXdSQorVr91L127ttckI9QQU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4/go.mod h1:/MQxMqci8tlqDH+pjmoLu1i0tbWCUP1hhyMRuFxpQCw= -github.com/aws/aws-sdk-go-v2/config v1.27.31 h1:kxBoRsjhT3pq0cKthgj6RU6bXTm/2SgdoUMyrVw0rAI= -github.com/aws/aws-sdk-go-v2/config v1.27.31/go.mod h1:z04nZdSWFPaDwK3DdJOG2r+scLQzMYuJeW0CujEm9FM= -github.com/aws/aws-sdk-go-v2/credentials v1.17.30 h1:aau/oYFtibVovr2rDt8FHlU17BTicFEMAi29V1U+L5Q= -github.com/aws/aws-sdk-go-v2/credentials v1.17.30/go.mod h1:BPJ/yXV92ZVq6G8uYvbU0gSl8q94UB63nMT5ctNO38g= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 h1:yjwoSyDZF8Jth+mUk5lSPJCkMC0lMy6FaCD51jm6ayE= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12/go.mod h1:fuR57fAgMk7ot3WcNQfb6rSEn+SUffl7ri+aa8uKysI= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.16 h1:1FWqcOnvnO0lRsv0kLACwwQquoZIoS5tD0MtfoNdnkk= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.16/go.mod h1:+E8OuB446P/5Swajo40TqenLMzm6aYDEEz6FZDn/u1E= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 h1:TNyt/+X43KJ9IJJMjKfa3bNTiZbUP7DeCxfbTROESwY= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16/go.mod h1:2DwJF39FlNAUiX5pAc0UNeiz16lK2t7IaFcm0LFHEgc= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 h1:jYfy8UPmd+6kJW5YhY0L1/KftReOGxI/4NtVSTh9O/I= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16/go.mod h1:7ZfEPZxkW42Afq4uQB8H2E2e6ebh6mXTueEpYzjCzcs= +github.com/aws/aws-sdk-go-v2/config v1.27.33 h1:Nof9o/MsmH4oa0s2q9a0k7tMz5x/Yj5k06lDODWz3BU= +github.com/aws/aws-sdk-go-v2/config v1.27.33/go.mod h1:kEqdYzRb8dd8Sy2pOdEbExTTF5v7ozEXX0McgPE7xks= +github.com/aws/aws-sdk-go-v2/credentials v1.17.32 h1:7Cxhp/BnT2RcGy4VisJ9miUPecY+lyE9I8JvcZofn9I= +github.com/aws/aws-sdk-go-v2/credentials v1.17.32/go.mod h1:P5/QMF3/DCHbXGEGkdbilXHsyTBX5D3HSwcrSc9p20I= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 h1:pfQ2sqNpMVK6xz2RbqLEL0GH87JOwSxPV2rzm8Zsb74= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13/go.mod h1:NG7RXPUlqfsCLLFfi0+IpKN4sCB9D9fw/qTaSB+xRoU= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.18 h1:9DIp7vhmOPmueCDwpXa45bEbLHHTt1kcxChdTJWWxvI= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.18/go.mod h1:aJv/Fwz8r56ozwYFRC4bzoeL1L17GYQYemfblOBux1M= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 h1:pI7Bzt0BJtYA0N/JEC6B8fJ4RBrEMi1LBrkMdFYNSnQ= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17/go.mod h1:Dh5zzJYMtxfIjYW+/evjQ8uj2OyR/ve2KROHGHlSFqE= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 h1:Mqr/V5gvrhA2gvgnF42Zh5iMiQNcOYthFYwCyrnuWlc= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17/go.mod h1:aLJpZlCmjE+V+KtN1q1uyZkfnUWpQGpbsn89XPKyzfU= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 h1:mimdLQkIX1zr8GIPY1ZtALdBQGxcASiBd2MOp8m/dMc= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16/go.mod h1:YHk6owoSwrIsok+cAH9PENCOGoH5PU2EllX4vLtSrsY= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 h1:Roo69qTpfu8OlJ2Tb7pAYVuF0CpuUMB0IYWwYP/4DZM= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17/go.mod h1:NcWPxQzGM1USQggaTVwz6VpqMZPX1CvDJLDh6jnOCa4= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 h1:KypMCbLPPHEmf9DgMGw51jMj77VfGPAN2Kv4cfhlfgI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4/go.mod h1:Vz1JQXliGcQktFTN/LN6uGppAIRoLBR2bMvIMP0gOjc= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 h1:GckUnpm4EJOAio1c8o25a+b3lVfwVzC9gnSBqiiNmZM= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18/go.mod h1:Br6+bxfG33Dk3ynmkhsW2Z/t9D4+lRqdLDNCKi85w0U= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 h1:tJ5RnkHCiSH0jyd6gROjlJtNwov0eGYNz8s8nFcR0jQ= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18/go.mod h1:++NHzT+nAF7ZPrHPsA+ENvsXkOO8wEu+C6RXltAG4/c= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 h1:jg16PhLPUiHIj8zYIW6bqzeQSuHVEiWnGA0Brz5Xv2I= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16/go.mod h1:Uyk1zE1VVdsHSU7096h/rwnXDzOzYQVl+FNPhPw7ShY= -github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0 h1:Wb544Wh+xfSXqJ/j3R4aX9wrKUoZsJNmilBYZb3mKQ4= -github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= -github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 h1:zCsFCKvbj25i7p1u94imVoO447I/sFv8qq+lGJhRN0c= -github.com/aws/aws-sdk-go-v2/service/sso v1.22.5/go.mod h1:ZeDX1SnKsVlejeuz41GiajjZpRSWR7/42q/EyA/QEiM= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 h1:SKvPgvdvmiTWoi0GAJ7AsJfOz3ngVkD/ERbs5pUnHNI= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5/go.mod h1:20sz31hv/WsPa3HhU3hfrIet2kxM4Pe0r20eBZ20Tac= -github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 h1:OMsEmCyz2i89XwRwPouAJvhj81wINh+4UK+k/0Yo/q8= -github.com/aws/aws-sdk-go-v2/service/sts v1.30.5/go.mod h1:vmSqFK+BVIwVpDAGZB3CoCXHzurt4qBE8lf+I/kRTh0= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 h1:FLMkfEiRjhgeDTCjjLoc3URo/TBkgeQbocA78lfkzSI= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19/go.mod h1:Vx+GucNSsdhaxs3aZIKfSUjKVGsxN25nX2SRcdhuw08= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 h1:rfprUlsdzgl7ZL2KlXiUAoJnI/VxfHCvDFr2QDFj6u4= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19/go.mod h1:SCWkEdRq8/7EK60NcvvQ6NXKuTcchAD4ROAsC37VEZE= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 h1:u+EfGmksnJc/x5tq3A+OD7LrMbSSR/5TrKLvkdy/fhY= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17/go.mod h1:VaMx6302JHax2vHJWgRo+5n9zvbacs3bLU/23DNQrTY= +github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2 h1:Kp6PWAlXwP1UvIflkIP6MFZYBNDCa4mFCGtxrpICVOg= +github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2/go.mod h1:5FmD/Dqq57gP+XwaUnd5WFPipAuzrf0HmupX27Gvjvc= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.7 h1:pIaGg+08llrP7Q5aiz9ICWbY8cqhTkyy+0SHvfzQpTc= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.7/go.mod h1:eEygMHnTKH/3kNp9Jr1n3PdejuSNcgwLe1dWgQtO0VQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7 h1:/Cfdu0XV3mONYKaOt1Gr0k1KvQzkzPyiKUdlWJqy+J4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7/go.mod h1:bCbAxKDqNvkHxRaIMnyVPXPo+OaPRwvmgzMxbz1VKSA= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.7 h1:NKTa1eqZYw8tiHSRGpP0VtTdub/8KNk8sDkNPFaOKDE= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.7/go.mod h1:NXi1dIAGteSaRLqYgarlhP/Ij0cFT+qmCwiJqWh/U5o= github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From f1017df0fcfe948af1a4b5faf7a3434f7df1a39b Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 5 Sep 2024 12:57:43 +0300 Subject: [PATCH 21/21] Add codacy badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index db76463..e4f882f 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@

Code Climate Maintainability + Codacy badge GitHub Actions CI Status GitHub Actions CodeQL Status