Merge pull request #4 from tenable/fix/marketplace

Updated marketplace command to generate fake test data

Author: SteveMcGrath

tenint/__init__.py

@@ -2,4 +2,4 @@
 from .models.configuration import Configuration, Settings  # noqa F401
 from .connector import Connector  # noqa F401
 
-__version__ = '0.1.7'
+__version__ = "0.9.0"

tenint/cli.py

@@ -116,11 +116,20 @@ def build_connector(
 
 @app.command('marketplace')
 def gen_marketplace(
-    image: Annotated[str, Option(..., help='Docker Image Name')],
-    icon: Annotated[str, Option(..., help='Icon Image URL')],
+    image: Annotated[
+        str, Option(..., help='Docker Image Name')
+    ] = 'local/connector-example',
+    icon: Annotated[
+        str, Option(..., help='Icon Image URL')
+    ] = 'https://nourl.example/logo.svg',
     path: Annotated[Path, Option(help='connector code path')] = Path('.'),
+    output: Annotated[Path, Option(help='output marketplace json file')] = None,
 ):
-    mpfile = path.joinpath('marketplace.json')
-    with mpfile.open('w', encoding='utf-8') as fobj:
-        mp = MarketplaceConnector.load_from_pyproject('pyproject.toml')
-        fobj.write(mp.model_dump_json())
+    mpfile = path.joinpath('marketplace-object.json')
+    mp = MarketplaceConnector.load_from_pyproject(
+        filename='pyproject.toml', image_url=image, icon_url=icon
+    ).model_dump(mode='json')
+    console.print(mp)
+    if output:
+        with mpfile.open('w', encoding='utf-8') as fobj:
+            fobj.write(mp.model_dump_json())

tests/test_cli.py

@@ -21,7 +21,7 @@ def test_init_skip_single_file(tmp_path):
     result = runner.invoke(app, ['init', '--path', str(tmp_path)])
     assert result.exit_code == 0
     assert 'Now that you have' in result.stdout
-    assert 'pyproject.toml as it already exists' in result.stdout
+    assert 'pyproject.toml as it' in result.stdout
 
 
 def test_init_skip_tests(tmp_path):