Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix dereferencing null secrets #563

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix dereferencing null secrets #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 43 additions & 43 deletions pkg/sanity/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
VolumeCapabilities: []*csi.VolumeCapability{
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
}

Expand All @@ -240,7 +240,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo

delReq := &csi.DeleteVolumeRequest{
VolumeId: vol.GetVolume().GetVolumeId(),
Secrets: sc.Secrets.DeleteVolumeSecret,
Secrets: sc.GetDeleteVolumeSecret(),
}

_, err = r.DeleteVolume(context.Background(), delReq)
Expand Down Expand Up @@ -296,7 +296,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
VolumeCapabilities: []*csi.VolumeCapability{
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
}

Expand Down Expand Up @@ -325,7 +325,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
Expect(existing_vols[vol.Volume.VolumeId]).To(BeTrue())
delReq := &csi.DeleteVolumeRequest{
VolumeId: vol.Volume.VolumeId,
Secrets: sc.Secrets.DeleteVolumeSecret,
Secrets: sc.GetDeleteVolumeSecret(),
}

_, err := r.DeleteVolume(context.Background(), delReq)
Expand All @@ -340,7 +340,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
VolumeCapabilities: []*csi.VolumeCapability{
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
}
vol := r.MustCreateVolume(context.Background(), req)
Expand Down Expand Up @@ -374,7 +374,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
rsp, err := r.CreateVolume(
context.Background(),
&csi.CreateVolumeRequest{
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand All @@ -387,7 +387,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
context.Background(),
&csi.CreateVolumeRequest{
Name: name,
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand All @@ -410,7 +410,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
CapacityRange: &csi.CapacityRange{
RequiredBytes: TestVolumeSize(sc),
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand All @@ -431,7 +431,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
CapacityRange: &csi.CapacityRange{
RequiredBytes: TestVolumeSize(sc),
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand Down Expand Up @@ -462,7 +462,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
CapacityRange: &csi.CapacityRange{
RequiredBytes: size,
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand All @@ -479,7 +479,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
CapacityRange: &csi.CapacityRange{
RequiredBytes: size,
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand All @@ -504,7 +504,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
RequiredBytes: size1,
LimitBytes: size1,
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand All @@ -521,7 +521,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
RequiredBytes: size2,
LimitBytes: size2,
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand All @@ -543,7 +543,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
CapacityRange: &csi.CapacityRange{
RequiredBytes: size,
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand Down Expand Up @@ -688,7 +688,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
rsp, err := r.DeleteVolume(
context.Background(),
&csi.DeleteVolumeRequest{
Secrets: sc.Secrets.DeleteVolumeSecret,
Secrets: sc.GetDeleteVolumeSecret(),
},
)
ExpectErrorCode(rsp, err, codes.InvalidArgument)
Expand All @@ -700,7 +700,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
context.Background(),
&csi.DeleteVolumeRequest{
VolumeId: sc.Config.IDGen.GenerateInvalidVolumeID(),
Secrets: sc.Secrets.DeleteVolumeSecret,
Secrets: sc.GetDeleteVolumeSecret(),
},
)
Expect(err).NotTo(HaveOccurred())
Expand All @@ -722,7 +722,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
CapacityRange: &csi.CapacityRange{
RequiredBytes: TestVolumeSize(sc),
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand All @@ -734,7 +734,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
context.Background(),
&csi.DeleteVolumeRequest{
VolumeId: vol.GetVolume().GetVolumeId(),
Secrets: sc.Secrets.DeleteVolumeSecret,
Secrets: sc.GetDeleteVolumeSecret(),
},
)
Expect(err).NotTo(HaveOccurred())
Expand All @@ -747,7 +747,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
rsp, err := r.ValidateVolumeCapabilities(
context.Background(),
&csi.ValidateVolumeCapabilitiesRequest{
Secrets: sc.Secrets.ControllerValidateVolumeCapabilitiesSecret,
Secrets: sc.GetControllerValidateVolumeCapabilitiesSecret(),
})
ExpectErrorCode(rsp, err, codes.InvalidArgument)
})
Expand All @@ -768,7 +768,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
CapacityRange: &csi.CapacityRange{
RequiredBytes: TestVolumeSize(sc),
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand All @@ -778,7 +778,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
&csi.ValidateVolumeCapabilitiesRequest{
VolumeId: vol.GetVolume().GetVolumeId(),
VolumeCapabilities: nil,
Secrets: sc.Secrets.ControllerValidateVolumeCapabilitiesSecret,
Secrets: sc.GetControllerValidateVolumeCapabilitiesSecret(),
})
ExpectErrorCode(rsp, err, codes.InvalidArgument)
})
Expand All @@ -799,7 +799,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
CapacityRange: &csi.CapacityRange{
RequiredBytes: TestVolumeSize(sc),
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand All @@ -813,7 +813,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
VolumeCapabilities: []*csi.VolumeCapability{
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
},
Secrets: sc.Secrets.ControllerValidateVolumeCapabilitiesSecret,
Secrets: sc.GetControllerValidateVolumeCapabilitiesSecret(),
})
Expect(err).NotTo(HaveOccurred())
Expect(valivolcap).NotTo(BeNil())
Expand All @@ -834,7 +834,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
VolumeCapabilities: []*csi.VolumeCapability{
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
},
Secrets: sc.Secrets.ControllerValidateVolumeCapabilitiesSecret,
Secrets: sc.GetControllerValidateVolumeCapabilitiesSecret(),
},
)
ExpectErrorCode(rsp, err, codes.NotFound)
Expand All @@ -853,7 +853,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
rsp, err := r.ControllerPublishVolume(
context.Background(),
&csi.ControllerPublishVolumeRequest{
Secrets: sc.Secrets.ControllerPublishVolumeSecret,
Secrets: sc.GetControllerPublishVolumeSecret(),
},
)
ExpectErrorCode(rsp, err, codes.InvalidArgument)
Expand All @@ -865,7 +865,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
context.Background(),
&csi.ControllerPublishVolumeRequest{
VolumeId: sc.Config.IDGen.GenerateUniqueValidVolumeID(),
Secrets: sc.Secrets.ControllerPublishVolumeSecret,
Secrets: sc.GetControllerPublishVolumeSecret(),
},
)
ExpectErrorCode(rsp, err, codes.InvalidArgument)
Expand All @@ -878,7 +878,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
&csi.ControllerPublishVolumeRequest{
VolumeId: sc.Config.IDGen.GenerateUniqueValidVolumeID(),
NodeId: sc.Config.IDGen.GenerateUniqueValidNodeID(),
Secrets: sc.Secrets.ControllerPublishVolumeSecret,
Secrets: sc.GetControllerPublishVolumeSecret(),
},
)
ExpectErrorCode(rsp, err, codes.InvalidArgument)
Expand Down Expand Up @@ -935,7 +935,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
NodeId: sc.Config.IDGen.GenerateUniqueValidNodeID(),
VolumeCapability: TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
Readonly: false,
Secrets: sc.Secrets.ControllerPublishVolumeSecret,
Secrets: sc.GetControllerPublishVolumeSecret(),
},
)
ExpectErrorCode(conpubvol, err, codes.NotFound)
Expand All @@ -954,7 +954,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
VolumeCapabilities: []*csi.VolumeCapability{
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand All @@ -969,7 +969,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
NodeId: sc.Config.IDGen.GenerateUniqueValidNodeID(),
VolumeCapability: TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
Readonly: false,
Secrets: sc.Secrets.ControllerPublishVolumeSecret,
Secrets: sc.GetControllerPublishVolumeSecret(),
},
)
Expect(err).To(HaveOccurred())
Expand All @@ -996,7 +996,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
VolumeCapabilities: []*csi.VolumeCapability{
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
},
)
Expand All @@ -1017,7 +1017,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
NodeId: nid.GetNodeId(),
VolumeCapability: TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
Readonly: false,
Secrets: sc.Secrets.ControllerPublishVolumeSecret,
Secrets: sc.GetControllerPublishVolumeSecret(),
}

