Skip to content

Commit 5861c6a

Browse files
committed
*: update version of cosi-spec
This bumps the version of the spec to that of May 4th, 2021, including the changes introduced in 392ee587932b2c764d9600854b049897f0979b4e. The tests show a potential issue in the CSI driver, see https://kubernetes.slack.com/archives/C017EGC1C6N/p1620729488311200. See: kubernetes-retired/container-object-storage-interface-spec@392ee58 See: kubernetes-retired/container-object-storage-interface-spec#27
1 parent 1b73458 commit 5861c6a

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

Diff for: .github/workflows/ci.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -142,5 +142,7 @@ jobs:
142142
test "$(jq '.region' protocolConn.json)" = '"test"'
143143
test "$(jq '.signatureVersion' protocolConn.json)" = '"S3V4"'
144144
145+
# This may be unintentional, a bug in the CSI driver.
146+
# See https://kubernetes.slack.com/archives/C017EGC1C6N/p1620729488311200
145147
test "$(jq '.CredentialsFileContents' credentials)" = '"# Nothing to see here"'
146-
test "$(jq '.CredentialsFilePath' credentials)" = '".aws/credentials"'
148+
test "$(jq '.CredentialsFilePath' credentials)" = '""'

Diff for: cmd/cosi-driver-sample/provisionerserver.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,8 @@ func (s *provisionerServer) ProvisionerGrantBucketAccess(ctx context.Context, re
181181
}
182182

183183
return &spec.ProvisionerGrantBucketAccessResponse{
184-
AccountId: a.accountId.String(),
185-
CredentialsFileContents: "# Nothing to see here",
186-
CredentialsFilePath: ".aws/credentials",
184+
AccountId: a.accountId.String(),
185+
Credentials: "# Nothing to see here",
187186
}, nil
188187
}
189188

Diff for: cmd/cosi-driver-sample/provisionerserver_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ var _ = Describe("ProvisionerServer", func() {
4545
Protocol: &spec.Protocol{
4646
Type: &spec.Protocol_S3{
4747
S3: &spec.S3{
48-
Endpoint: "https://object-storage.internal",
49-
BucketName: bucketName,
5048
Region: "test",
5149
SignatureVersion: spec.S3SignatureVersion_S3V4,
5250
},
@@ -94,7 +92,6 @@ var _ = Describe("ProvisionerServer", func() {
9492
Protocol: &spec.Protocol{
9593
Type: &spec.Protocol_AzureBlob{
9694
AzureBlob: &spec.AzureBlob{
97-
ContainerName: "test-azure-blob-container",
9895
StorageAccount: "test-sa",
9996
},
10097
},
@@ -174,8 +171,7 @@ var _ = Describe("ProvisionerServer", func() {
174171
Expect(err).NotTo(HaveOccurred())
175172

176173
Expect(aresp2.AccountId).To(Equal(aresp1.AccountId))
177-
Expect(aresp2.CredentialsFileContents).To(Equal(aresp1.CredentialsFileContents))
178-
Expect(aresp2.CredentialsFilePath).To(Equal(aresp1.CredentialsFilePath))
174+
Expect(aresp2.Credentials).To(Equal(aresp1.Credentials))
179175
})
180176

181177
It("Handles requests for access to non-existing buckets", func() {

Diff for: go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ require (
99
golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6
1010
google.golang.org/grpc v1.37.0
1111
k8s.io/klog/v2 v2.8.0
12-
sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210330184956-b0de747ccee4
12+
sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210507203703-a97f2e98ac90
1313
)

Diff for: go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,5 +154,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
154154
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
155155
k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=
156156
k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
157-
sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210330184956-b0de747ccee4 h1:U+M87V77xKotSub2dqNlmxHMbb30QeC7wwTWdPGAhSI=
158-
sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210330184956-b0de747ccee4/go.mod h1:kafkL5l/lTUrZXhVi/9p1GzpEE/ts29BkWkL3Ao33WU=
157+
sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210507203703-a97f2e98ac90 h1:gC+gbzEMq1EPR+QmXuDmC50USLWLY/8Ci2ezgqhloUs=
158+
sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210507203703-a97f2e98ac90/go.mod h1:kafkL5l/lTUrZXhVi/9p1GzpEE/ts29BkWkL3Ao33WU=

0 commit comments

Comments
 (0)