Skip to content

Commit 0f63044

Browse files
committed
protosanitizer: remove upstream dependency on CSI 1.0
We cannot depend on the github.com/container-storage-interface/spec because then the package cannot be vendored into other repos where an older revision is needed, like the 0.4.x sidecars. We only really need the "csi_secrets" extension which has to be fixed from now on, therefore we can simply copy csi.pb.go manually once and then use it with a different package name, without having to worry about updating it.
1 parent 67f76c8 commit 0f63044

File tree

5 files changed

+6
-212
lines changed

5 files changed

+6
-212
lines changed

Gopkg.lock

Lines changed: 4 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

protosanitizer/protosanitizer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"reflect"
2525
"strings"
2626

27-
"github.com/container-storage-interface/spec/lib/go/csi"
2827
"github.com/golang/protobuf/descriptor"
2928
"github.com/golang/protobuf/proto"
3029
protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
30+
"github.com/kubernetes-csi/csi-lib-utils/protosanitizer/csi10"
3131
)
3232

3333
// StripSecrets returns a wrapper around the original CSI gRPC message

protosanitizer/protosanitizer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"fmt"
2121
"testing"
2222

23-
"github.com/container-storage-interface/spec/lib/go/csi"
2423
"github.com/golang/protobuf/proto"
24+
csi "github.com/kubernetes-csi/csi-lib-utils/protosanitizer/csi10"
2525
csi03 "github.com/kubernetes-csi/csi-lib-utils/protosanitizer/test/csi03"
2626
"github.com/kubernetes-csi/csi-lib-utils/protosanitizer/test/csitest"
2727
"github.com/stretchr/testify/assert"

vendor/github.com/container-storage-interface/spec/LICENSE

Lines changed: 0 additions & 201 deletions
This file was deleted.

0 commit comments

Comments
 (0)