diff --git a/tools/src/main/python/dlpx/virtualization/_internal/commands/build.py b/tools/src/main/python/dlpx/virtualization/_internal/commands/build.py index 82d6cd80..79c353a5 100644 --- a/tools/src/main/python/dlpx/virtualization/_internal/commands/build.py +++ b/tools/src/main/python/dlpx/virtualization/_internal/commands/build.py @@ -214,9 +214,6 @@ def prepare_upload_artifact(plugin_config_content, src_dir, schemas, manifest): if plugin_config_content.get('externalVersion'): artifact['externalVersion'] = plugin_config_content['externalVersion'] - if plugin_config_content.get('luaName'): - artifact['luaName'] = plugin_config_content['luaName'] - return artifact diff --git a/tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_config_schema.json b/tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_config_schema.json index cf1ab003..5d49e478 100644 --- a/tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_config_schema.json +++ b/tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_config_schema.json @@ -50,10 +50,6 @@ "buildNumber": { "type": "string", "pattern": "^([0-9]+\\.)*[0-9]*[1-9][0-9]*(\\.[0-9]+)*$" - }, - "luaName": { - "type": "string", - "pattern": "^[a-z0-9_:-]+$" } }, "additionalProperties": false, diff --git a/tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_config_schema_no_id_validation.json b/tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_config_schema_no_id_validation.json index 62fd92df..703382fa 100644 --- a/tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_config_schema_no_id_validation.json +++ b/tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_config_schema_no_id_validation.json @@ -49,10 +49,6 @@ "buildNumber": { "type": "string", "pattern": "^([0-9]+\\.)*[0-9]*[1-9][0-9]*(\\.[0-9]+)*$" - }, - "luaName": { - "type": "string", - "pattern": "^[a-z0-9_:-]+$" } }, "additionalProperties": false, diff --git a/tools/src/test/python/dlpx/virtualization/_internal/commands/test_build.py b/tools/src/test/python/dlpx/virtualization/_internal/commands/test_build.py index 36608887..7e4271b1 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/commands/test_build.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/commands/test_build.py @@ -651,14 +651,3 @@ def test_build_number_parameter(plugin_config_content, src_dir, plugin_config_content, src_dir, schema_content, {}) assert expected == upload_artifact['buildNumber'] - - @staticmethod - @pytest.mark.parametrize('lua_name, expected', [ - pytest.param('lua-toolkit-1', 'lua-toolkit-1'), - pytest.param(None, None) - ]) - def test_lua_name_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('luaName') diff --git a/tools/src/test/python/dlpx/virtualization/_internal/conftest.py b/tools/src/test/python/dlpx/virtualization/_internal/conftest.py index c3d89473..28ccaef1 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/conftest.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/conftest.py @@ -171,7 +171,7 @@ 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): """ This fixutre creates the dict expected in the properties yaml file the customer must provide for the build and compile commands. @@ -216,9 +216,6 @@ def plugin_config_content(plugin_id, plugin_name, external_version, language, if build_number: config['buildNumber'] = build_number - if lua_name: - config['luaName'] = lua_name - return config @@ -277,11 +274,6 @@ def build_number(): return '2.0.0' -@pytest.fixture -def lua_name(): - return 'lua-toolkit-1' - - @pytest.fixture def artifact_manual_discovery(): return True @@ -569,7 +561,6 @@ def basic_artifact_content(engine_api, virtual_source_definition, 'engineApi': engine_api, 'rootSquashEnabled': True, 'buildNumber': '2', - 'luaName': 'lua-toolkit-1', 'sourceCode': 'UEsFBgAAAAAAAAAAAAAAAAAAAAAAAA==', 'manifest': {} } @@ -617,7 +608,6 @@ def artifact_content(engine_api, virtual_source_definition, 'sourceCode': 'UEsFBgAAAAAAAAAAAAAAAAAAAAAAAA==', 'rootSquashEnabled': True, 'buildNumber': '2', - 'luaName': 'lua-toolkit-1', 'manifest': {} } diff --git a/tools/src/test/python/dlpx/virtualization/_internal/test_plugin_validator.py b/tools/src/test/python/dlpx/virtualization/_internal/test_plugin_validator.py index 1a7e8eeb..52722bd4 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/test_plugin_validator.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/test_plugin_validator.py @@ -171,21 +171,3 @@ def test_plugin_build_number_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('lua_name, expected', [ - ('lua toolkit', "'lua toolkit' does not match"), - ('!lua#toolkit', "'!lua#toolkit' does not match"), - (None, "should never get here") - ]) - def test_plugin_lua_name_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