Updates for latest api changes

Rob Rati · Rob Rati · commit b6d005336672 · 2020-12-10T18:18:22.000-05:00
diff --git a/pkg/controller/bucketaccess/bucket_access_controller_test.go b/pkg/controller/bucketaccess/bucket_access_controller_test.go
@@ -29,6 +29,7 @@ import (
 	fakespec "github.com/kubernetes-sigs/container-object-storage-interface-spec/fake"
 
 	v1 "k8s.io/api/core/v1"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilversion "k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/apimachinery/pkg/version"
@@ -142,8 +143,8 @@ func TestAdd(t *testing.T) {
 				if in.BucketName != bucketName {
 					t.Errorf("expected %s, got %s", bucketName, in.BucketName)
 				}
-				if in.Region != region {
-					t.Errorf("expected %s, got %s", region, in.Region)
+				if in.BucketContext["Region"] != region {
+					t.Errorf("expected %s, got %s", region, in.BucketContext["Region"])
 				}
 				if in.Principal != principal {
 					t.Errorf("expected %s, got %s", principal, in.Principal)
@@ -185,13 +186,13 @@ func TestAdd(t *testing.T) {
 					t.Errorf("expected %s, got %s", principal, in.Principal)
 				}
 				if in.BucketContext["ServiceAccount"] != account {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["ServiceAccount"])
+					t.Errorf("expected %s, got %s", account, in.BucketContext["ServiceAccount"])
 				}
 				if in.BucketContext["PrivateKeyName"] != keyName {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["PrivateKeyName"])
+					t.Errorf("expected %s, got %s", keyName, in.BucketContext["PrivateKeyName"])
 				}
 				if in.BucketContext["ProjectID"] != projID {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["ProjectID"])
+					t.Errorf("expected %s, got %s", projID, in.BucketContext["ProjectID"])
 				}
 				return &osspec.ProvisionerGrantBucketAccessResponse{
 					Principal:               principal,
@@ -219,7 +220,7 @@ func TestAdd(t *testing.T) {
 					t.Errorf("expected %s, got %s", principal, in.Principal)
 				}
 				if in.BucketContext["StorageAccount"] != account {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["StorageAccount"])
+					t.Errorf("expected %s, got %s", account, in.BucketContext["StorageAccount"])
 				}
 				return &osspec.ProvisionerGrantBucketAccessResponse{
 					Principal:               principal,
@@ -406,8 +407,8 @@ func TestDelete(t *testing.T) {
 				if in.BucketName != bucketName {
 					t.Errorf("expected %s, got %s", bucketName, in.BucketName)
 				}
-				if in.Region != region {
-					t.Errorf("expected %s, got %s", region, in.Region)
+				if in.BucketContext["Region"] != region {
+					t.Errorf("expected %s, got %s", region, in.BucketContext["Region"])
 				}
 				if in.Principal != principal {
 					t.Errorf("expected %s, got %s", principal, in.Principal)
@@ -444,13 +445,13 @@ func TestDelete(t *testing.T) {
 					t.Errorf("expected %s, got %s", principal, in.Principal)
 				}
 				if in.BucketContext["ServiceAccount"] != account {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["ServiceAccount"])
+					t.Errorf("expected %s, got %s", account, in.BucketContext["ServiceAccount"])
 				}
 				if in.BucketContext["PrivateKeyName"] != keyName {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["PrivateKeyName"])
+					t.Errorf("expected %s, got %s", keyName, in.BucketContext["PrivateKeyName"])
 				}
 				if in.BucketContext["ProjectID"] != projID {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["ProjectID"])
+					t.Errorf("expected %s, got %s", projID, in.BucketContext["ProjectID"])
 				}
 				return &osspec.ProvisionerRevokeBucketAccessResponse{}, nil
 			},
@@ -473,7 +474,7 @@ func TestDelete(t *testing.T) {
 					t.Errorf("expected %s, got %s", principal, in.Principal)
 				}
 				if in.BucketContext["StorageAccount"] != account {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["StorageAccount"])
+					t.Errorf("expected %s, got %s", account, in.BucketContext["StorageAccount"])
 				}
 				return &osspec.ProvisionerRevokeBucketAccessResponse{}, nil
 			},
