diff --git a/gitlab-user-offboarding/sanitize_gitlab_user.py b/gitlab-user-offboarding/sanitize_gitlab_user.py index 264c690bb9d27b97fb9fe52f0d7a06858bbe2b4d..414adbcd4ca7487d1cfc882bf472174ec6d4d5c7 100644 --- a/gitlab-user-offboarding/sanitize_gitlab_user.py +++ b/gitlab-user-offboarding/sanitize_gitlab_user.py @@ -8,7 +8,7 @@ import logging import requests from requests.auth import HTTPBasicAuth -def _remove_from_groups(gl, user): +def remove_from_groups(gl, user): groups = gl.groups.list(all=True) for group in groups: @@ -26,7 +26,7 @@ def _remove_from_groups(gl, user): logs.warning(e) continue -def _remove_from_projects(gl, user): +def remove_from_projects(gl, user): logs.info(f"Searching projects for {user.name}") projects = gl.projects.list(all=True) for project in projects: @@ -44,8 +44,8 @@ def _remove_from_projects(gl, user): logs.warning(e) continue -# This was done with requests package because gitlab-python offers not obvious way of doing this -def _remove_user_tokens(gitlab_url, user): +# This was done with requests package because gitlab-python offers no obvious way of doing this +def remove_user_tokens(gitlab_url, user): try: r = requests.get(f'{gitlab_url}/api/v4/personal_access_tokens?user_id={user.id}', headers={'PRIVATE_TOKEN': os.environ["PRIVATE_TOKEN"]}) @@ -80,13 +80,12 @@ def main(): for username in args.users: print(username) user = gl.users.list(username=username)[0] - _remove_user_tokens(gitlab_url, user) - _remove_from_groups(gl, user) - _remove_from_projects(gl, user) + remove_user_tokens(gitlab_url, user) + remove_from_groups(gl, user) + remove_from_projects(gl, user) if __name__ == "__main__": logs = logging.getLogger("rotate") - # Get logging level, set manually when running pipeline loglevel = os.environ.get("LOGLEVEL", "INFO").upper() if loglevel == "DEBUG": logging.basicConfig( diff --git a/harbor-user-offboarding/sanitize_harbor_user.py b/harbor-user-offboarding/sanitize_harbor_user.py deleted file mode 100755 index 636832ebdf065266009f1f0ebe23cadcc7d82461..0000000000000000000000000000000000000000 --- a/harbor-user-offboarding/sanitize_harbor_user.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/python3 -import argparse -import sys -import requests -import json -import os -import logging -from requests.auth import HTTPBasicAuth - -def _cache_rpm_repo(sync_type, group, src_repo, dest_repo, proxies): - _create_repo(sync_type, group, dest_repo, src_repo, proxies) - package_repo = repomd.load(src_repo) - - logs.info(package_repo) - for package in package_repo: - logs.info(f"getting package {dest_repo}{package.location}") - r = requests.head(f"{dest_repo}{package.location}", proxies=proxies) - -def main(): - parser = argparse.ArgumentParser(description='Cache RPM and Debian packages in Nexus') - - parser.add_argument('repo_file', help="Run on a single repo", default="repo_file.json") - parser.add_argument('--proxy', help="Add proxy for staging", default={}) - args = parser.parse_args() - - proxies = args.proxy - - if args.proxy: - proxies = { - 'http': f'{args.proxy}', - 'https': f'{args.proxy}', - } - -if __name__ == "__main__": - logs = logging.getLogger("mirror") - # Get logging level, set manually when running pipeline - loglevel = os.environ.get("LOGLEVEL", "INFO").upper() - if loglevel == "DEBUG": - logging.basicConfig( - level=loglevel, - filename="mirror_log.out", - format="%(levelname)s [%(filename)s:%(lineno)d]: %(message)s", - ) - logging.debug("Log level set to debug") - else: - logging.basicConfig(level=loglevel, format="%(levelname)s: %(message)s") - logging.info("Log level set to info") - sys.exit(main()) diff --git a/rotate-credentials/rotate-credentials.py b/rotate-credentials/rotate-credentials.py index d1c46698c59a7c735670e69422a3c3e2f1d9f9f2..508bc812a6a7eed3b2077c128c5c55985e9fa232 100644 --- a/rotate-credentials/rotate-credentials.py +++ b/rotate-credentials/rotate-credentials.py @@ -29,7 +29,7 @@ def _create_client(): client = session.client( service_name='secretsmanager' ) - except: + except Exception as e: logs.info(f"Error creating client: {e}") sys.exit(1) @@ -254,7 +254,7 @@ def main(): parser.add_argument( '--insecure', help="ignore SSL verification", - default=True, + default=False, action='store_false' ) args = parser.parse_args()