stoobly-agent 1.9.1__tar.gz → 1.9.3__tar.gz

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stoobly-agent
-Version: 1.9.1
+Version: 1.9.3
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 Author: Matt Le

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/pyproject.toml

@@ -10,7 +10,7 @@ description = "Record, mock, and test HTTP(s) requests. CLI agent for Stoobly"
 license = "Apache License 2.0"
 name = "stoobly-agent"
 readme = "README.md"
-version = "1.9.1"
+version = "1.9.3"
 
 [tool.poetry.dependencies]
 python = "^3.10"

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.9.1'
+VERSION = '1.9.3'

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.docker-compose.base.yml

@@ -1,8 +1,5 @@
 services:
   stoobly_ui.base:
-    environment:
-      SERVICE_NAME: ${SERVICE_NAME}
-      WORKFLOW_NAME: ${WORKFLOW_NAME}
     extends:
       file: ../.docker-compose.base.yml
       service: context_base 

stoobly_agent-1.9.3/stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/init

@@ -0,0 +1,9 @@
+#! /bin/bash
+
+# Add custom initialization here
+
+app_path=$1 # Path to application source files
+
+# For example, the below commands copies files inside a dist folder into the public folder. 
+# The public folder is used when no recorded mocks are found.
+#cp -r $app_path/dist/. public

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/stoobly_agent/app/cli/scaffold_cli.py

@@ -6,6 +6,7 @@ import sys
 
 from io import TextIOWrapper
 from typing import List
+from urllib.parse import urlparse
 
 from stoobly_agent.app.cli.helpers.certificate_authority import CertificateAuthority
 from stoobly_agent.app.cli.helpers.shell import exec_stream
@@ -148,10 +149,10 @@ def create(**kwargs):
     sys.exit(1)
 
   if kwargs.get('hostname'):
-    hostname_regex = re.compile(r'^[a-zA-Z0-9.-]+$')
-    if not re.search(hostname_regex, kwargs['hostname']):
-      print(f"Error: {kwargs['hostname']} is invalid.", file=sys.stderr)
-      sys.exit(1)
+    __validate_hostname(kwargs.get('hostname'))
+
+  if kwargs.get("proxy_mode"):
+    __validate_proxy_mode(kwargs.get("proxy_mode"))
 
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
 