@@ -495,8 +496,8 @@ func TestDelete(t *testing.T) {
 				if in.BucketName != bucketName {
 					t.Errorf("expected %s, got %s", bucketName, in.BucketName)
 				}
-				if in.Region != region {
-					t.Errorf("expected %s, got %s", region, in.Region)
+				if in.BucketContext["Region"] != region {
+					t.Errorf("expected %s, got %s", region, in.BucketContext["Region"])
 				}
 				if in.Principal != principal {
 					t.Errorf("expected %s, got %s", principal, in.Principal)

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import (`
`29`	`29`	`fakespec "github.com/kubernetes-sigs/container-object-storage-interface-spec/fake"`
`30`	`30`
`31`	`31`	`v1 "k8s.io/api/core/v1"`
	`32`	`+`
`32`	`33`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`33`	`34`	`utilversion "k8s.io/apimachinery/pkg/util/version"`
`34`	`35`	`"k8s.io/apimachinery/pkg/version"`
`@@ -142,8 +143,8 @@ func TestAdd(t *testing.T) {`
`142`	`143`	`if in.BucketName != bucketName {`
`143`	`144`	`t.Errorf("expected %s, got %s", bucketName, in.BucketName)`
`144`	`145`	`}`
`145`		`- if in.Region != region {`
`146`		`- t.Errorf("expected %s, got %s", region, in.Region)`
	`146`	`+ if in.BucketContext["Region"] != region {`
	`147`	`+ t.Errorf("expected %s, got %s", region, in.BucketContext["Region"])`
`147`	`148`	`}`
`148`	`149`	`if in.Principal != principal {`
`149`	`150`	`t.Errorf("expected %s, got %s", principal, in.Principal)`
`@@ -185,13 +186,13 @@ func TestAdd(t *testing.T) {`
`185`	`186`	`t.Errorf("expected %s, got %s", principal, in.Principal)`
`186`	`187`	`}`
`187`	`188`	`if in.BucketContext["ServiceAccount"] != account {`
`188`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["ServiceAccount"])`
	`189`	`+ t.Errorf("expected %s, got %s", account, in.BucketContext["ServiceAccount"])`
`189`	`190`	`}`
`190`	`191`	`if in.BucketContext["PrivateKeyName"] != keyName {`
`191`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["PrivateKeyName"])`
	`192`	`+ t.Errorf("expected %s, got %s", keyName, in.BucketContext["PrivateKeyName"])`
`192`	`193`	`}`
`193`	`194`	`if in.BucketContext["ProjectID"] != projID {`
`194`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["ProjectID"])`
	`195`	`+ t.Errorf("expected %s, got %s", projID, in.BucketContext["ProjectID"])`
`195`	`196`	`}`
`196`	`197`	`return &osspec.ProvisionerGrantBucketAccessResponse{`
`197`	`198`	`Principal: principal,`
`@@ -219,7 +220,7 @@ func TestAdd(t *testing.T) {`
`219`	`220`	`t.Errorf("expected %s, got %s", principal, in.Principal)`
`220`	`221`	`}`
`221`	`222`	`if in.BucketContext["StorageAccount"] != account {`
`222`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["StorageAccount"])`
	`223`	`+ t.Errorf("expected %s, got %s", account, in.BucketContext["StorageAccount"])`
`223`	`224`	`}`
`224`	`225`	`return &osspec.ProvisionerGrantBucketAccessResponse{`
`225`	`226`	`Principal: principal,`
`@@ -406,8 +407,8 @@ func TestDelete(t *testing.T) {`
`406`	`407`	`if in.BucketName != bucketName {`
`407`	`408`	`t.Errorf("expected %s, got %s", bucketName, in.BucketName)`
`408`	`409`	`}`
`409`		`- if in.Region != region {`
`410`		`- t.Errorf("expected %s, got %s", region, in.Region)`
	`410`	`+ if in.BucketContext["Region"] != region {`
	`411`	`+ t.Errorf("expected %s, got %s", region, in.BucketContext["Region"])`
`411`	`412`	`}`
`412`	`413`	`if in.Principal != principal {`
`413`	`414`	`t.Errorf("expected %s, got %s", principal, in.Principal)`
`@@ -444,13 +445,13 @@ func TestDelete(t *testing.T) {`
`444`	`445`	`t.Errorf("expected %s, got %s", principal, in.Principal)`
`445`	`446`	`}`
`446`	`447`	`if in.BucketContext["ServiceAccount"] != account {`
`447`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["ServiceAccount"])`
	`448`	`+ t.Errorf("expected %s, got %s", account, in.BucketContext["ServiceAccount"])`
`448`	`449`	`}`
`449`	`450`	`if in.BucketContext["PrivateKeyName"] != keyName {`
`450`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["PrivateKeyName"])`
	`451`	`+ t.Errorf("expected %s, got %s", keyName, in.BucketContext["PrivateKeyName"])`
`451`	`452`	`}`
`452`	`453`	`if in.BucketContext["ProjectID"] != projID {`
`453`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["ProjectID"])`
	`454`	`+ t.Errorf("expected %s, got %s", projID, in.BucketContext["ProjectID"])`
`454`	`455`	`}`
`455`	`456`	`return &osspec.ProvisionerRevokeBucketAccessResponse{}, nil`
`456`	`457`	`},`
`@@ -473,7 +474,7 @@ func TestDelete(t *testing.T) {`
`473`	`474`	`t.Errorf("expected %s, got %s", principal, in.Principal)`
`474`	`475`	`}`
`475`	`476`	`if in.BucketContext["StorageAccount"] != account {`
`476`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["StorageAccount"])`
	`477`	`+ t.Errorf("expected %s, got %s", account, in.BucketContext["StorageAccount"])`
`477`	`478`	`}`
`478`	`479`	`return &osspec.ProvisionerRevokeBucketAccessResponse{}, nil`
`479`	`480`	`},`
`@@ -495,8 +496,8 @@ func TestDelete(t *testing.T) {`
`495`	`496`	`if in.BucketName != bucketName {`
`496`	`497`	`t.Errorf("expected %s, got %s", bucketName, in.BucketName)`
`497`	`498`	`}`
`498`		`- if in.Region != region {`
`499`		`- t.Errorf("expected %s, got %s", region, in.Region)`
	`499`	`+ if in.BucketContext["Region"] != region {`
	`500`	`+ t.Errorf("expected %s, got %s", region, in.BucketContext["Region"])`
`500`	`501`	`}`
`501`	`502`	`if in.Principal != principal {`
`502`	`503`	`t.Errorf("expected %s, got %s", principal, in.Principal)`