move autopatches/ inside tools/
This commit is contained in:
parent
549724942d
commit
55e2b5d0dd
10 changed files with 296 additions and 0 deletions
188
autopatches/autopatch.py
Executable file
188
autopatches/autopatch.py
Executable file
|
@ -0,0 +1,188 @@
|
||||||
|
#!/usr/bin/python3
|
||||||
|
import json
|
||||||
|
import sys
|
||||||
|
import requests
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
catalog = requests.get("https://raw.githubusercontent.com/YunoHost/apps/master/apps.json").json()
|
||||||
|
|
||||||
|
my_env = os.environ.copy()
|
||||||
|
my_env["GIT_TERMINAL_PROMPT"] = "0"
|
||||||
|
os.makedirs(".apps_cache", exist_ok=True)
|
||||||
|
|
||||||
|
login = open("login").read().strip()
|
||||||
|
token = open("token").read().strip()
|
||||||
|
github_api = "https://api.github.com"
|
||||||
|
|
||||||
|
|
||||||
|
def apps(min_level=4):
|
||||||
|
|
||||||
|
for app, infos in catalog.items():
|
||||||
|
if infos.get("state") == "working" and infos.get("level", -1) > min_level:
|
||||||
|
infos["id"] = app
|
||||||
|
yield infos
|
||||||
|
|
||||||
|
|
||||||
|
def app_cache_folder(app):
|
||||||
|
return os.path.join(".apps_cache", app)
|
||||||
|
|
||||||
|
|
||||||
|
def git(cmd, in_folder=None):
|
||||||
|
|
||||||
|
if not isinstance(cmd, list):
|
||||||
|
cmd = cmd.split()
|
||||||
|
if in_folder:
|
||||||
|
cmd = ["-C", in_folder] + cmd
|
||||||
|
cmd = ["git"] + cmd
|
||||||
|
return subprocess.check_output(cmd, env=my_env).strip().decode("utf-8")
|
||||||
|
|
||||||
|
|
||||||
|
# Progress bar helper, stolen from https://stackoverflow.com/a/34482761
|
||||||
|
def progressbar(it, prefix="", size=60, file=sys.stdout):
|
||||||
|
it = list(it)
|
||||||
|
count = len(it)
|
||||||
|
def show(j, name=""):
|
||||||
|
name += " "
|
||||||
|
x = int(size*j/count)
|
||||||
|
file.write("%s[%s%s] %i/%i %s\r" % (prefix, "#"*x, "."*(size-x), j, count, name))
|
||||||
|
file.flush()
|
||||||
|
show(0)
|
||||||
|
for i, item in enumerate(it):
|
||||||
|
yield item
|
||||||
|
show(i+1, item["id"])
|
||||||
|
file.write("\n")
|
||||||
|
file.flush()
|
||||||
|
|
||||||
|
|
||||||
|
def build_cache():
|
||||||
|
|
||||||
|
for app in progressbar(apps(), "Git cloning: ", 40):
|
||||||
|
folder = os.path.join(".apps_cache", app["id"])
|
||||||
|
reponame = app["url"].rsplit("/", 1)[-1]
|
||||||
|
git(f"clone --quiet --depth 1 --single-branch {app['url']} {folder}")
|
||||||
|
git(f"remote add fork https://{login}:{token}@github.com/{login}/{reponame}", in_folder=folder)
|
||||||
|
|
||||||
|
|
||||||
|
def apply(patch):
|
||||||
|
|
||||||
|
patch_path = os.path.abspath(os.path.join("patches", patch, "patch.sh"))
|
||||||
|
|
||||||
|
for app in progressbar(apps(), "Apply to: ", 40):
|
||||||
|
folder = os.path.join(".apps_cache", app["id"])
|
||||||
|
current_branch = git(f"symbolic-ref --short HEAD", in_folder=folder)
|
||||||
|
git(f"reset --hard origin/{current_branch}", in_folder=folder)
|
||||||
|
os.system(f"cd {folder} && bash {patch_path}")
|
||||||
|
|
||||||
|
|
||||||
|
def diff():
|
||||||
|
|
||||||
|
for app in apps():
|
||||||
|
folder = os.path.join(".apps_cache", app["id"])
|
||||||
|
if bool(subprocess.check_output(f"cd {folder} && git diff", shell=True).strip().decode("utf-8")):
|
||||||
|
print("\n\n\n")
|
||||||
|
print("=================================")
|
||||||
|
print("Changes in : " + app["id"])
|
||||||
|
print("=================================")
|
||||||
|
print("\n")
|
||||||
|
os.system(f"cd {folder} && git --no-pager diff")
|
||||||
|
|
||||||
|
|
||||||
|
def push(patch):
|
||||||
|
|
||||||
|
title = "[autopatch] " + open(os.path.join("patches", patch, "pr_title.md")).read().strip()
|
||||||
|
|
||||||
|
def diff_not_empty(app):
|
||||||
|
folder = os.path.join(".apps_cache", app["id"])
|
||||||
|
return bool(subprocess.check_output(f"cd {folder} && git diff", shell=True).strip().decode("utf-8"))
|
||||||
|
|
||||||
|
def app_is_on_github(app):
|
||||||
|
return "github.com" in app["url"]
|
||||||
|
|
||||||
|
apps_to_push = [app for app in apps() if diff_not_empty(app) and app_is_on_github(app)]
|
||||||
|
|
||||||
|
with requests.Session() as s:
|
||||||
|
s.headers.update({"Authorization": f"token {token}"})
|
||||||
|
for app in progressbar(apps_to_push, "Forking: ", 40):
|
||||||
|
app["repo"] = app["url"][len("https://github.com/"):].strip("/")
|
||||||
|
fork_if_needed(app["repo"], s)
|
||||||
|
|
||||||
|
for app in progressbar(apps_to_push, "Pushing: ", 40):
|
||||||
|
app["repo"] = app["url"][len("https://github.com/"):].strip("/")
|
||||||
|
app_repo_name = app["url"].rsplit("/", 1)[-1]
|
||||||
|
folder = os.path.join(".apps_cache", app["id"])
|
||||||
|
current_branch = git(f"symbolic-ref --short HEAD", in_folder=folder)
|
||||||
|
git(f"reset origin/{current_branch}", in_folder=folder)
|
||||||
|
git(["commit", "-a", "-m", title, "--author='Yunohost-Bot <>'"], in_folder=folder)
|
||||||
|
try:
|
||||||
|
git(f"remote remove fork", in_folder=folder)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
git(f"remote add fork https://{login}:{token}@github.com/{login}/{app_repo_name}", in_folder=folder)
|
||||||
|
git(f"push fork {current_branch}:{patch} --quiet --force", in_folder=folder)
|
||||||
|
create_pull_request(app["repo"], patch, current_branch, s)
|
||||||
|
|
||||||
|
|
||||||
|
def fork_if_needed(repo, s):
|
||||||
|
|
||||||
|
repo_name = repo.split("/")[-1]
|
||||||
|
r = s.get(github_api + f"/repos/{login}/{repo_name}")
|
||||||
|
|
||||||
|
if r.status_code == 200:
|
||||||
|
return
|
||||||
|
|
||||||
|
r = s.post(github_api + f"/repos/{repo}/forks")
|
||||||
|
|
||||||
|
if r.status_code != 200:
|
||||||
|
print(r.text)
|
||||||
|
|
||||||
|
|
||||||
|
def create_pull_request(repo, patch, base_branch, s):
|
||||||
|
|
||||||
|
PR = {"title": "[autopatch] " + open(os.path.join("patches", patch, "pr_title.md")).read().strip(),
|
||||||
|
"body": "This is an automatic PR\n\n" + open(os.path.join("patches", patch, "pr_body.md")).read().strip(),
|
||||||
|
"head": login + ":" + patch,
|
||||||
|
"base": base_branch,
|
||||||
|
"maintainer_can_modify": True}
|
||||||
|
|
||||||
|
r = s.post(github_api + f"/repos/{repo}/pulls", json.dumps(PR))
|
||||||
|
|
||||||
|
if r.status_code != 200:
|
||||||
|
print(r.text)
|
||||||
|
else:
|
||||||
|
json.loads(r.text)["html_url"]
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
|
||||||
|
action = sys.argv[1]
|
||||||
|
if action == "--help":
|
||||||
|
print("""
|
||||||
|
Example usage:
|
||||||
|
|
||||||
|
# Init local git clone for all apps
|
||||||
|
./autopatch.py --build-cache
|
||||||
|
|
||||||
|
# Apply patch in all local clones
|
||||||
|
./autopatch.py --apply explicit-php-version-in-deps
|
||||||
|
|
||||||
|
# Inspect diff for all apps
|
||||||
|
./autopatch.py --diff
|
||||||
|
|
||||||
|
# Push and create pull requests on all apps with non-empty diff
|
||||||
|
./autopatch.py --push explicit-php-version-in-deps
|
||||||
|
""")
|
||||||
|
|
||||||
|
elif action == "--build-cache":
|
||||||
|
build_cache()
|
||||||
|
elif action == "--apply":
|
||||||
|
apply(sys.argv[2])
|
||||||
|
elif action == "--diff":
|
||||||
|
diff()
|
||||||
|
elif action == "--push":
|
||||||
|
push(sys.argv[2])
|
||||||
|
else:
|
||||||
|
print("Unknown action %s" % action)
|
||||||
|
|
||||||
|
|
||||||
|
main()
|
14
autopatches/patches/issue-and-pr-template/patch.sh
Normal file
14
autopatches/patches/issue-and-pr-template/patch.sh
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
|
||||||
|
[ ! -e issue_template.md ] || git rm issue_template.md
|
||||||
|
[ ! -e pull_request_template.md ] || git rm pull_request_template.md
|
||||||
|
|
||||||
|
[ ! -e .github ] || git rm -rf .github
|
||||||
|
mkdir -p .github
|
||||||
|
|
||||||
|
# Sleep 1 to avoid too many requests on github (there's a rate limit anyway)
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
wget -O .github/ISSUE_TEMPLATE.md https://raw.githubusercontent.com/YunoHost/example_ynh/master/.github/ISSUE_TEMPLATE.md
|
||||||
|
wget -O .github/PULL_REQUEST_TEMPLATE.md https://raw.githubusercontent.com/YunoHost/example_ynh/master/.github/PULL_REQUEST_TEMPLATE.md
|
||||||
|
|
||||||
|
git add .github
|
2
autopatches/patches/issue-and-pr-template/pr_body.md
Normal file
2
autopatches/patches/issue-and-pr-template/pr_body.md
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
|
||||||
|
This is an ***automated*** patch to sync the issue and PR template with the official templates in https://github.com/YunoHost/example_ynh/tree/master/.github
|
1
autopatches/patches/issue-and-pr-template/pr_title.md
Normal file
1
autopatches/patches/issue-and-pr-template/pr_title.md
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Update issue and PR templates
|
10
autopatches/patches/missing-seteu-in-change_url/patch.sh
Normal file
10
autopatches/patches/missing-seteu-in-change_url/patch.sh
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
|
||||||
|
cd scripts/
|
||||||
|
|
||||||
|
if [ ! -e change_url ] || grep -q 'ynh_abort_if_errors' change_url
|
||||||
|
then
|
||||||
|
# The app doesn't has any change url script or already has ynh_abort_if_error
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
sed 's@\(source /usr/share/yunohost/helpers\)@\1\nynh_abort_if_errors@g' -i change_url
|
|
@ -0,0 +1,2 @@
|
||||||
|
|
||||||
|
This is an ***automated*** patch to fix the lack of `ynh_abort_if_errors` in change_url script
|
|
@ -0,0 +1 @@
|
||||||
|
Missing ynh_abort_if_errors in change_url scripts
|
66
autopatches/patches/new-permission-system/patch.sh
Normal file
66
autopatches/patches/new-permission-system/patch.sh
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
|
||||||
|
cd scripts/
|
||||||
|
|
||||||
|
if grep -q 'ynh_legacy_permissions' upgrade || grep -q 'ynh_permission_' install
|
||||||
|
then
|
||||||
|
# App already using the new permission system - not patching anything
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! grep -q "protected_\|skipped_" install
|
||||||
|
then
|
||||||
|
# App doesn't has any (un)protected / skipped setting ?
|
||||||
|
# Probably not a webapp or permission ain't relevant for it ?
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
CONFIGURE_PERMISSION_DURING_INSTALL='
|
||||||
|
# Make app public if necessary
|
||||||
|
if [ \"\$is_public\" -eq 1 ]
|
||||||
|
then
|
||||||
|
ynh_permission_update --permission=\"main\" --add=\"visitors\"
|
||||||
|
fi
|
||||||
|
'
|
||||||
|
|
||||||
|
MIGRATE_LEGACY_PERMISSIONS='
|
||||||
|
#=================================================
|
||||||
|
# Migrate legacy permissions to new system
|
||||||
|
#=================================================
|
||||||
|
if ynh_legacy_permissions_exists
|
||||||
|
then
|
||||||
|
ynh_legacy_permissions_delete_all
|
||||||
|
|
||||||
|
ynh_app_setting_delete --app=\$app --key=is_public
|
||||||
|
fi'
|
||||||
|
|
||||||
|
for SCRIPT in "remove upgrade backup restore change_url"
|
||||||
|
do
|
||||||
|
[[ -e $SCRIPT ]] || continue
|
||||||
|
|
||||||
|
perl -p0e 's@.*ynh_app_setting_.*protected_.*@@g' -i $SCRIPT
|
||||||
|
perl -p0e 's@.*ynh_app_setting_.*skipped_.*@@g' -i $SCRIPT
|
||||||
|
perl -p0e 's@\s*if.*-z.*is_public.*(.|\n)*?fi\s@\n@g' -i $SCRIPT
|
||||||
|
perl -p0e 's@\s*if.*is_public.*(-eq|=).*(.|\n)*?fi\s@\n@g' -i $SCRIPT
|
||||||
|
perl -p0e 's@is_public=.*\n@@g' -i $SCRIPT
|
||||||
|
perl -p0e 's@ynh_app_setting_.*is_public.*@@g' -i $SCRIPT
|
||||||
|
perl -p0e 's@.*# Make app .*@@g' -i $SCRIPT
|
||||||
|
perl -p0e 's@.*# Fix is_public as a boolean.*@@g' -i $SCRIPT
|
||||||
|
perl -p0e 's@.*# If app is public.*@@g' -i $SCRIPT
|
||||||
|
perl -p0e 's@.*# .*allow.*credentials.*anyway.*@@g' -i $SCRIPT
|
||||||
|
perl -p0e 's@.*ynh_script_progression.*SSOwat.*@@g' -i $SCRIPT
|
||||||
|
perl -p0e 's@#=*\s#.*SETUP SSOWAT.*\s#=*\s@@g' -i $SCRIPT
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
perl -p0e 's@.*domain_regex.*@@g' -i install
|
||||||
|
perl -p0e 's@.*# If app is public.*@@g' -i install
|
||||||
|
perl -p0e 's@.*# Make app .*@@g' -i install
|
||||||
|
perl -p0e 's@.*# .*allow.*credentials.*anyway.*@@g' -i install
|
||||||
|
perl -p0e "s@if.*is_public.*(-eq|=)(.|\n){0,100}setting(.|\n)*?fi\n@$CONFIGURE_PERMISSION_DURING_INSTALL@g" -i install
|
||||||
|
perl -p0e 's@.*ynh_app_setting_.*is_public.*\s@@g' -i install
|
||||||
|
perl -p0e 's@.*ynh_app_setting_.*protected_.*@@g' -i install
|
||||||
|
perl -p0e 's@.*ynh_app_setting_.*skipped_.*@@g' -i install
|
||||||
|
|
||||||
|
grep -q 'is_public=' install || perl -p0e 's@(.*Configuring SSOwat.*)@\1\nynh_permission_update --permission=\"main\" --add=\"visitors\"@g' -i install
|
||||||
|
|
||||||
|
perl -p0e "s@ynh_abort_if_errors@ynh_abort_if_errors\n$MIGRATE_LEGACY_PERMISSIONS@g" -i upgrade
|
11
autopatches/patches/new-permission-system/pr_body.md
Normal file
11
autopatches/patches/new-permission-system/pr_body.md
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
|
||||||
|
NB. : this is an ***automated*** attempt to migrate the app to the new permission system
|
||||||
|
|
||||||
|
You should ***not*** blindly trust the proposed changes. In particular, the auto-patch will not handle:
|
||||||
|
- situations which are more complex than "if is_public is true, allow visitors"
|
||||||
|
- situations where the app needs to be temporarily public (then possible private) during initial configuration
|
||||||
|
- apps that need to define extra permission for specific section of the app (such as admin interface)
|
||||||
|
- apps using non-standard syntax
|
||||||
|
- other specific use cases
|
||||||
|
|
||||||
|
***PLEASE*** carefully review, test and amend the proposed changes if you find that the autopatch did not do a proper job.
|
1
autopatches/patches/new-permission-system/pr_title.md
Normal file
1
autopatches/patches/new-permission-system/pr_title.md
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Autopatch to migrate to new permission system
|
Loading…
Reference in a new issue