@@ -216,6 +217,13 @@ def delete(**kwargs):
 @click.option('--port', type=click.IntRange(1, 65535), help='Service port.')
 @click.option('--priority', default=5, type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
 @click.option('--scheme', type=click.Choice(['http', 'https']), help='Defaults to https if hostname is set.')
+@click.option('--name', type=click.STRING, help='New name of the service to update to.')
+@click.option('--proxy-mode', help='''
+  Proxy mode can be "regular", "transparent", "socks5",
+  "reverse:SPEC", or "upstream:SPEC". For reverse and
+  upstream proxy modes, SPEC is host specification in
+  the form of "http[s]://host[:port]".
+''')
 @click.argument('service_name')
 def update(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
@@ -228,7 +236,20 @@ def update(**kwargs):
   service_config = ServiceConfig(service.dir_path)
 
   if kwargs['hostname']:
-    service_config.hostname = kwargs['hostname']
+    __validate_hostname(kwargs['hostname'])
+
+    old_hostname = service_config.hostname
+
+    if old_hostname != kwargs['hostname']:
+      service_config.hostname = kwargs['hostname']
+
+      # If this is the default proxy_mode and the origin matches the original hostname, assume it is safe to update with the new hostname
+      if service_config.proxy_mode.startswith("reverse:"):
+        old_origin = service_config.proxy_mode.split("reverse:")[1]
+        parsed_origin_url = urlparse(old_origin)
+
+        if old_hostname == parsed_origin_url.hostname:
+          service_config.proxy_mode = service_config.proxy_mode.replace(old_hostname, service_config.hostname)
 
   if kwargs['priority']:
     service_config.priority = kwargs['priority']
@@ -239,6 +260,10 @@ def update(**kwargs):
   if kwargs['scheme']:
     service_config.scheme = kwargs['scheme']
 
+  if kwargs['proxy_mode']:
+    __validate_proxy_mode(kwargs['proxy_mode'])
+    service_config.proxy_mode = kwargs['proxy_mode']
+
   service_config.write()
 
 @workflow.command(
@@ -759,7 +784,42 @@ def __validate_app_dir(app_dir_path):
 
 def __validate_service_dir(service_dir_path):
   if not os.path.exists(service_dir_path):
-    print(f"Error: {service_dir_path} does not exist, please scaffold this service", file=sys.stderr)
+    print(f"Error: '{service_dir_path}' does not exist, please scaffold this service", file=sys.stderr)
+    sys.exit(1)
+
+def __validate_proxy_mode(proxy_mode: str) -> None:
+  valid_exact_matches = {
+    "regular": None,
+    "transparent": None,
+    "socks5": None,
+  }
+
+  valid_prefixes = {
+    "reverse": None,
+    "upstream": None
+  }
+
+  if proxy_mode in valid_exact_matches:
+    return
+
+  split_str = proxy_mode.split(":", 1)
+  if len(split_str) != 2:
+    print(f"Error: {proxy_mode} is invalid.", file=sys.stderr)
+    sys.exit(1)
+
+  prefix = split_str[0]
+  spec = split_str[1]
+
+  if prefix not in valid_prefixes:
+    print(f"Error: {proxy_mode} is invalid.", file=sys.stderr)
+    sys.exit(1)
+
+  # TODO: validate SPEC
+
+def __validate_hostname(hostname: str) -> None:
+  hostname_regex = re.compile(r'^[a-zA-Z0-9.-]+$')
+  if not re.search(hostname_regex, hostname):
+    print(f"Error: {hostname} is invalid.", file=sys.stderr)
     sys.exit(1)
 
 def __workflow_create(app, **kwargs):

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/stoobly_agent/app/models/adapters/joined_request_adapter.py

@@ -17,9 +17,7 @@ class JoinedRequestAdapter():
     if isinstance(payloads_delimitter, str):
       payloads_delimitter = payloads_delimitter.encode()
       
-    self.__split_joined_request_string = joined_request_string.split(payloads_delimitter)
-    if len(self.__split_joined_request_string) != 2:
-      self.__split_joined_request_string = joined_request_string.split(payloads_delimitter.replace(b"\n", b"\r\n"))
+    self.__split_joined_request_string = self.raw_request_split(joined_request_string, payloads_delimitter) 
 
     if len(self.__split_joined_request_string) != 2:
       raise ValueError(f"Could not split by {payloads_delimitter}")
@@ -47,7 +45,7 @@ class JoinedRequestAdapter():
     request_string = RequestString(None)
 
     delimitter = RequestStringCLRF
-    request_string_toks = self.__split_joined_request_string[0].split(delimitter)
+    request_string_toks = self.repaired_string_toks(self.__split_joined_request_string[0], delimitter)
     request_string.set(self.raw_request_string or delimitter.join(request_string_toks[1:]))
     request_string.control = request_string_toks[0]
 
@@ -57,7 +55,7 @@ class JoinedRequestAdapter():
     response_string = ResponseString(None, None)
 
     delimitter = ResponseStringCLRF
-    response_string_toks = self.__split_joined_request_string[1].split(delimitter)
+    response_string_toks = self.repaired_string_toks(self.__split_joined_request_string[1], delimitter)
     response_string.set(self.raw_response_string or delimitter.join(response_string_toks[1:]))
     response_string.control = response_string_toks[0]
 
@@ -68,4 +66,38 @@ class JoinedRequestAdapter():
 
     joined_request.request_string = self.build_request_string()
     joined_request.response_string = self.build_response_string()
-    return joined_request
+    return joined_request
+
+  # If all CRLF characters have been replaced with LF e.g. visual studio code
+  # Then try to repair the raw string, see https://github.com/Stoobly/stoobly-agent/issues/415
+  @staticmethod
+  def repaired_string_toks(raw_string: bytes, delimitter: bytes):
+    toks = raw_string.split(delimitter)
+
+    if len(toks) == 1:
+      lf = b"\n"
+      toks = raw_string.split(lf)
+
+      # See for request: https://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html
+      # See for response: https://www.w3.org/Protocols/rfc2616/rfc2616-sec6.html 
+      i = 0
+      for line in toks:
+        i += 1
+
+        # On two lf characters, then the following lines are the body
+        if line == b'':
+          break
+
+      toks = toks[:i] + [lf.join(toks[i:])]
+
+    if len(toks) == 1:
+      raise ValueError(f"Could not split request by {delimitter}")
+
+    return toks
+
+  @staticmethod
+  def raw_request_split(raw_string: bytes, payloads_delimitter = REQUEST_DELIMITTER):
+    toks = raw_string.split(payloads_delimitter)
+    if len(toks) != 2:
+      toks = raw_string.split(payloads_delimitter.replace(b"\n", b"\r\n"))
+    return toks

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/stoobly_agent/app/models/factories/resource/local_db/helpers/log.py

@@ -70,22 +70,7 @@ class Log():
 
   @property
   def scenario_inverted_index(self):
-    index = {}
-
-    def handle_snapshot(snapshot: RequestSnapshot):
-      request_uuid = snapshot.uuid
-      if not request_uuid in index:
-        index[request_uuid] = []
-
-      index[request_uuid].append(event.resource_uuid)
-
-    for event in self.target_events:
-      if not event.is_scenario():
-        continue 
-
-      event.snapshot().iter_request_snapshots(handle_snapshot)
-
-    return index
+    return self.build_scenario_inverted_index(self.target_events)
 
   @property
   def unprocessed_events(self) -> List[LogEvent]:
@@ -153,6 +138,22 @@ class Log():
 
   def build_log_events(self, raw_events) -> List[LogEvent]:
     return list(map(lambda raw_event: LogEvent(raw_event), raw_events))
+  
+  def build_scenario_inverted_index(self, events: List[LogEvent], index = {}):
+    def handle_snapshot(snapshot: RequestSnapshot):
+      request_uuid = snapshot.uuid
+      if not request_uuid in index:
+        index[request_uuid] = []
+
+      index[request_uuid].append(event.resource_uuid)
+
+    for event in events:
+      if not event.is_scenario():
+        continue 
+
+      event.snapshot().iter_request_snapshots(handle_snapshot)
+
+    return index
 
   def next_version(self, last_processed_uuid: str = None):
     uuids = self.uuids()
@@ -169,7 +170,7 @@ class Log():
   def collapse(self, events: List[LogEvent]) -> List[LogEvent]:
     events_count = {}
 
-    # More recent events take precedence over earlier ones, keep only the most recent event 
+    # More recent events take precedence over earlier ones, only the most recent event 
     for event in events:
       event_key = event.key
 
@@ -274,10 +275,10 @@ class Log():
   
   def remove_dangling_events(self, processed_events: List[LogEvent], unprocessed_events: List[LogEvent]):
     '''
-    Remove DELETE events where the last processed event was a PUT
+    Remove DELETE events unless the last processed event was a PUT
     '''
 
-    # Build an index such that if the last event is DELETE_ACTION, then it will NOT exist in the index
+    # Build an index to keep track of the last action that occurred for a resource
     index = {}
     for event in processed_events:
       if event.action == PUT_ACTION:
@@ -286,13 +287,27 @@ class Log():
         if event.resource_uuid in index:
           del index[event.resource_uuid]
 
-    scenario_inverted_index = self.scenario_inverted_index
-
+    scenario_inverted_index = self.build_scenario_inverted_index(processed_events)
+    
     def keep(e: LogEvent):
-      if e.action != DELETE_ACTION:
+      # Keep the event if it's a PUT, it may have been updated
+      if e.action == PUT_ACTION:
         return True
-      
-      return e.action == DELETE_ACTION and e.is_request() and e.resource_uuid in scenario_inverted_index
+
+      if e.action == DELETE_ACTION:
+        if e.is_request():
+          referenced = e.resource_uuid in scenario_inverted_index
+          # Keep the DELETE event if the requests exists in a scenario
+          # or if it doesn't exist in a scenario, there was a previous delete event
+          return referenced or (e.resource_uuid in index and not referenced)
+        elif e.is_scenario():
+          # Update scenario_inverted_index with unprocessed event
+          self.build_scenario_inverted_index([e], scenario_inverted_index)
+
+          # Keep DELETE scenario event only if previous event for the resource was PUT
+          return e.resource_uuid in index
+        else:
+          return True
     
     return list(
       filter(

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/stoobly_agent/app/models/helpers/apply.py

@@ -2,10 +2,10 @@ import pdb
 
 from typing import List
 
+from stoobly_agent.app.models.adapters.joined_request_adapter import JoinedRequestAdapter
 from stoobly_agent.app.models.factories.resource.local_db.helpers.log import Log
 from stoobly_agent.app.models.factories.resource.local_db.helpers.request_snapshot import RequestSnapshot
 from stoobly_agent.app.models.factories.resource.local_db.helpers.scenario_snapshot import ScenarioSnapshot
-from stoobly_agent.app.proxy.record import REQUEST_STRING_CLRF
 from stoobly_agent.app.settings import Settings
 from stoobly_agent.lib.logger import bcolors
 
@@ -165,7 +165,12 @@ class Apply():
       self.__logger(f"{bcolors.WARNING}Skipping Request{bcolors.ENDC} {error}")
       return error, 301
 
-    return self.__put_request(uuid, raw_request)
+    res, status = self.__put_request(uuid, raw_request)
+
+    if status != 200:
+      return f"{res} {snapshot.path}", status
+
+    return res, status
 
   def __apply_delete_scenario(self, uuid: str):
     res, status = self.scenario_model.destroy(uuid, force=self.__force)
@@ -227,8 +232,8 @@ class Apply():
 
       if not raw_request:
         return f"{request_snapshot.path} is missing", 400
-        
-      toks = raw_request.split(REQUEST_STRING_CLRF, 1)
+
+      toks = JoinedRequestAdapter.raw_request_split(raw_request)
       if len(toks) != 2:
         return f"{request_snapshot.path} contains an invalid request", 400
 
@@ -236,7 +241,7 @@ class Apply():
       res, status = self.__put_request(uuid, raw_request, scenario_id=scenario['id'])
 
       if status != 200:
-        return res, status
+        return f"{res} {request_snapshot.path}", status
 
       snapshot_requests[uuid] = res
 
@@ -274,8 +279,6 @@ class Apply():
 
       if self.__logger and status == 200:
         self.__logger(f"{bcolors.OKGREEN}Created Request{bcolors.ENDC} {res['list'][0]['url']}")
-      else: 
-        self.__logger(f"{bcolors.FAIL}{status}{bcolors.ENDC} {res}")
     elif status == 200:
       params = {
         'is_deleted': False,
@@ -287,7 +290,5 @@ class Apply():
       if self.__logger:
         if status == 200:
           self.__logger(f"{bcolors.OKCYAN}Updated Request{bcolors.ENDC} {res['url']}")
-        else: 
-          self.__logger(f"{bcolors.FAIL}{status}{bcolors.ENDC} {res}")
 
     return res, status

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/stoobly_agent/app/proxy/handle_mock_service.py

@@ -147,15 +147,8 @@ def handle_request_mock(context: MockContext):
 # 2. AFTER_MOCK gets triggered (if mock found)
 #
 def handle_response_mock(context: MockContext):
-    response = context.flow.response
-    request_key = response.headers.get(custom_headers.MOCK_REQUEST_KEY)
-
-    if request_key:
-        request = context.flow.request
-        Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}Mocked{bcolors.ENDC} {request.url} -> {request_key}")
-
-        __rewrite_response(context)
-        __mock_hook(lifecycle_hooks.AFTER_MOCK, context)
+    __rewrite_response(context)
+    __mock_hook(lifecycle_hooks.AFTER_MOCK, context)
 
 def __handle_mock_failure(context: MockContext) -> None:
     flow = context.flow
@@ -186,6 +179,19 @@ def __handle_found_policy(context: MockContext) -> None:
     reverse_proxy(req, upstream_url, {})
 
 def __handle_mock_success(context: MockContext) -> None:
+    response = context.response
+
+    if response:
+        request = context.flow.request
+
+        request_key = response.headers.get(custom_headers.MOCK_REQUEST_KEY)
+        if request_key:
+            Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}Mocked{bcolors.ENDC} {request.url} -> {request_key}")
+
+        fixture_path = response.headers.get(custom_headers.MOCK_FIXTURE_PATH)
+        if fixture_path:
+            Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}Mocked{bcolors.ENDC} {request.url} -> {fixture_path}")
+
     if os.environ.get(env_vars.AGENT_SIMULATE_LATENCY):
         response = context.response
         start_time = context.start_time

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/stoobly_agent/app/proxy/mock/eval_fixtures_service.py

@@ -10,6 +10,7 @@ from requests.structures import CaseInsensitiveDict
 from typing import Union
 
 from stoobly_agent.lib.logger import bcolors, Logger
+from stoobly_agent.config.constants.custom_headers import MOCK_FIXTURE_PATH
 
 from .types import Fixtures
 
@@ -20,45 +21,50 @@ class Options():
   response_fixtures: Fixtures
 
 def eval_fixtures(request: MitmproxyRequest, **options: Options) -> Union[Response, None]:
-  fixture_path = None
+  fixture_path = request.headers.get(MOCK_FIXTURE_PATH)
   headers = CaseInsensitiveDict()
   status_code = 200
 
-  response_fixtures = options.get('response_fixtures')
-  fixture: dict = __eval_response_fixtures(request, response_fixtures)
-
-  if not fixture:
-    public_directory_path = options.get('public_directory_path')
-
-    if not public_directory_path:
+  if fixture_path:
+    if not os.path.exists(fixture_path):
       return
+  else:
+    response_fixtures = options.get('response_fixtures')
+    fixture: dict = __eval_response_fixtures(request, response_fixtures)
 
-    request_path = 'index' if request.path == '/' else request.path
-    _fixture_path = os.path.join(public_directory_path, request_path.lstrip('/'))
-    if request.headers.get('accept'):
-      fixture_path = __guess_file_path(_fixture_path, request.headers['accept'])
+    if not fixture:
+      public_directory_path = options.get('public_directory_path')
 
-    if not fixture_path:
-      fixture_path = _fixture_path
+      if not public_directory_path:
+        return
 
-    if not os.path.isfile(fixture_path):
-      return
-  else:
-    fixture_path = fixture.get('path')
-    if not fixture_path or not os.path.isfile(fixture_path):
-      return
+      request_path = 'index' if request.path == '/' else request.path
+      _fixture_path = os.path.join(public_directory_path, request_path.lstrip('/'))
+      if request.headers.get('accept'):
+        fixture_path = __guess_file_path(_fixture_path, request.headers['accept'])
+
+      if not fixture_path:
+        fixture_path = _fixture_path
 
-    _headers = fixture.get('headers')
-    headers = CaseInsensitiveDict(_headers if isinstance(_headers, dict) else {}) 
+      if not os.path.isfile(fixture_path):
+        return
+    else:
+      fixture_path = fixture.get('path')
+      if not fixture_path or not os.path.isfile(fixture_path):
+        return
 
-    if fixture.get('status_code'):
-      status_code = fixture.get('status_code')
+      _headers = fixture.get('headers')
+      headers = CaseInsensitiveDict(_headers if isinstance(_headers, dict) else {}) 
 
+      if fixture.get('status_code'):
+        status_code = fixture.get('status_code')
+    
   with open(fixture_path, 'rb') as fp:
     response = Response()
 
     response.status_code = status_code
     response.raw = BytesIO(fp.read()) 
+    headers[MOCK_FIXTURE_PATH] = fixture_path
     response.headers = headers
 
     if not response.headers.get('content-type'):

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/stoobly_agent/config/constants/custom_headers.py

@@ -2,6 +2,7 @@ ALIAS_RESOLVE_STRATEGY = 'X-Stoobly-Alias-Resolve-Strategy'
 CONTENT_TYPE = 'X-Stoobly-Content-Type'
 CONTENT_TYPE_TEST_RESULTS = 'test/results'
 REMOTE_PROJECT_KEY = 'X-Stoobly-Endpoints-Project-Id'
+MOCK_FIXTURE_PATH = 'X-Stoobly-Fixture-Path'
 MOCK_POLICY = 'X-Stoobly-Mock-Policy'
 MOCK_REQUEST_ID = 'X-Stoobly-Request-Id'
 MOCK_REQUEST_ENDPOINT_ID = 'X-Stoobly-Request-Endpoint-Id'

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/stoobly_agent/lib/api/keys/uuid_key.py

@@ -28,6 +28,10 @@ class UuidKey(ResourceKey):
     toks = key.split(DELIMITTER)
 
     d = {}
+
+    if len(toks) == 0:
+      return d
+
     for tok in toks:
       d[tok[0]] = tok[1:]
 

{stoobly_agent-1.9.1 → stoobly_agent-1.9.3}/stoobly_agent/test/app/cli/request/request_snapshot_test.py

@@ -1,16 +1,18 @@
 import pdb
 import pytest
+import time
 
 from click.testing import CliRunner
-
-from stoobly_agent.test.test_helper import DETERMINISTIC_GET_REQUEST_URL, reset
+from typing import List
 
 from stoobly_agent.app.models.adapters.orm import JoinedRequestStringAdapter
 from stoobly_agent.app.models.factories.resource.local_db.helpers.log import Log
-from stoobly_agent.app.models.factories.resource.local_db.helpers.log_event import DELETE_ACTION
+from stoobly_agent.app.models.factories.resource.local_db.helpers.log_event import DELETE_ACTION, PUT_ACTION
 from stoobly_agent.app.models.factories.resource.local_db.helpers.request_snapshot import RequestSnapshot
-from stoobly_agent.cli import record, request
+from stoobly_agent.cli import record, request, scenario, snapshot
 from stoobly_agent.lib.orm.request import Request
+from stoobly_agent.lib.orm.scenario import Scenario
+from stoobly_agent.test.test_helper import DETERMINISTIC_GET_REQUEST_URL, NON_DETERMINISTIC_GET_REQUEST_URL, reset
 
 @pytest.fixture(scope='module')
 def runner():
@@ -122,3 +124,51 @@ class TestRequestSnapshot():
 
         event = unprocessed_events[0]
         assert event.resource_uuid == recorded_request_two.uuid
+        assert event.action == PUT_ACTION
+
+    class TestWhenDeleteFirst():
+
+      @pytest.fixture(scope='class')
+      def recorded_request(self, runner: CliRunner):
+        record_result = runner.invoke(record, [DETERMINISTIC_GET_REQUEST_URL])
+        assert record_result.exit_code == 0
+        return Request.last()
+
+      def test_initial_delete(self, runner: CliRunner, recorded_request: Request):
+        snapshot_result = runner.invoke(request, ['snapshot', '--action', DELETE_ACTION, recorded_request.key()])
+        assert snapshot_result.exit_code == 0
+
+        log = Log()
+
+        events = log.raw_events
+        assert len(events) == 1
+
+        unprocessed_events = log.unprocessed_events
+        assert len(unprocessed_events) == 0
+
+      def test_puts(self, runner: CliRunner, recorded_request: Request):
+        snapshot_result = runner.invoke(request, ['snapshot', '--action', PUT_ACTION, recorded_request.key()])
+        assert snapshot_result.exit_code == 0
+
+        log = Log()
+
+        events = log.raw_events
+        assert len(events) == 2
+
+        unprocessed_events = log.unprocessed_events
+        assert len(unprocessed_events) == 1
+        assert unprocessed_events[0].action == PUT_ACTION
+
+      def test_final_delete(self, runner: CliRunner, recorded_request: Request):
+        snapshot_result = runner.invoke(request, ['snapshot', '--action', DELETE_ACTION, recorded_request.key()])
+        assert snapshot_result.exit_code == 0
+
+        log = Log()
+
+        events = log.events
+        assert len(events) == 3
+
+        collapsed_events = log.collapse(events)
+        assert len(collapsed_events) == 1
+        unprocessed_events = log.unprocessed_events
+        assert len(unprocessed_events) == 0