From a40888d343a9b1f4ad0b96885f50ccf70e8f8496 Mon Sep 17 00:00:00 2001 From: Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> Date: Mon, 25 Sep 2023 18:47:38 +0500 Subject: [PATCH 1/3] fix: make dev_tls with volume https (#4866) --- docker/Makefile | 12 ++++++------ docker/compose/tls.env | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index b473245e8..89a896f77 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -102,12 +102,12 @@ clean: rm ./weed certstrap: - go get github.com/square/certstrap - certstrap --depot-path compose/tls init --passphrase "" --common-name "SeaweedFS CA" || true - certstrap --depot-path compose/tls request-cert --passphrase "" --common-name volume01.dev || true - certstrap --depot-path compose/tls request-cert --passphrase "" --common-name master01.dev || true - certstrap --depot-path compose/tls request-cert --passphrase "" --common-name filer01.dev || true - certstrap --depot-path compose/tls request-cert --passphrase "" --common-name client01.dev || true + go install -v github.com/square/certstrap@latest + certstrap --depot-path compose/tls init --curve P-256 --passphrase "" --common-name "SeaweedFS CA" || true + certstrap --depot-path compose/tls request-cert --ou "SeaweedFS" --curve P-256 --passphrase "" --domain localhost --common-name volume01.dev || true + certstrap --depot-path compose/tls request-cert --ou "SeaweedFS" --curve P-256 --passphrase "" --common-name master01.dev || true + certstrap --depot-path compose/tls request-cert --ou "SeaweedFS" --curve P-256 --passphrase "" --common-name filer01.dev || true + certstrap --depot-path compose/tls request-cert --ou "SeaweedFS" --curve P-256 --passphrase "" --common-name client01.dev || true certstrap --depot-path compose/tls sign --CA "SeaweedFS CA" volume01.dev || true certstrap --depot-path compose/tls sign --CA "SeaweedFS CA" master01.dev || true certstrap --depot-path compose/tls sign --CA "SeaweedFS CA" filer01.dev || true diff --git a/docker/compose/tls.env b/docker/compose/tls.env index 3a52fce52..d80a3abbd 100644 --- a/docker/compose/tls.env +++ b/docker/compose/tls.env @@ -12,5 +12,9 @@ WEED_GRPC_MASTER_ALLOWED_COMMONNAMES="volume01.dev,master01.dev,filer01.dev,clie WEED_GRPC_VOLUME_ALLOWED_COMMONNAMES="volume01.dev,master01.dev,filer01.dev,client01.dev" WEED_GRPC_FILER_ALLOWED_COMMONNAMES="volume01.dev,master01.dev,filer01.dev,client01.dev" WEED_GRPC_CLIENT_ALLOWED_COMMONNAMES="volume01.dev,master01.dev,filer01.dev,client01.dev" +WEED_HTTPS_CLIENT_ENABLE=true +WEED_HTTPS_VOLUME_CERT=/etc/seaweedfs/tls/volume01.dev.crt +WEED_HTTPS_VOLUME_KEY=/etc/seaweedfs/tls/volume01.dev.key +WEED_HTTPS_VOLUME_CA=/etc/seaweedfs/tls/SeaweedFS_CA.crt #GRPC_GO_LOG_SEVERITY_LEVEL=info #GRPC_GO_LOG_VERBOSITY_LEVEL=2 \ No newline at end of file From 28a3a31b2704e5dc86d1ac8a6d345fc4cefab354 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Mon, 25 Sep 2023 07:33:18 -0700 Subject: [PATCH 2/3] weed/replication/sub: fix dropped error (#4865) --- weed/replication/sub/notification_aws_sqs.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/weed/replication/sub/notification_aws_sqs.go b/weed/replication/sub/notification_aws_sqs.go index 0201d4f9c..7fc5c3f46 100644 --- a/weed/replication/sub/notification_aws_sqs.go +++ b/weed/replication/sub/notification_aws_sqs.go @@ -99,7 +99,10 @@ func (k *AwsSqsInput) ReceiveMessage() (key string, message *filer_pb.EventNotif text := *result.Messages[0].Body message = &filer_pb.EventNotification{} err = proto.Unmarshal([]byte(text), message) - + if err != nil { + err = fmt.Errorf("unmarshal message from sqs %s: %w", k.queueUrl, err) + return + } // delete the message _, err = k.svc.DeleteMessage(&sqs.DeleteMessageInput{ QueueUrl: &k.queueUrl, From 7bb58e23ea03846b06b540f9570c48dc41b5f2c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 08:18:11 -0700 Subject: [PATCH 3/3] Bump actions/checkout from 4.0.0 to 4.1.0 (#4867) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/3df4ab11eba7bda6032a0b82a6bb43b11571feac...8ade135a41bc03ea155e62e844d188df1ea18608) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/binaries_dev.yml | 4 ++-- .github/workflows/binaries_release0.yml | 2 +- .github/workflows/binaries_release1.yml | 2 +- .github/workflows/binaries_release2.yml | 2 +- .github/workflows/binaries_release3.yml | 2 +- .github/workflows/binaries_release4.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/container_dev.yml | 2 +- .github/workflows/container_latest.yml | 2 +- .github/workflows/container_release1.yml | 2 +- .github/workflows/container_release2.yml | 2 +- .github/workflows/container_release3.yml | 2 +- .github/workflows/container_release4.yml | 2 +- .github/workflows/container_release5.yml | 2 +- .github/workflows/depsreview.yml | 2 +- .github/workflows/e2e.yml | 2 +- .github/workflows/go.yml | 2 +- .github/workflows/helm_chart_release.yml | 2 +- .github/workflows/helm_ci.yml | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/binaries_dev.yml b/.github/workflows/binaries_dev.yml index d48a557dd..adcdde147 100644 --- a/.github/workflows/binaries_dev.yml +++ b/.github/workflows/binaries_dev.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Check out code into the Go module directory - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Set BUILD_TIME env run: echo BUILD_TIME=$(date -u +%Y%m%d-%H%M) >> ${GITHUB_ENV} @@ -87,7 +87,7 @@ jobs: steps: - name: Check out code into the Go module directory - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Set BUILD_TIME env run: echo BUILD_TIME=$(date -u +%Y%m%d-%H%M) >> ${GITHUB_ENV} diff --git a/.github/workflows/binaries_release0.yml b/.github/workflows/binaries_release0.yml index 51cd482c2..1e5cbcd37 100644 --- a/.github/workflows/binaries_release0.yml +++ b/.github/workflows/binaries_release0.yml @@ -28,7 +28,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Go Release Binaries Normal Volume Size uses: wangyoucao577/go-release-action@2ac3035fa4c4feed6a8272ce278b0577b93cf8e5 # v1.22 with: diff --git a/.github/workflows/binaries_release1.yml b/.github/workflows/binaries_release1.yml index f98e7b556..4f9534edb 100644 --- a/.github/workflows/binaries_release1.yml +++ b/.github/workflows/binaries_release1.yml @@ -28,7 +28,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Go Release Binaries Normal Volume Size uses: wangyoucao577/go-release-action@2ac3035fa4c4feed6a8272ce278b0577b93cf8e5 # v1.22 with: diff --git a/.github/workflows/binaries_release2.yml b/.github/workflows/binaries_release2.yml index 913e5f0c2..aca27b5c5 100644 --- a/.github/workflows/binaries_release2.yml +++ b/.github/workflows/binaries_release2.yml @@ -28,7 +28,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Go Release Binaries Normal Volume Size uses: wangyoucao577/go-release-action@2ac3035fa4c4feed6a8272ce278b0577b93cf8e5 # v1.22 with: diff --git a/.github/workflows/binaries_release3.yml b/.github/workflows/binaries_release3.yml index c5014f327..40d384062 100644 --- a/.github/workflows/binaries_release3.yml +++ b/.github/workflows/binaries_release3.yml @@ -28,7 +28,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Go Release Binaries Normal Volume Size uses: wangyoucao577/go-release-action@2ac3035fa4c4feed6a8272ce278b0577b93cf8e5 # v1.22 with: diff --git a/.github/workflows/binaries_release4.yml b/.github/workflows/binaries_release4.yml index c07226ab8..2aeeb2706 100644 --- a/.github/workflows/binaries_release4.yml +++ b/.github/workflows/binaries_release4.yml @@ -28,7 +28,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Go Release Binaries Normal Volume Size uses: wangyoucao577/go-release-action@2ac3035fa4c4feed6a8272ce278b0577b93cf8e5 # v1.22 with: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a44b1ac19..918e8c68b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/container_dev.yml b/.github/workflows/container_dev.yml index 212fabd24..9fc9b3e6e 100644 --- a/.github/workflows/container_dev.yml +++ b/.github/workflows/container_dev.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Docker meta id: docker_meta diff --git a/.github/workflows/container_latest.yml b/.github/workflows/container_latest.yml index faace8bf5..b4f7a28f6 100644 --- a/.github/workflows/container_latest.yml +++ b/.github/workflows/container_latest.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Docker meta id: docker_meta diff --git a/.github/workflows/container_release1.yml b/.github/workflows/container_release1.yml index 7bc023d39..55299d6b0 100644 --- a/.github/workflows/container_release1.yml +++ b/.github/workflows/container_release1.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Docker meta id: docker_meta diff --git a/.github/workflows/container_release2.yml b/.github/workflows/container_release2.yml index deb953a57..cb26fe479 100644 --- a/.github/workflows/container_release2.yml +++ b/.github/workflows/container_release2.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Docker meta id: docker_meta diff --git a/.github/workflows/container_release3.yml b/.github/workflows/container_release3.yml index 8cfe2ffec..7c1a51995 100644 --- a/.github/workflows/container_release3.yml +++ b/.github/workflows/container_release3.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Docker meta id: docker_meta diff --git a/.github/workflows/container_release4.yml b/.github/workflows/container_release4.yml index d19ce3e43..319675980 100644 --- a/.github/workflows/container_release4.yml +++ b/.github/workflows/container_release4.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Docker meta id: docker_meta diff --git a/.github/workflows/container_release5.yml b/.github/workflows/container_release5.yml index d989f4b04..e0d489293 100644 --- a/.github/workflows/container_release5.yml +++ b/.github/workflows/container_release5.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Docker meta id: docker_meta diff --git a/.github/workflows/depsreview.yml b/.github/workflows/depsreview.yml index ca4f2e720..85d7a2fed 100644 --- a/.github/workflows/depsreview.yml +++ b/.github/workflows/depsreview.yml @@ -9,6 +9,6 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout Repository' - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 - name: 'Dependency Review' uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 2be997092..f544f9f97 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -30,7 +30,7 @@ jobs: id: go - name: Check out code into the Go module directory - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Install dependencies run: | diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index d5b11b93b..be901ccc2 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -27,7 +27,7 @@ jobs: id: go - name: Check out code into the Go module directory - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 - name: Get dependencies run: | diff --git a/.github/workflows/helm_chart_release.yml b/.github/workflows/helm_chart_release.yml index 6dcf3b209..ba07363df 100644 --- a/.github/workflows/helm_chart_release.yml +++ b/.github/workflows/helm_chart_release.yml @@ -12,7 +12,7 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 - name: Publish Helm charts uses: stefanprodan/helm-gh-pages@master with: diff --git a/.github/workflows/helm_ci.yml b/.github/workflows/helm_ci.yml index b5d72ac50..4ca790c48 100644 --- a/.github/workflows/helm_ci.yml +++ b/.github/workflows/helm_ci.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 with: fetch-depth: 0