Fix spec handler and change internal name for fs format options

Signed-off-by: Prince <[email protected]>
libopenstorage · Dec 14, 2023 · 945a3ea · 945a3ea
1 parent 14c3328
commit 945a3ea
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/SDK_CHANGELOG.md b/SDK_CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Releases
 
+### v0.174.0 - (12/12/2023)
+
+* Fix spec handler and internal naming for fs format options
+
 ### v0.173.0 - (11/13/2023)
 
 * Add DefragJob data structure

diff --git a/api/api.go b/api/api.go
@@ -66,7 +66,7 @@ const (
 	SpecExportOptionsEmpty          = "empty_export_options"
 	SpecMountOptions                = "mount_options"
 	// spec key cannot change due to parity with existing PSO storageclasses
-	SpecFaCreateOptions      = "createoptions"
+	SpecFsFormatOptions      = "createoptions"
 	SpecCSIMountOptions      = "csi_mount_options"
 	SpecSharedv4MountOptions = "sharedv4_mount_options"
 	SpecProxyProtocolS3      = "s3"

diff --git a/api/api.pb.go b/api/api.pb.go
diff --git a/api/api.proto b/api/api.proto
@@ -5628,7 +5628,7 @@ message SdkVersion {
     // SDK version major value of this specification
     Major = 0;
     // SDK version minor value of this specification
-    Minor = 173;
+    Minor = 174;
     // SDK version patch value of this specification
     Patch = 0;
   }

diff --git a/api/server/sdk/api/api.swagger.json b/api/server/sdk/api/api.swagger.json
diff --git a/api/spec/spec_handler.go b/api/spec/spec_handler.go
@@ -161,6 +161,7 @@ var (
 	SpecIoThrottleRdBWRegex       = regexp.MustCompile(api.SpecIoThrottleRdBW + "=([0-9]+),?")
 	SpecIoThrottleWrBWRegex       = regexp.MustCompile(api.SpecIoThrottleWrBW + "=([0-9]+),?")
 	ReadaheadRegex                = regexp.MustCompile(api.SpecReadahead + "=([A-Za-z]+),?")
+	SpecFsFormatOptionsRegex      = regexp.MustCompile(api.SpecFsFormatOptions + "=([0-9A-Za-z_@:./#&+-=]+),?")
 )
 
 type specHandler struct {
@@ -201,10 +202,10 @@ func (d *specHandler) getVal(r *regexp.Regexp, str string) (bool, string) {
 
 func (d *specHandler) DefaultSpec() *api.VolumeSpec {
 	return &api.VolumeSpec{
-		Format:    api.FSType_FS_TYPE_EXT4,
-		HaLevel:   1,
-		IoProfile: api.IoProfile_IO_PROFILE_AUTO,
-		Xattr:     api.Xattr_COW_ON_DEMAND,
+		Format:       api.FSType_FS_TYPE_EXT4,
+		HaLevel:      1,
+		IoProfile:    api.IoProfile_IO_PROFILE_AUTO,
+		Xattr:        api.Xattr_COW_ON_DEMAND,
 		FpPreference: true,
 	}
 }
@@ -545,7 +546,7 @@ func (d *specHandler) UpdateSpecFromOpts(opts map[string]string, spec *api.Volum
 				return nil, nil, nil, fmt.Errorf("invalid mount options format %v", v)
 			}
 			spec.MountOptions.Options = options
-		case api.SpecFaCreateOptions:
+		case api.SpecFsFormatOptions:
 			spec.FaCreateOptions = v
 		case api.SpecSharedv4MountOptions:
 			if spec.Sharedv4MountOptions == nil {
@@ -931,6 +932,9 @@ func (d *specHandler) SpecOptsFromString(
 	if ok, ioThrottleBW := d.getVal(SpecIoThrottleWrBWRegex, str); ok {
 		opts[api.SpecIoThrottleWrBW] = ioThrottleBW
 	}
+	if ok, fsFormatOptions := d.getVal(SpecFsFormatOptionsRegex, str); ok {
+		opts[api.SpecFsFormatOptions] = fsFormatOptions
+	}
 	return true, opts, name
 }