Change plugin config to expect optional minimum lua version string

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.1.0.dev1
+current_version = 2.1.0.dev2
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?

common/src/main/python/dlpx/virtualization/common/VERSION

@@ -1 +1 @@
-2.1.0.dev1
+2.1.0.dev2

dvp/src/main/python/dlpx/virtualization/VERSION

@@ -1 +1 @@
-2.1.0.dev1
+2.1.0.dev2

libs/src/main/python/dlpx/virtualization/libs/VERSION

@@ -1 +1 @@
-2.1.0.dev1
+2.1.0.dev2

platform/src/main/python/dlpx/virtualization/platform/VERSION

@@ -1 +1 @@
-2.1.0.dev1
+2.1.0.dev2

tools/src/main/python/dlpx/virtualization/_internal/VERSION

@@ -1 +1 @@
-2.1.0.dev1
+2.1.0.dev2

tools/src/main/python/dlpx/virtualization/_internal/commands/build.py

@@ -217,6 +217,9 @@ def prepare_upload_artifact(plugin_config_content, src_dir, schemas, manifest):
     if plugin_config_content.get('luaName'):
         artifact['luaName'] = plugin_config_content['luaName']
 
+    if plugin_config_content.get('minimumLuaVersion'):
+        artifact['minimumLuaVersion'] = plugin_config_content['minimumLuaVersion']
+
     return artifact
 
 

tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_config_schema.json

@@ -54,6 +54,10 @@
       "luaName":  {
           "type": "string",
           "pattern": "^[a-z0-9_:-]+$"
+      },
+      "minimumLuaVersion": {
+          "type": "string",
+          "pattern": "^([0-9]+)\\.([0-9]+)\\.([a-zA-Z0-9_]+)$"
       }
     },
     "additionalProperties": false,

tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_config_schema_no_id_validation.json

@@ -53,6 +53,10 @@
       "luaName":  {
           "type": "string",
           "pattern": "^[a-z0-9_:-]+$"
+      },
+      "minimumLuaVersion": {
+          "type": "string",
+          "pattern": "^([0-9]+)\\.([0-9]+)\\.([a-zA-Z0-9_]+)$"
       }
     },
     "additionalProperties": false,

tools/src/test/python/dlpx/virtualization/_internal/commands/test_build.py

@@ -662,3 +662,15 @@ def test_lua_name_parameter(plugin_config_content, src_dir,
         upload_artifact = build.prepare_upload_artifact(
             plugin_config_content, src_dir, schema_content, {})
         assert expected == upload_artifact.get('luaName')
+
+    @staticmethod
+    @pytest.mark.parametrize('minimum_lua_version, expected', [
+        pytest.param('2.3.4', '2.3.4'),
+        pytest.param(None, None)
+    ])
+    def test_minimum_lua_version_parameter(plugin_config_content, src_dir,
+                                           schema_content, expected):
+        upload_artifact = build.prepare_upload_artifact(
+            plugin_config_content, src_dir, schema_content, {})
+        assert expected == upload_artifact.get('minimumLuaVersion')
+

tools/src/test/python/dlpx/virtualization/_internal/conftest.py

@@ -171,7 +171,8 @@ def artifact_file_created():
 @pytest.fixture
 def plugin_config_content(plugin_id, plugin_name, external_version, language,
                           host_types, plugin_type, entry_point, src_dir,
-                          schema_file, manual_discovery, build_number, lua_name):
+                          schema_file, manual_discovery, build_number, lua_name,
+                          minimum_lua_version):
     """
     This fixutre creates the dict expected in the properties yaml file the
     customer must provide for the build and compile commands.
@@ -219,6 +220,9 @@ def plugin_config_content(plugin_id, plugin_name, external_version, language,
     if lua_name:
         config['luaName'] = lua_name
 
+    if minimum_lua_version:
+        config['minimumLuaVersion'] = minimum_lua_version
+
     return config
 
 
@@ -282,6 +286,11 @@ def lua_name():
     return 'lua-toolkit-1'
 
 
+@pytest.fixture
+def minimum_lua_version():
+    return "2.3.4"
+
+
 @pytest.fixture
 def artifact_manual_discovery():
     return True
@@ -570,6 +579,7 @@ def basic_artifact_content(engine_api, virtual_source_definition,
         'rootSquashEnabled': True,
         'buildNumber': '2',
         'luaName': 'lua-toolkit-1',
+        'minimumLuaVersion': '2.3.4',
         'sourceCode': 'UEsFBgAAAAAAAAAAAAAAAAAAAAAAAA==',
         'manifest': {}
     }
@@ -618,6 +628,7 @@ def artifact_content(engine_api, virtual_source_definition,
         'rootSquashEnabled': True,
         'buildNumber': '2',
         'luaName': 'lua-toolkit-1',
+        'minimumLuaVersion': '2.3.4',
         'manifest': {}
     }
 

tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py

@@ -10,7 +10,7 @@
 class TestPackageUtil:
     @staticmethod
     def test_get_version():
-        assert package_util.get_version() == '2.1.0.dev1'
+        assert package_util.get_version() == '2.1.0.dev2'
 
     @staticmethod
     def test_get_virtualization_api_version():

tools/src/test/python/dlpx/virtualization/_internal/test_plugin_validator.py

@@ -189,3 +189,21 @@ def test_plugin_lua_name_format(src_dir, plugin_config_file,
         except exceptions.SchemaValidationError as err_info:
             message = err_info.message
             assert expected in message
+
+    @staticmethod
+    @mock.patch('os.path.isabs', return_value=False)
+    @pytest.mark.parametrize('minimum_lua_version, expected', [
+        ('1-2-3', "'1-2-3' does not match"),
+        ('version1.0!', "'version1.0!' does not match"),
+        (None, "should never get here")
+    ])
+    def test_plugin_minimum_lua_version_format(src_dir, plugin_config_file,
+                                               plugin_config_content, expected):
+        try:
+            validator = PluginValidator.from_config_content(
+                plugin_config_file, plugin_config_content,
+                const.PLUGIN_CONFIG_SCHEMA)
+            validator.validate_plugin_config()
+        except exceptions.SchemaValidationError as err_info:
+            message = err_info.message
+            assert expected in message