From e6c8f3afa5b93060874e95bf7dd01e0f1f97c1a0 Mon Sep 17 00:00:00 2001
From: Ming <mqiu@vmware.com>
Date: Thu, 19 Jan 2023 02:22:55 +0000
Subject: [PATCH] Bump up restic version to 0.15.0

Signed-off-by: Ming <mqiu@vmware.com>
---
 Makefile                                |  2 +-
 changelogs/unreleased/5784-qiuming-best |  1 +
 hack/build-restic.sh                    |  1 -
 hack/modify_acces_denied_code.txt       | 13 -------------
 4 files changed, 2 insertions(+), 15 deletions(-)
 create mode 100644 changelogs/unreleased/5784-qiuming-best
 delete mode 100644 hack/modify_acces_denied_code.txt

diff --git a/Makefile b/Makefile
index 73efb9cbf..c27112a2c 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ see: https://velero.io/docs/main/build-from-source/#making-images-and-updating-v
 endef
 
 # The version of restic binary to be downloaded
-RESTIC_VERSION ?= 0.14.0
+RESTIC_VERSION ?= 0.15.0
 
 CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 darwin-arm64 windows-amd64 linux-ppc64le
 BUILDX_PLATFORMS ?= $(subst -,/,$(ARCH))
diff --git a/changelogs/unreleased/5784-qiuming-best b/changelogs/unreleased/5784-qiuming-best
new file mode 100644
index 000000000..dc5a4313d
--- /dev/null
+++ b/changelogs/unreleased/5784-qiuming-best
@@ -0,0 +1 @@
+Bump up Restic version to 0.15.0 
diff --git a/hack/build-restic.sh b/hack/build-restic.sh
index c6a19c02c..5859414fd 100755
--- a/hack/build-restic.sh
+++ b/hack/build-restic.sh
@@ -50,7 +50,6 @@ fi
 mkdir ${build_path}/restic
 git clone -b v${RESTIC_VERSION} https://github.com/restic/restic.git ${build_path}/restic
 pushd ${build_path}/restic
-git apply /go/src/github.com/vmware-tanzu/velero/hack/modify_acces_denied_code.txt
 go run build.go --goos "${GOOS}" --goarch "${GOARCH}" --goarm "${GOARM}" -o ${restic_bin}
 chmod +x ${restic_bin}
 popd
diff --git a/hack/modify_acces_denied_code.txt b/hack/modify_acces_denied_code.txt
deleted file mode 100644
index 5c2577b69..000000000
--- a/hack/modify_acces_denied_code.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/internal/backend/s3/s3.go b/internal/backend/s3/s3.go
-index 0b3816c06..eec10f9c7 100644
---- a/internal/backend/s3/s3.go
-+++ b/internal/backend/s3/s3.go
-@@ -164,7 +164,7 @@ func isAccessDenied(err error) bool {
- 	debug.Log("isAccessDenied(%T, %#v)", err, err)
- 
- 	var e minio.ErrorResponse
--	return errors.As(err, &e) && e.Code == "Access Denied"
-+	return errors.As(err, &e) && e.Code == "AccessDenied"
- }
- 
- // IsNotExist returns true if the error is caused by a not existing file.