Merge branch 'main' into toachris/add-az-id

Author: ziggythehamster

amazon-ec2-utils.spec

@@ -15,6 +15,7 @@ Source24:  ebsnvme-id
 Source25:  51-ec2-xen-vbd-devices.rules
 Source26:  53-ec2-read-ahead-kb.rules
 Source27:  51-ec2-ena-ptp-device.rules
+Source28:  ebsnvme
 
 URL:       https://github.com/aws/amazon-ec2-utils
 BuildArch: noarch
@@ -39,16 +40,18 @@ amazon-ec2-utils contains a set of utilities for running in ec2.
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir}
-mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/
 
 install -m755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sbindir}
+install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}
 install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_udevrulesdir}
+install -m755 %{SOURCE24} $RPM_BUILD_ROOT%{_sbindir}
 install -m644 %{SOURCE25} $RPM_BUILD_ROOT%{_udevrulesdir}
 install -m644 %{SOURCE26} $RPM_BUILD_ROOT%{_udevrulesdir}
 install -m644 %{SOURCE27} $RPM_BUILD_ROOT%{_udevrulesdir}
+install -m755 %{SOURCE28} $RPM_BUILD_ROOT%{_sbindir}
 # Install 60-cdrom_id.rules to /etc rather than %{_udevrulesdir}
 # because it is intended as an override of a systemd-provided rules
 # file:
@@ -57,7 +60,6 @@ install -m644 %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
 #udev rules for nvme block devices and supporting scripts
 install -m644 %{SOURCE22} $RPM_BUILD_ROOT%{_udevrulesdir}
 install -m755 %{SOURCE23} $RPM_BUILD_ROOT%{_sbindir}/ec2nvme-nsid
-install -m755 %{SOURCE24} $RPM_BUILD_ROOT/%{_sbindir}
 
 %check
 %{python3} -m py_compile %{SOURCE24}
@@ -68,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %{_bindir}/ec2-metadata
 %{_sbindir}/ec2nvme-nsid
+%{_sbindir}/ebsnvme
 %{_sbindir}/ebsnvme-id
 %{_sbindir}/ec2udev-vbd
 /usr/lib/udev/rules.d/51-ec2-ena-ptp-device.rules

doc/ec2-metadata.8

@@ -119,6 +119,9 @@ Print EC2 resource tags if permitted in EC2 Instance Metadata Options.
 .B \-\-quiet
 Don't print metadata keys
 .TP
+.B \-\-path
+Show metadata information from the specified path.  Can be specified multiple times.
+.TP
 .B \-h, \-\-help
 Show summary of options.
 .SH SEE ALSO

ebsnvme-id

@@ -0,0 +1 @@
+ebsnvme

ebsnvme-id

@@ -8,7 +8,7 @@
 
 function print_help()
 {
-echo "ec2-metadata v0.1.6
+echo "ec2-metadata v0.1.3
 Use to retrieve EC2 instance metadata from within a running EC2 instance.
 e.g. to retrieve instance id: ec2-metadata -i
 		 to retrieve ami id: ec2-metadata -a
@@ -43,11 +43,13 @@ Options:
 -s/--security-groups      Names of the security groups the instance is launched in. Only available if supplied at instance launch time
 -d/--user-data            User-supplied data.Only available if supplied at instance launch time.
 -g/--tags                 Tags assigned to this instance.
---quiet                   Suppress tag keys from the output."
+--quiet                   Suppress tag keys from the output.
+--path                    Show metadata information from the specified path.  Can be specified multiple times."
 }
 
 METADATA_BASEURL="http://169.254.169.254"
 METADATA_TOKEN_PATH="latest/api/token"
+METADATA_VERSION="latest"
 QUIET=""
 
 function set_imds_token()
@@ -65,7 +67,7 @@ function set_imds_token()
 function get_meta()
 {
 	local imds_out
-	imds_out=$(curl -s -q -H "X-aws-ec2-metadata-token:${IMDS_TOKEN}" -f ${METADATA_BASEURL}/latest/${1})
+	imds_out=$(curl -s -q -H "X-aws-ec2-metadata-token:${IMDS_TOKEN}" -f ${METADATA_BASEURL}/${METADATA_VERSION}/${1})
 	echo -n "${imds_out}"
 }
 
@@ -160,6 +162,27 @@ function print_all()
 	print_tags
 }
 
+function print_path()
+{
+	local path
+
+	path=$(echo "$1" | sed 's/\/\+/\//g')
+
+	if [[ ! "$path" =~ (^/$|^/?(1\.0|[0-9]{4}-[0-9]{2}-[0-9]{2}|latest)) ]]; then
+		if [[ "$path" =~ ^/?(dynamic|meta-data) ]]; then
+			path="latest/$path"
+		else
+			path="latest/meta-data/$path"
+		fi
+	fi
+
+	path=$(echo "$path" | sed 's/\/\+/\//g')
+
+	METADATA_VERSION=""
+	print_normal_metric "$path" "$path"
+	METADATA_VERSION="latest"
+}
+
 #check if run inside an EC2 instance
 set_imds_token
 
@@ -169,11 +192,12 @@ if [ "$#" -eq 0 ]; then
 fi
 
 declare -a actions
+declare -a paths
 shortopts=almnDbithokzZPcpvuresdgR
 longopts=(ami-id ami-launch-index ami-manifest-path ancestor-ami-ids aws-domain block-device-mapping
           instance-id instance-type local-hostname local-ipv4 kernel-id availability-zone availability-zone-id
           partition product-codes public-hostname public-ipv4 public-keys ramdisk-id
-          reservation-id security-groups user-data tags region help all quiet)
+          reservation-id security-groups user-data tags region help all quiet path:)
 
 oldIFS="$IFS"
 IFS=,
@@ -196,6 +220,11 @@ while true; do
         --quiet)
             QUIET=1 ; shift
             ;;
+        --path)
+            actions+=("$1")
+            paths+=("$2")
+            shift 2
+            ;;
         --)
             shift ; break
             ;;
@@ -238,6 +267,7 @@ for action in "${actions[@]}"; do
 	    -s | --security-groups )       print_normal_metric security-groups meta-data/security-groups ;;
 	    -d | --user-data )             print_normal_metric user-data user-data ;;
 	    -g | --tags )                  print_tags ;;
+	    --path )                       print_path "${paths[0]}"; paths=("${paths[@]:1}") ;;
 	    --all )                        print_all; exit ;;
 	esac
 	shift