Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test plugins with secrets #599

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions tests/assets/plugins/blockifiers/blockifier_with_secrets.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
from typing import Type

from pydantic import Field

from steamship import Block, File
from steamship.invocable import Config, InvocableResponse, create_handler
from steamship.invocable.plugin_service import PluginRequest
from steamship.plugin.blockifier.blockifier import Blockifier
from steamship.plugin.inputs.raw_data_plugin_input import RawDataPluginInput
from steamship.plugin.outputs.block_and_tag_plugin_output import BlockAndTagPluginOutput

# Note 1: this aligns with the same document in the internal Engine test.
# Note 2: This should be duplicated from the test_importer because of the way our test system will
# bundle this into an invocable deployment package (importing won't work!)
HANDLE = "test-blockifier-plugin-v1"
TEST_H1 = "A Poem"
TEST_S1 = "Roses are red."
TEST_S2 = "Violets are blue."
TEST_S3 = "Sugar is sweet, and I love you."
TEST_DOC = f"# {TEST_H1}\n\n{TEST_S1} {TEST_S2}\n\n{TEST_S3}\n"


class DummyBlockifierPlugin(Blockifier):
class DummyBlockifierConfig(Config):
secret: str = Field("")

config: DummyBlockifierConfig

@classmethod
def config_cls(cls) -> Type[Config]:
return cls.DummyBlockifierConfig

def run(
self, request: PluginRequest[RawDataPluginInput]
) -> InvocableResponse[BlockAndTagPluginOutput]:
return InvocableResponse(
data=BlockAndTagPluginOutput(
file=File(
blocks=[
Block(
text=self.config.secret,
),
]
)
)
)


handler = create_handler(DummyBlockifierPlugin)
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
from steamship_tests import PLUGINS_PATH
from steamship_tests.utils.deployables import deploy_plugin
from steamship_tests.utils.fixtures import get_steamship_client

from steamship import File


def test_e2e_blockifier_plugin():
client = get_steamship_client()
blockifier_path = PLUGINS_PATH / "blockifiers" / "blockifier_with_secrets.py"

# Send up the configTemplate that would be derived from this class:
#
# class DummyBlockifierConfig(Config):
# secret: str = Field("")
#
version_config_template = {
"secret": {"type": "string", "default": ""},
}

# Deploy with the secrets TOML {secret: "FOO"}
with deploy_plugin(
client,
blockifier_path,
"blockifier",
version_config_template=version_config_template,
secrets_toml='secret="FOO"',
) as (
plugin,
version,
instance,
):
file = File.create(client=client, content="This is a test.")
assert len(file.refresh().blocks) == 0
file.blockify(plugin_instance=instance.handle).wait()
file.refresh()
assert len(file.blocks) == 1
assert file.blocks[0].text == "FOO"

Check failure on line 38 in tests/steamship_tests/plugin/integration/test_e2e_blockifier_with_secrets.py

View workflow job for this annotation

GitHub Actions / Staging Test Results

test_e2e_blockifier_with_secrets.test_e2e_blockifier_plugin

assert == failed. [pytest-clarity diff shown] #x1B[0m #x1B[0m#x1B[32mLHS#x1B[0m vs #x1B[31mRHS#x1B[0m shown below #x1B[0m #x1B[0m#x1B[31mFOO#x1B[0m #x1B[0m
Raw output
def test_e2e_blockifier_plugin():
        client = get_steamship_client()
        blockifier_path = PLUGINS_PATH / "blockifiers" / "blockifier_with_secrets.py"
    
        # Send up the configTemplate that would be derived from this class:
        #
        #     class DummyBlockifierConfig(Config):
        #         secret: str = Field("")
        #
        version_config_template = {
            "secret": {"type": "string", "default": ""},
        }
    
        # Deploy with the secrets TOML {secret: "FOO"}
        with deploy_plugin(
            client,
            blockifier_path,
            "blockifier",
            version_config_template=version_config_template,
            secrets_toml='secret="FOO"',
        ) as (
            plugin,
            version,
            instance,
        ):
            file = File.create(client=client, content="This is a test.")
            assert len(file.refresh().blocks) == 0
            file.blockify(plugin_instance=instance.handle).wait()
            file.refresh()
            assert len(file.blocks) == 1