conpubvol := r.MustControllerPublishVolume(context.Background(), pubReq)
Expand Down Expand Up @@ -1058,7 +1058,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
rsp, err := r.ControllerUnpublishVolume(
context.Background(),
&csi.ControllerUnpublishVolumeRequest{
Secrets: sc.Secrets.ControllerUnpublishVolumeSecret,
Secrets: sc.GetControllerUnpublishVolumeSecret(),
},
)
ExpectErrorCode(rsp, err, codes.InvalidArgument)
Expand Down Expand Up @@ -1491,7 +1491,7 @@ var _ = DescribeSanity("ExpandVolume [Controller Server]", func(sc *TestContext)
It("should fail if no capacity range is given", func() {
expReq := &csi.ControllerExpandVolumeRequest{
VolumeId: "",
Secrets: sc.Secrets.ControllerExpandVolumeSecret,
Secrets: sc.GetControllerExpandVolumeSecret(),
}
rsp, err := r.ControllerExpandVolume(context.Background(), expReq)
ExpectErrorCode(rsp, err, codes.InvalidArgument)
Expand All @@ -1509,7 +1509,7 @@ var _ = DescribeSanity("ExpandVolume [Controller Server]", func(sc *TestContext)
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
},
Parameters: sc.Config.TestVolumeParameters,
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
CapacityRange: &csi.CapacityRange{
RequiredBytes: TestVolumeSize(sc),
},
Expand Down Expand Up @@ -1569,7 +1569,7 @@ var _ = DescribeSanity("ModifyVolume [Controller Server]", func(sc *TestContext)
MutableParameters: map[string]string{
"XXX_FakeKey": "XXX_FakeValue",
},
Secrets: sc.Secrets.ControllerModifyVolumeSecret,
Secrets: sc.GetControllerModifyVolumeSecret(),
}
rsp, err := r.ControllerModifyVolume(context.Background(), modifyReq)
ExpectErrorCode(rsp, err, codes.InvalidArgument)
Expand Down Expand Up @@ -1623,7 +1623,7 @@ var _ = DescribeSanity("ModifyVolume [Controller Server]", func(sc *TestContext)
MutableParameters: map[string]string{
"XXX_FakeKey": "XXX_FakeValue",
},
Secrets: sc.Secrets.ControllerModifyVolumeSecret,
Secrets: sc.GetControllerModifyVolumeSecret(),
}
rsp, err := r.ControllerModifyVolume(context.Background(), modifyReq)
ExpectErrorCode(rsp, err, codes.InvalidArgument)
Expand Down Expand Up @@ -1697,7 +1697,7 @@ func MakeControllerPublishVolumeReq(sc *TestContext, volID, nodeID string) *csi.
NodeId: nodeID,
VolumeCapability: TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
Readonly: false,
Secrets: sc.Secrets.ControllerPublishVolumeSecret,
Secrets: sc.GetControllerPublishVolumeSecret(),
}
}

Expand All @@ -1706,7 +1706,7 @@ func MakeControllerUnpublishVolumeReq(sc *TestContext, volID, nodeID string) *cs
return &csi.ControllerUnpublishVolumeRequest{
VolumeId: volID,
NodeId: nodeID,
Secrets: sc.Secrets.ControllerUnpublishVolumeSecret,
Secrets: sc.GetControllerUnpublishVolumeSecret(),
}
}

