mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-18 04:10:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: change variable name from path to metaDataPath

Browse Source 
path is used by standard package.

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
This commit is contained in:
Prasanna Kumar Kalever 2021-06-04 11:54:52 +05:30 committed by mergify[bot]
parent 94c5c5e119
commit 70998571aa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/rbd/rbd_util.go
View File

@ -1395,7 +1395,7 @@ func (ri *rbdImageMetadataStash) String() string {
// stashRBDImageMetadata stashes required fields into the stashFileName at the passed in path, in // stashRBDImageMetadata stashes required fields into the stashFileName at the passed in path, in
// JSON format. // JSON format.
func stashRBDImageMetadata(volOptions *rbdVolume, path string) error { func stashRBDImageMetadata(volOptions *rbdVolume, metaDataPath string) error {
imgMeta := rbdImageMetadataStash{ imgMeta := rbdImageMetadataStash{
// there are no checks for this at present // there are no checks for this at present
Version: 3, // nolint:gomnd // number specifies version. Version: 3, // nolint:gomnd // number specifies version.
@ -1416,7 +1416,7 @@ func stashRBDImageMetadata(volOptions *rbdVolume, path string) error {
return fmt.Errorf("failed to marshall JSON image metadata for image (%s): %w", volOptions, err) return fmt.Errorf("failed to marshall JSON image metadata for image (%s): %w", volOptions, err)
} }
fPath := filepath.Join(path, stashFileName) fPath := filepath.Join(metaDataPath, stashFileName)
err = ioutil.WriteFile(fPath, encodedBytes, 0o600) err = ioutil.WriteFile(fPath, encodedBytes, 0o600)
if err != nil { if err != nil {
return fmt.Errorf("failed to stash JSON image metadata for image (%s) at path (%s): %w", volOptions, fPath, err) return fmt.Errorf("failed to stash JSON image metadata for image (%s) at path (%s): %w", volOptions, fPath, err)
@ -1426,10 +1426,10 @@ func stashRBDImageMetadata(volOptions *rbdVolume, path string) error {
} }
// lookupRBDImageMetadataStash reads and returns stashed image metadata at passed in path. // lookupRBDImageMetadataStash reads and returns stashed image metadata at passed in path.
func lookupRBDImageMetadataStash(path string) (rbdImageMetadataStash, error) { func lookupRBDImageMetadataStash(metaDataPath string) (rbdImageMetadataStash, error) {
var imgMeta rbdImageMetadataStash var imgMeta rbdImageMetadataStash
fPath := filepath.Join(path, stashFileName) fPath := filepath.Join(metaDataPath, stashFileName)
encodedBytes, err := ioutil.ReadFile(fPath) // #nosec - intended reading from fPath encodedBytes, err := ioutil.ReadFile(fPath) // #nosec - intended reading from fPath
if err != nil { if err != nil {
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
@ -1448,8 +1448,8 @@ func lookupRBDImageMetadataStash(path string) (rbdImageMetadataStash, error) {
} }
// cleanupRBDImageMetadataStash cleans up any stashed metadata at passed in path. // cleanupRBDImageMetadataStash cleans up any stashed metadata at passed in path.
func cleanupRBDImageMetadataStash(path string) error { func cleanupRBDImageMetadataStash(metaDataPath string) error {
fPath := filepath.Join(path, stashFileName) fPath := filepath.Join(metaDataPath, stashFileName)
if err := os.Remove(fPath); err != nil { if err := os.Remove(fPath); err != nil {
return fmt.Errorf("failed to cleanup stashed JSON data (%s): %w", fPath, err) return fmt.Errorf("failed to cleanup stashed JSON data (%s): %w", fPath, err)
} }