>           assert file.blocks[0].text == "FOO"
E           assert == failed. [pytest-clarity diff shown]
E             #x1B[0m
E             #x1B[0m#x1B[32mLHS#x1B[0m vs #x1B[31mRHS#x1B[0m shown below
E             #x1B[0m
E             #x1B[0m#x1B[31mFOO#x1B[0m
E             #x1B[0m

tests/steamship_tests/plugin/integration/test_e2e_blockifier_with_secrets.py:38: AssertionError

Check failure on line 38 in tests/steamship_tests/plugin/integration/test_e2e_blockifier_with_secrets.py

View workflow job for this annotation

GitHub Actions / Production Test Results

test_e2e_blockifier_with_secrets.test_e2e_blockifier_plugin

assert == failed. [pytest-clarity diff shown] #x1B[0m #x1B[0m#x1B[32mLHS#x1B[0m vs #x1B[31mRHS#x1B[0m shown below #x1B[0m #x1B[0m#x1B[31mFOO#x1B[0m #x1B[0m
Raw output
def test_e2e_blockifier_plugin():
        client = get_steamship_client()
        blockifier_path = PLUGINS_PATH / "blockifiers" / "blockifier_with_secrets.py"
    
        # Send up the configTemplate that would be derived from this class:
        #
        #     class DummyBlockifierConfig(Config):
        #         secret: str = Field("")
        #
        version_config_template = {
            "secret": {"type": "string", "default": ""},
        }
    
        # Deploy with the secrets TOML {secret: "FOO"}
        with deploy_plugin(
            client,
            blockifier_path,
            "blockifier",
            version_config_template=version_config_template,
            secrets_toml='secret="FOO"',
        ) as (
            plugin,
            version,
            instance,
        ):
            file = File.create(client=client, content="This is a test.")
            assert len(file.refresh().blocks) == 0
            file.blockify(plugin_instance=instance.handle).wait()
            file.refresh()
            assert len(file.blocks) == 1
>           assert file.blocks[0].text == "FOO"
E           assert == failed. [pytest-clarity diff shown]
E             #x1B[0m
E             #x1B[0m#x1B[32mLHS#x1B[0m vs #x1B[31mRHS#x1B[0m shown below
E             #x1B[0m
E             #x1B[0m#x1B[31mFOO#x1B[0m
E             #x1B[0m

tests/steamship_tests/plugin/integration/test_e2e_blockifier_with_secrets.py:38: AssertionError
file.delete()
12 changes: 10 additions & 2 deletions tests/steamship_tests/utils/deployables.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
from steamship.data.user import User


def zip_deployable(file_path: Path, additional_requirements: Optional[List[str]] = None) -> bytes:
def zip_deployable(
file_path: Path,
additional_requirements: Optional[List[str]] = None,
secrets_toml: Optional[str] = None,
) -> bytes:
"""Prepare and zip a Steamship plugin."""

package_paths = [
Expand All @@ -42,6 +46,9 @@ def zip_deployable(file_path: Path, additional_requirements: Optional[List[str]]
requirements_string += "\n" + "\n".join(additional_requirements)
zip_file.writestr("requirements.txt", requirements_string)

if secrets_toml is not None:
zip_file.writestr(".steamship/secrets.toml", secrets_toml)

# Now we'll copy in the whole assets directory so that our test files can access things there..
for root, _, files in os.walk(TEST_ASSETS_PATH):
for file in files:
Expand All @@ -65,6 +72,7 @@ def deploy_plugin(
safe_load_handler: bool = False,
wait_for_init: bool = True,
streaming: Optional[bool] = None,
secrets_toml: Optional[str] = None,
):
plugin = Plugin.create(
client,
Expand All @@ -75,7 +83,7 @@ def deploy_plugin(
is_public=False,
)

zip_bytes = zip_deployable(py_path)
zip_bytes = zip_deployable(py_path, secrets_toml=secrets_toml)
hosting_handler = "steamship.invocable.entrypoint.safe_handler" if safe_load_handler else None
plugin_version = PluginVersion.create(
client,
Expand Down
Loading