FEATURE: make the minor version of a distro available as an attribute

Author: bsanders

common/src/stack/command/stack/commands/list/attr/plugin_host_intrinsic.py

@@ -70,6 +70,7 @@ def run(self, scope_mappings):
 				# First the pallets
 				pallets = []
 				os_version = None
+				minor_version = None
 				for name, version, rel, pallet_os in self.db.select("""
 					rolls.name, rolls.version, rolls.rel, rolls.os
 					FROM rolls
@@ -81,14 +82,19 @@ def run(self, scope_mappings):
 						# the attr os.version is '{major_version}.x'
 						# release is now '{OS}{major_version}'
 						if pallet_os in rel:
-							os_version = f'{rel.replace(pallet_os, "")}.x'
+							major_version = rel.replace(pallet_os, "")
+							os_version = f'{major_version}.x'
+							# take the version field and carve away the major version, stripping remaining leading dots.
+							# note, this may stay '' in some cases (Fedora, inital releases of ubuntu, sles15, ...)
+							minor_version = f'{version.replace(major_version, "")}'.lstrip('.')
 						# fedora's OS is 'redhat' ...
 						elif name.lower() in rel:
 							os_version = f'{rel.replace(name.lower(), "")}.x'
 
 				for hostname in box_map[box_id]:
 					output_rows.append([hostname, 'host', 'const', 'pallets', pallets])
 					output_rows.append([hostname, 'host', 'const', 'os.version', os_version])
+					output_rows.append([hostname, 'host', 'const', 'os.minor_version', minor_version])
 
 				# Then the carts
 				carts = flatten(self.db.select("""

test-framework/test-suites/integration/tests/list/test_list_host_attr.py

@@ -306,3 +306,32 @@ def test_regression_shadow_glob_interaction(self, host, add_host):
 			'stack list host attr a:backend attr=time.* output-format=json'
 		)
 		assert result.rc == 0
+
+	def test_const_determined_correctly(self, host):
+		result = host.run('stack list host attr localhost attr=os* output-format=json')
+		assert result.rc == 0
+		attrs = json.loads(result.stdout)
+
+		stacki_os_attributes = {}
+
+		for this_attr in attrs:
+			if this_attr['attr'] == 'os':
+				stacki_os_attributes['os'] = this_attr['value']
+			elif this_attr['attr'] == 'os.version':
+				stacki_os_attributes['os.version'] = this_attr['value']
+			elif this_attr['attr'] == 'os.minor_version':
+				stacki_os_attributes['os.minor_version'] = this_attr['value']
+
+		expected_keys = ('os', 'os.version', 'os.minor_version')
+		assert set(expected_keys) == set(stacki_os_attributes.keys())
+
+		expected_values = itemgetter(*expected_keys)(stacki_os_attributes)
+
+		distro, rel = host.system_info.distribution, host.system_info.release
+		if (distro, rel) == ('sles', '12.3'):
+			assert ('sles', '12.x', 'sp3') == expected_values
+		if (distro, rel) == ('sles', '15.1'):
+			assert ('sles', '15.x', 'sp1') == expected_values
+		elif (distro, rel) == ('centos', '7'):
+			assert ('redhat', '7.x', '6') == expected_values
+		# TODO Ubuntu