From 8ac80fe9e86e2c449004e1dab6860593e3ef8356 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Fri, 5 Jul 2019 11:03:35 +0100 Subject: [PATCH] Don't use deprecated GitLab session endpoint --- bootstrap/__init__.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/bootstrap/__init__.py b/bootstrap/__init__.py index 840263f..743e1f9 100644 --- a/bootstrap/__init__.py +++ b/bootstrap/__init__.py @@ -105,22 +105,21 @@ def set_github_ssh_key(): def set_gitlab_ssh_key(): """Set GitLab SSH key.""" api_url = '%s/api/v4' % get_url('GitLab', 'https://gitlab.com') - session_url = '%s/session' % api_url keys_url = '%s/user/keys' % api_url username, password = get_username_password('GitLab') - response = post(session_url, {'login': username, 'password': password}) - if response.status_code != 201: - raise bootstrap_error(response) - auth = {'Private-Token': response.json()['private_token']} - response = get(keys_url, headers=auth) + credentials = {'login': username, 'password': password} + response = get(keys_url, credentials) if response.status_code != 200: raise bootstrap_error(response) keys = response.json() local_key = get_local_key() if not key_exists(keys, local_key): - response = post( - keys_url, headers=auth, json={'title': node(), - 'key': local_key}) + response = post(keys_url, + credentials, + json={ + 'title': node(), + 'key': local_key + }) if response.status_code != 201: raise bootstrap_error(response)