Skip to content

Add system caches list and delete subcommands to manage runtime caches #384

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.

Sign up for GitHub

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

Merged
merged 31 commits into from
May 1, 2023
Merged

Add system caches list and delete subcommands to manage runtime caches #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
afaec14
First implementation of list and delete endpoints
toph-allen Mar 17, 2023
cf2adba
First pass at API unit tests
toph-allen Mar 23, 2023
0e5c3b0
update docker-compose to use proper image
toph-allen Mar 24, 2023
55c38e5
add integration tests; run make fmt
toph-allen Mar 24, 2023
214510d
run tests in CI; skip if rsconnect service missing
toph-allen Mar 24, 2023
53bf085
Simplify logging.
toph-allen Mar 24, 2023
a3e264d
CI fixes
toph-allen Mar 24, 2023
76c7ddb
reorder tests so they work right
toph-allen Mar 24, 2023
5315459
Update rsconnect/main.py
toph-allen Mar 24, 2023
f4a0548
Update rsconnect/main.py
toph-allen Mar 24, 2023
d1ab101
Insert @server_args where appropriate
toph-allen Mar 24, 2023
3612171
Merge branch 'master' into toph-system-caches-runtime
toph-allen Mar 24, 2023
624e875
Respond to review
toph-allen Mar 27, 2023
d3353a1
Fix a broken test.
toph-allen Mar 27, 2023
2efd90a
Update tests
toph-allen Mar 27, 2023
e716708
Merge branch 'master' into toph-system-caches-runtime
toph-allen Mar 27, 2023
dc182b9
Update integration tests
toph-allen Mar 27, 2023
c27fbf8
attempt to fix failing vetiver test
toph-allen Mar 28, 2023
0821c56
Update changelog.
toph-allen Mar 28, 2023
d29db3b
Add new commands to readme
toph-allen Mar 29, 2023
f05bfaa
Respond to review comments, mess with David's shell blocks
toph-allen Mar 29, 2023
ef21777
play with admonitions
toph-allen Mar 29, 2023
4668804
play with admonitions more
toph-allen Mar 29, 2023
dab6cce
Change a note to a warning
toph-allen Mar 29, 2023
eb5c228
rewrite GitHub style admonitions into mkdoc style
aronatkins Mar 29, 2023
1bfdb00
fix link
toph-allen Mar 29, 2023
a6f57f2
update image name
toph-allen Mar 29, 2023
b44a232
small changes to delete command and docs
toph-allen Mar 30, 2023
26da4c1
revert language variable title casing
toph-allen Mar 31, 2023
1a7ecdd
Merge branch 'master' into toph-system-caches-runtime
toph-allen May 1, 2023
0e68bf1
Small change to bring in-line with Connect
toph-allen May 1, 2023
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
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ jobs:
event_type: 'rsconnect_python_latest'
})
test-rsconnect:
name: "Test vetiver"
name: "Integration tests against latest Connect"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -178,7 +178,9 @@ jobs:
# NOTE: edited to run checks for python package
- name: Run tests
run: |
pytest tests/test_main_system_caches.py
pytest -m 'vetiver'


test-jupyter:
runs-on: ubuntu-latest
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,7 @@
htmlcov
test-home/
venv
coverage.xml
coverage.xml

# Temporary dev files
vetiver-testing/rsconnect_api_keys.json
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- cacert read error when adding/updating a server.

## Unreleased

### Added
- Added `system caches list` and `system caches delete` commands which allow administrators to enumerate and delete R and Python runtime caches from Connect servers.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will want to indicate the minimum Connect release having this functionality.


## [1.16.0] - 2023-03-27

### Added
Expand Down
12 changes: 3 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -168,20 +166,16 @@ promote-docs-in-s3:
docs/site/ \
s3://docs.rstudio.com/rsconnect-python/

RSC_API_KEYS=vetiver-testing/rsconnect_api_keys.json

dev: vetiver-testing/rsconnect_api_keys.json

dev-start:
dev:
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)

dev-stop:
docker-compose down
rm -f $(RSC_API_KEYS)

$(RSC_API_KEYS): dev-start
python vetiver-testing/setup-rsconnect/dump_api_keys.py $@

Loading