Expand All @@ -1717,7 +1717,7 @@ func MakeExpandVolumeReq(sc *TestContext, volID string) *csi.ControllerExpandVol
CapacityRange: &csi.CapacityRange{
RequiredBytes: TestVolumeExpandSize(sc),
},
Secrets: sc.Secrets.ControllerExpandVolumeSecret,
Secrets: sc.GetControllerExpandVolumeSecret(),
VolumeCapability: TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
}
}
Expand All @@ -1727,7 +1727,7 @@ func MakeModifyVolumeReq(sc *TestContext, volID string) *csi.ControllerModifyVol
return &csi.ControllerModifyVolumeRequest{
VolumeId: volID,
MutableParameters: sc.Config.TestVolumeMutableParameters,
Secrets: sc.Secrets.ControllerModifyVolumeSecret,
Secrets: sc.GetControllerModifyVolumeSecret(),
}
}

Expand Down Expand Up @@ -1762,7 +1762,7 @@ func VolumeLifecycle(r *Resources, sc *TestContext, count int) {
VolumeCapabilities: []*csi.VolumeCapability{
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
},
Secrets: sc.Secrets.CreateVolumeSecret,
Secrets: sc.GetCreateVolumeSecret(),
Parameters: sc.Config.TestVolumeParameters,
AccessibilityRequirements: accReqs,
},
Expand All @@ -1779,7 +1779,7 @@ func VolumeLifecycle(r *Resources, sc *TestContext, count int) {
VolumeCapability: TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
VolumeContext: vol.GetVolume().GetVolumeContext(),
Readonly: false,
Secrets: sc.Secrets.ControllerPublishVolumeSecret,
Secrets: sc.GetControllerPublishVolumeSecret(),
},
)
}
Expand Down
Loading