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

Follow symlinks when building bundle #546

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Follow symlinks when building bundle #546

wants to merge 2 commits into from

Conversation

jcheng5
Copy link
Contributor

@jcheng5 jcheng5 commented Feb 22, 2024

I have NOT tested this on Windows, only Mac. Please nobody merge until I've tested.

Intent

Fixes #414. When building a bundle, follow symlinks. This allows apps to include directories that might live somewhere else for deduplication/centralization reasons.

Type of Change

  • Bug Fix
  • New Feature
  • Breaking Change

Approach

os.walk takes a followlinks argument that defaults to False. I simply set this to True. Note that from googling, os.walk doesn't check for circular references--I'm happy to add that if we think it's important.

Automated Tests

TODO

Directions for Reviewers

Create two sibling directories, one called data and one called shinytest.

shinytest/app.py:

from pathlib import Path
from shiny.express import input, ui

msg_path = Path(__file__).parent / "data/message.txt"

with open(msg_path) as f:
    f.read()

data/message.txt:

Hello, world!

Then, from within the shinytest directory, run ln -s ../data data.

Deploy from within the shinytest directory as usual, and see if it crashes on startup or the message correctly appears instead.

Checklist

  • I have updated CHANGELOG.md to cover notable changes.
  • I have updated all related GitHub issues to reflect their current state.

Copy link

github-actions bot commented Feb 22, 2024

☂️ Python Coverage

current status: ✅

Overall Coverage

Lines Covered Coverage Threshold Status
4409 3134 71% 0% 🟢

New Files

No new covered files...

Modified Files

File Coverage Status
rsconnect/bundle.py 79% 🟢
TOTAL 79% 🟢

updated for commit: aa3a496 by action🐍

rsconnect/bundle.py Outdated Show resolved Hide resolved
@jcheng5
Copy link
Contributor Author

jcheng5 commented Feb 24, 2024

I played around with Windows and it's pretty weird.

The good news is symlinks work fine, the command is mklink and Python handles them just fine. I haven't tried with git but it's supposed to work; there's a core.symlinks option that defaults to true.

They're not supported on FAT filesystems but that's probably OK for our purposes.

However, by default, you don't have permissions to call mklink unless you are at an Administrator prompt. That's true even if you have write permissions to the directory where you're trying to create the link--it's the creation of a symlink that's considered a privileged operation. You can put Windows into developer mode (doesn't even require a restart) and then anyone can call mklink.

@nealrichardson
Copy link
Contributor

I played around with Windows and it's pretty weird.

So true 😆

Weird but this is fine to merge, @jcheng5? Even if you're not an admin, you can still follow symlinks, right?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

support following symlinks
3 participants