Merge remote-tracking branch 'origin' into pr/33

amazon-ec2-utils.spec

@@ -77,8 +77,10 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Jan 18 2024 Keith Gable <gablk@amazon.com> - 2.2.0-1
 - Corrected issue where an ec2-metadata error was written to stdout
+- Change ec2nvme-nsid to use Bash string manipulation to improve
+  performance and reliability
 
-* Mon Jun  5 2023 Guillaume Delacour <delacoug@amazon.com> - 2.2.0-1
+* Mon Jun 5 2023 Guillaume Delacour <delacoug@amazon.com> - 2.2.0-1
 - Add `--quiet` option to `ec2-metadata --help` output
 - Add `-R`/`--region` option to `ec2-metadata` to discover the EC2 instance's region
 

ec2nvme-nsid

@@ -6,11 +6,18 @@
 # for the specific language governing permissions and limitations under
 # the License.
 
-#Expected input if partition's kernel name like nvme0n1p2
-if [ $# -eq 0 ] ; then
+# Expected input is partition's kernel name like nvme0n1p2 or nvme0n1, output would be 1
+
+if [[ $# -ne 1 ]]; then
   exit 1
 else
-  # extract ns id from partition's kernel name and export it
-  NSID=$(echo -n "$@" | cut -f 3 -d 'n' | cut -f 1 -d 'p')
+  kernel_name=$1
+
+  # Remove nvme prefix (also deals with any /dev that might accidentally get passed in)
+  prefix_removed=${kernel_name#*nvme*n}
+
+  # Remove partition suffix
+  NSID=${prefix_removed%p*}
+
   echo "_NS_ID=${NSID}"
 fi