adding in none

Author: vilit1

src/azure-cli-core/azure/cli/core/profiles/_shared.py

@@ -427,6 +427,8 @@ def supported_api_version(api_profile, resource_type, min_api=None, max_api=None
     Returns True if current API version for the resource type satisfies min/max range.
     To compare profile versions, set resource type to None.
     Can return a tuple<operation_group, bool> if the resource_type supports SDKProfile.
+    note: if the api_version for the given profile is None (inherrited from the SDK), returns True
+    as there is no easy way to extract the api version.
     note: Currently supports YYYY-MM-DD, YYYY-MM-DD-preview, YYYY-MM-DD-profile
     or YYYY-MM-DD-profile-preview  formatted strings.
     """
@@ -438,6 +440,8 @@ def supported_api_version(api_profile, resource_type, min_api=None, max_api=None
         if isinstance(resource_type, (ResourceType, CustomResourceType)) else api_profile
     if isinstance(api_version_obj, SDKProfile):
         api_version_obj = api_version_obj.profile.get(operation_group or '', api_version_obj.default_api_version)
+    if not api_version_obj:
+        return True
     return _validate_api_version(api_version_obj, min_api, max_api)
 
 

src/azure-cli-core/azure/cli/core/tests/test_api_profiles.py

@@ -133,6 +133,13 @@ def test_supported_api_version_min_constraint_mixed_type(self):
         with mock.patch('azure.cli.core.profiles._shared.AZURE_API_PROFILES', test_profile):
             self.assertTrue(supported_api_version(cli, ResourceType.MGMT_KEYVAULT, min_api='2016-06-04'))
 
+    def test_supported_api_version_min_constraint_none(self):
+        cli = DummyCli()
+        cli.cloud = Cloud('TestCloud', profile='2017-01-01-profile')
+        test_profile = {'2017-01-01-profile': {ResourceType.MGMT_STORAGE: None}}
+        with mock.patch('azure.cli.core.profiles._shared.AZURE_API_PROFILES', test_profile):
+            self.assertTrue(supported_api_version(cli, ResourceType.MGMT_STORAGE, min_api='2000-01-01'))
+
     def test_supported_api_version_max_constraint(self):
         cli = DummyCli()
         cli.cloud = Cloud('TestCloud', profile='2017-01-01-profile')
@@ -154,6 +161,13 @@ def test_supported_api_version_max_constraint_mixed_type(self):
         with mock.patch('azure.cli.core.profiles._shared.AZURE_API_PROFILES', test_profile):
             self.assertTrue(supported_api_version(cli, ResourceType.MGMT_KEYVAULT, max_api='8.0'))
 
+    def test_supported_api_version_max_constraint_none(self):
+        cli = DummyCli()
+        cli.cloud = Cloud('TestCloud', profile='2017-01-01-profile')
+        test_profile = {'2017-01-01-profile': {ResourceType.MGMT_STORAGE: None}}
+        with mock.patch('azure.cli.core.profiles._shared.AZURE_API_PROFILES', test_profile):
+            self.assertTrue(supported_api_version(cli, ResourceType.MGMT_STORAGE, max_api='2021-01-01'))
+
     def test_supported_api_version_min_max_constraint(self):
         cli = DummyCli()
         cli.cloud = Cloud('TestCloud', profile='2017-01-01-profile')
@@ -170,6 +184,14 @@ def test_supported_api_version_min_max_constraint_semver(self):
             self.assertTrue(
                 supported_api_version(cli, ResourceType.MGMT_KEYVAULT, min_api='6.0', max_api='8.0'))
 
+    def test_supported_api_version_min_max_constraint_none(self):
+        cli = DummyCli()
+        cli.cloud = Cloud('TestCloud', profile='2017-01-01-profile')
+        test_profile = {'2017-01-01-profile': {ResourceType.MGMT_STORAGE: None}}
+        with mock.patch('azure.cli.core.profiles._shared.AZURE_API_PROFILES', test_profile):
+            self.assertTrue(
+                supported_api_version(cli, ResourceType.MGMT_STORAGE, min_api='2000-01-01', max_api='2021-01-01'))
+
     def test_supported_api_version_max_constraint_not_supported(self):
         cli = DummyCli()
         cli.cloud = Cloud('TestCloud', profile='2017-01-01-profile')