Skip to content

Commit

Permalink
Merge pull request #6989 from blackpiglet/support_windows_build_main
Browse files Browse the repository at this point in the history
[cherry-pick][main]Make Windows build skip BlockMode code.
  • Loading branch information
ywk253100 authored Oct 24, 2023
2 parents e2ec855 + ecc6e16 commit 61d333a
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 0 deletions.
1 change: 1 addition & 0 deletions changelogs/unreleased/6989-blackpiglet
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add both non-Windows version and Windows version code for PVC block mode logic.
3 changes: 3 additions & 0 deletions pkg/uploader/kopia/block_backup.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
//go:build !windows
// +build !windows

/*
Copyright The Velero Contributors.
Expand Down
30 changes: 30 additions & 0 deletions pkg/uploader/kopia/block_backup_windows.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//go:build windows
// +build windows

/*
Copyright The Velero 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 kopia

import (
"fmt"

"github.com/kopia/kopia/fs"
)

func getLocalBlockEntry(sourcePath string) (fs.Entry, error) {
return nil, fmt.Errorf("block mode is not supported for Windows")
}
3 changes: 3 additions & 0 deletions pkg/uploader/kopia/block_restore.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
//go:build !windows
// +build !windows

/*
Copyright The Velero Contributors.
Expand Down
42 changes: 42 additions & 0 deletions pkg/uploader/kopia/block_restore_windows.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
//go:build windows
// +build windows

/*
Copyright The Velero 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 kopia

import (
"context"
"fmt"

"github.com/kopia/kopia/fs"
"github.com/kopia/kopia/snapshot/restore"
)

type BlockOutput struct {
*restore.FilesystemOutput

targetFileName string
}

func (o *BlockOutput) WriteFile(ctx context.Context, relativePath string, remoteFile fs.File) error {
return fmt.Errorf("block mode is not supported for Windows")
}

func (o *BlockOutput) BeginDirectory(ctx context.Context, relativePath string, e fs.Directory) error {
return fmt.Errorf("block mode is not supported for Windows")
}

0 comments on commit 61d333a

Please sign in to comment.