Update restic version (#112)

/cherry-pick

Signed-off-by: Md. Ishtiaq Islam <[email protected]>

Author: ishtiaqhimel

Makefile

@@ -42,7 +42,7 @@ else
 	endif
 endif
 
-RESTIC_VER       := 0.13.1
+RESTIC_VER       := 0.17.3
 
 ###
 ### These variables should not need tweaking.
@@ -281,7 +281,7 @@ lint: $(BUILD_DIRS)
 	    --env GO111MODULE=on                                    \
 	    --env GOFLAGS="-mod=vendor"                             \
 	    $(BUILD_IMAGE)                                          \
-	    golangci-lint run --enable $(ADDTL_LINTERS) --timeout=30m --skip-files="generated.*\.go$\" --skip-dirs-use-default --skip-dirs=client,vendor
+	    golangci-lint run --enable $(ADDTL_LINTERS) --timeout=30m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default --exclude-dirs=client,vendor
 
 $(BUILD_DIRS):
 	@mkdir -p $@

go.mod

@@ -19,7 +19,7 @@ require (
 	kmodules.xyz/client-go v0.30.44
 	kmodules.xyz/custom-resources v0.30.0
 	kmodules.xyz/offshoot-api v0.30.1
-	stash.appscode.dev/apimachinery v0.38.0
+	stash.appscode.dev/apimachinery v0.38.1-0.20250114050236-cca8469a4c04
 )
 
 require (

go.sum

@@ -571,5 +571,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+s
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
-stash.appscode.dev/apimachinery v0.38.0 h1:tQ4dUdMxm0XZSs4Ieii/DupOjQ3dvpwYnzqC1M8TMCQ=
-stash.appscode.dev/apimachinery v0.38.0/go.mod h1:HoMcNxSg7TUHEhbHE+JvdhICrXoEKRvfLuFBKAM40ng=
+stash.appscode.dev/apimachinery v0.38.1-0.20250114050236-cca8469a4c04 h1:NtQeear5dlS9PM6LoPVlfqRflavGvODoxa65RnI+w5Y=
+stash.appscode.dev/apimachinery v0.38.1-0.20250114050236-cca8469a4c04/go.mod h1:HoMcNxSg7TUHEhbHE+JvdhICrXoEKRvfLuFBKAM40ng=

vendor/modules.txt

@@ -840,7 +840,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
 ## explicit; go 1.12
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
-# stash.appscode.dev/apimachinery v0.38.0
+# stash.appscode.dev/apimachinery v0.38.1-0.20250114050236-cca8469a4c04
 ## explicit; go 1.22.0
 stash.appscode.dev/apimachinery/apis
 stash.appscode.dev/apimachinery/apis/repositories

vendor/stash.appscode.dev/apimachinery/pkg/restic/commands.go

@@ -379,6 +379,49 @@ func (w *ResticWrapper) unlock() ([]byte, error) {
 	return w.run(Command{Name: ResticCMD, Args: args})
 }
 
+func (w *ResticWrapper) migrateToV2() ([]byte, error) {
+	klog.Infoln("Migrating repository to v2")
+	args := w.appendCacheDirFlag([]interface{}{"migrate", "upgrade_repo_v2"})
+	args = w.appendMaxConnectionsFlag(args)
+	args = w.appendCaCertFlag(args)
+	args = w.appendInsecureTLSFlag(args)
+
+	return w.run(Command{Name: ResticCMD, Args: args})
+}
+
+func (w *ResticWrapper) prune(pruneOpts PruneOptions) ([]byte, error) {
+	klog.Infoln("Pruning repository")
+
+	args := []interface{}{"prune"}
+	if pruneOpts.DryRun {
+		args = append(args, "--dry-run")
+	}
+	if pruneOpts.RepackCacheableOnly {
+		args = append(args, "--repack-cacheable-only")
+	}
+	if pruneOpts.RepackSmall {
+		args = append(args, "--repack-small")
+	}
+	if pruneOpts.RepackUncompressed {
+		args = append(args, "--repack-uncompressed")
+	}
+	if pruneOpts.MaxUnusedLimit != "" {
+		args = append(args,
+			fmt.Sprintf("--max-unused=%s", pruneOpts.MaxUnusedLimit))
+	}
+	if pruneOpts.MaxRepackSize != "" {
+		args = append(args,
+			fmt.Sprintf("--max-repack-size=%s", pruneOpts.MaxRepackSize))
+	}
+
+	args = w.appendCacheDirFlag(args)
+	args = w.appendMaxConnectionsFlag(args)
+	args = w.appendCaCertFlag(args)
+	args = w.appendInsecureTLSFlag(args)
+
+	return w.run(Command{Name: ResticCMD, Args: args})
+}
+
 func (w *ResticWrapper) appendCacheDirFlag(args []interface{}) []interface{} {
 	if w.config.EnableCache {
 		cacheDir := filepath.Join(w.config.ScratchDir, resticCacheDir)

vendor/stash.appscode.dev/apimachinery/pkg/restic/config.go

@@ -78,6 +78,15 @@ type DumpOptions struct {
 	StdoutPipeCommands []Command
 }
 
+type PruneOptions struct {
+	MaxUnusedLimit      string
+	MaxRepackSize       string
+	DryRun              bool
+	RepackUncompressed  bool
+	RepackSmall         bool
+	RepackCacheableOnly bool
+}
+
 type SetupOptions struct {
 	Provider       string
 	Bucket         string

vendor/stash.appscode.dev/apimachinery/pkg/restic/migrate.go

@@ -0,0 +1,25 @@
+/*
+Copyright AppsCode Inc. and Contributors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package restic
+
+func (w *ResticWrapper) Prune(pruneOpts PruneOptions) ([]byte, error) {
+	return w.prune(pruneOpts)
+}
+
+func (w *ResticWrapper) MigrateRepoToV2() ([]byte, error) {
+	return w.migrateToV2()
+}