Respond to review

Author: toph-allen

.github/workflows/main.yml

@@ -163,15 +163,15 @@ jobs:
         run: |
           docker-compose up --build -d
           pip freeze > requirements.txt
-          make dev
+          make dev-start-integration
         env:
           RSC_LICENSE: ${{ secrets.RSC_LICENSE }}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       # NOTE: edited to run checks for python package
       - name: Run tests
         run: |
-          python -m unittest tests.test_main_system_caches
+          pytest tests/test_main_system_caches.py
           pytest -m 'vetiver'
 
   

Makefile

@@ -20,8 +20,6 @@ endif
 
 TEST_ENV =
 
-RSC_API_KEYS=vetiver-testing/rsconnect_api_keys.json
-
 ifneq ($(CONNECT_SERVER),)
   TEST_ENV += CONNECT_SERVER=$(CONNECT_SERVER)
 endif
@@ -168,20 +166,25 @@ promote-docs-in-s3:
 		docs/site/ \
 		s3://docs.rstudio.com/rsconnect-python/
 
-
-dev: vetiver-testing/rsconnect_api_keys.json
+RSC_API_KEYS=vetiver-testing/rsconnect_api_keys.json
 
 dev-start:
 	docker-compose up -d
 	docker-compose exec -T rsconnect bash < vetiver-testing/setup-rsconnect/add-users.sh
 	# curl fails with error 52 without a short sleep....
 	sleep 5
 	curl -s --retry 10 --retry-connrefused http://localhost:3939
+	python vetiver-testing/setup-rsconnect/dump_api_keys.py $(RSC_API_KEYS)
+
+# The same as `dev-start`, but without `-T` in docker-compose exec.
+dev-start-integration:
+	docker-compose up -d
+	docker-compose exec rsconnect bash < vetiver-testing/setup-rsconnect/add-users.sh
+	# curl fails with error 52 without a short sleep....
+	sleep 5
+	curl -s --retry 10 --retry-connrefused http://localhost:3939
+	python vetiver-testing/setup-rsconnect/dump_api_keys.py $(RSC_API_KEYS)
 
 dev-stop:
 	docker-compose down
 	rm -f $(RSC_API_KEYS)
-
-$(RSC_API_KEYS): dev-start
-	python vetiver-testing/setup-rsconnect/dump_api_keys.py $@
-	

rsconnect/api.py

@@ -991,20 +991,20 @@ def make_deployment_name(self, title, force_unique):
 
         return name
 
-    def list_runtime_caches(self):
+    @property
+    def runtime_caches(self):
         return self.client.system_caches_runtime_list()
 
     def delete_runtime_cache(self, language, version, image_name, dry_run):
         target = {"language": language, "version": version, "image_name": image_name, "dry_run": dry_run}
         result = self.client.system_caches_runtime_delete(target)
         if result["task_id"] is None:
             print("Dry run finished")
-            return result
         else:
             (log_lines, task_status) = self.client.wait_for_task(
                 result["task_id"], connect_logger.info, raise_on_error=False
             )
-            return task_status
+        return self
 
 
 def filter_out_server_info(**kwargs):

rsconnect/main.py

@@ -2195,7 +2195,7 @@ def system_caches_list(name, server, api_key, insecure, cacert, verbose):
     set_verbosity(verbose)
     with cli_feedback("", stderr=True):
         ce = RSConnectExecutor(name, server, api_key, insecure, cacert, logger=None).validate_server()
-        result = ce.list_runtime_caches()
+        result = ce.runtime_caches
         json.dump(result, sys.stdout, indent=2)
 
 
@@ -2230,8 +2230,7 @@ def system_caches_delete(name, server, api_key, insecure, cacert, verbose, langu
     set_verbosity(verbose)
     with cli_feedback("", stderr=True):
         ce = RSConnectExecutor(name, server, api_key, insecure, cacert, logger=None).validate_server()
-        result = ce.delete_runtime_cache(language, version, image_name, dry_run)
-        logger.debug(result)
+        ce.delete_runtime_cache(language, version, image_name, dry_run)
 
 
 if __name__ == "__main__":