Address review comments

Author: sujeet01

broker/volumebroker/server/volume_create.go

@@ -101,7 +101,12 @@ func (s *Server) getIronCoreVolumeConfig(_ context.Context, volume *iri.Volume)
 			Encryption:         encryption,
 			VolumeDataSource: storagev1alpha1.VolumeDataSource{
 				VolumeSnapshotRef: volumeSnapshotRef,
-				OSImage:           getOSImageIfPresent(image),
+				OSImage: func() *string {
+					if image == "" {
+						return nil
+					}
+					return &image
+				}(),
 			},
 		},
 	}
@@ -115,13 +120,6 @@ func (s *Server) getIronCoreVolumeConfig(_ context.Context, volume *iri.Volume)
 	}, nil
 }
 
-func getOSImageIfPresent(image string) *string {
-	if image == "" {
-		return nil
-	}
-	return &image
-}
-
 func (s *Server) createIronCoreVolume(ctx context.Context, log logr.Logger, volume *AggregateIronCoreVolume) (retErr error) {
 	c, cleanup := s.setupCleaner(ctx, log, &retErr)
 	defer cleanup()

broker/volumebroker/server/volumesnapshot_delete.go

@@ -14,10 +14,10 @@ import (
 )
 
 func (s *Server) DeleteVolumeSnapshot(ctx context.Context, req *iri.DeleteVolumeSnapshotRequest) (*iri.DeleteVolumeSnapshotResponse, error) {
-	volumeSnapshotID := req.VolumeSnapshotId
+	volumeSnapshotID := req.GetVolumeSnapshotId()
 	log := s.loggerFrom(ctx, "VolumeSnapshotID", volumeSnapshotID)
 
-	ironcoreVolumeSnapshot, err := s.getIronCoreVolumeSnapshot(ctx, req.VolumeSnapshotId)
+	ironcoreVolumeSnapshot, err := s.getIronCoreVolumeSnapshot(ctx, volumeSnapshotID)
 	if err != nil {
 		return nil, err
 	}