Merge pull request #905 from DDanii/master

[Draft] remove password from addon updater

addons_updater/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.16
+- Removed git password option as it is no longer usable
+
 ## 3.15
 - Apply github_tagfilter to dockerhub
 

addons_updater/README.md

@@ -68,10 +68,9 @@ Here you define the values that will allow the addon to connect to your reposito
 ```yaml
 repository: 'name/repo' coming from github
 gituser: your github username
-gitpass: your github password
+gitapi: your github api token(classic) https://github.com/settings/tokens
 gitmail: your github email
 verbose: 'false'
-gitapi: optional, it is the API key from your github repo
 ```
 
 Example:
@@ -79,7 +78,7 @@ Example:
 ```yaml
 repository: alexbelgium/hassio-addons
 gituser: your github username
-gitpass: your github password
+gitapi: your github api token
 gitmail: your github email
 verbose: "false"
 ```

addons_updater/config.json

@@ -14,15 +14,14 @@
   "init": false,
   "name": "Repository Updater",
   "options": {
-    "gitpass": "gitpassword",
+    "gitapi": "gitapi",
     "gituser": "gituser",
     "repository": "alexbelgium/hassio-addons"
   },
   "schema": {
     "dry_run": "bool?",
-    "gitapi": "str?",
+    "gitapi": "str",
     "gitmail": "str?",
-    "gitpass": "str",
     "gituser": "str",
     "repository": "str",
     "verbose": "bool?"
@@ -30,5 +29,5 @@
   "slug": "updater",
   "startup": "once",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/addons_updater",
-  "version": "3.15"
+  "version": "3.16"
 }

addons_updater/rootfs/etc/cont-init.d/99-run.sh

@@ -18,12 +18,10 @@ VERBOSE=$(bashio::config 'verbose')
 LOGINFO="... github authentification" && if [ "$VERBOSE" = true ]; then bashio::log.info "$LOGINFO"; fi
 
 GITUSER=$(bashio::config 'gituser')
-GITPASS=$(bashio::config 'gitpass')
 GITMAIL=$(bashio::config 'gitmail')
 git config --system http.sslVerify false
 git config --system credential.helper 'cache --timeout 7200'
 git config --system user.name "${GITUSER}"
-git config --system user.password "${GITPASS}"
 if [[ "$GITMAIL" != "null" ]]; then git config --system user.email "${GITMAIL}"; fi
 
 if bashio::config.has_value 'gitapi'; then
@@ -229,12 +227,7 @@ for f in */; do
 
             LOGINFO="... $SLUG : push to github" && if [ "$VERBOSE" = true ]; then bashio::log.info "$LOGINFO"; fi
 
-            # if API is set
-            if bashio::config.has_value 'gitapi'; then
-                git remote set-url origin "https://${GITUSER}:${GITHUB_API_TOKEN}@github.com/${REPOSITORY}" &>/dev/null
-            else
-                git remote set-url origin "https://${GITUSER}:${GITPASS}@github.com/${REPOSITORY}" &>/dev/null
-            fi
+            git remote set-url origin "https://${GITUSER}:${GITHUB_API_TOKEN}@github.com/${REPOSITORY}" &>/dev/null
 
             # Push
             if ! bashio::config.true "dry_run"; then