Compare commits

..

No commits in common. "6d7c03fb3d91f12abc3a33af297245e619897a6f" and "a450ed9058b89a5235f27227448343b90986b204" have entirely different histories.

2 changed files with 48 additions and 65 deletions

View file

@ -1,6 +1,6 @@
FROM alpine
ADD aptly-publish /bin/
RUN chmod +x /bin/aptly-publish
ADD entrypoint.py /bin/
RUN chmod +x /bin/entrypoint.py
RUN apk -Uuv add python3 py3-requests py3-urllib3 py3-pip
RUN pip install debian-parser
ENTRYPOINT /bin/aptly-publish
ENTRYPOINT /bin/entrypoint.py

View file

@ -16,38 +16,28 @@ from urllib3.util import Retry
from debian_parser import PackagesParser
def from_env(name, default=None):
""" Retrieve a parameter from environment """
for var in (f'PLUGIN_{name}', f'APTLY_{name}'):
if var in os.environ:
return os.environ[var]
return default
# Handle parameters from environment
API_URL = from_env('API_URL', None)
API_URL = os.environ.get('PLUGIN_API_URL', None)
if not API_URL:
print('API URL not provided')
sys.exit(1)
API_USERNAME = from_env('API_USERNAME', None)
API_USERNAME = os.environ.get('PLUGIN_API_USERNAME', None)
if not API_USERNAME:
print('API username not provided')
sys.exit(1)
API_PASSWORD = from_env('API_PASSWORD', None)
API_PASSWORD = os.environ.get('PLUGIN_API_PASSWORD', None)
if not API_PASSWORD:
print('API password not provided')
sys.exit(1)
MAX_RETRY = from_env('MAX_RETRIES', None)
MAX_RETRY = os.environ.get('PLUGIN_MAX_RETRIES', None)
REPO_NAME = from_env('REPO_NAME', 'stable')
PREFIX = from_env('PREFIX', '.')
REPO_COMPONENT = from_env('REPO_COMPONENT', 'main')
INPUT_PATH = from_env('PATH', 'dist')
SOURCE_NAME = from_env('SOURCE_PACKAGE_NAME', None)
DISTRIBUTIONS = []
REPO_NAME = os.environ.get('PLUGIN_REPO_NAME', 'stable')
REPO_COMPONENT = os.environ.get('PLUGIN_REPO_COMPONENT', 'main')
DIST = os.environ.get('PLUGIN_PATH', 'dist')
SOURCE_NAME = os.environ.get('PLUGIN_SOURCE_PACKAGE_NAME', None)
# List changes files
changes_files_regex = (
@ -58,21 +48,21 @@ changes_files_regex = (
)
changes_files = []
try:
for filename in os.listdir(INPUT_PATH):
filepath = os.path.join(INPUT_PATH, filename)
for filename in os.listdir(DIST):
filepath = os.path.join(DIST, filename)
if not os.path.isfile(filepath):
continue
if changes_files_regex.match(filename):
changes_files.append(filepath)
except FileNotFoundError:
print(f'Specified directory path "{INPUT_PATH}" not found')
print(f'Specified directory path "{DIST}" not found')
sys.exit(1)
except NotADirectoryError:
print(f'Specified path "{INPUT_PATH}" is not a directory')
print(f'Specified path "{DIST}" is not a directory')
sys.exit(1)
if not changes_files:
print(f'No changes file found in {INPUT_PATH}')
print(f'No changes file found in {DIST}')
sys.exit(1)
@ -98,14 +88,13 @@ def list_files_in_changes_file(filepath):
files = []
for infos in parser.parse():
for info in infos:
if info['tag'].lower() == 'files':
if info['tag'].lower() != 'files':
continue
for line in info['value'].split(' '):
if not line:
continue
files.append(os.path.join(dirpath, line.split()[-1]))
if info['tag'].lower() == 'distribution':
if info['value'] not in DISTRIBUTIONS:
DISTRIBUTIONS.append(info['value'])
return files
@ -148,9 +137,7 @@ def include_file(package_name, changes_file):
result.status_code == 200 and
data.get('Report', {}).get('Added')
):
print(
f'Unknown error occurred including {changes_file}'
'See APTLY API logs for details.')
print(f'Unknown error occurred including {changes_file}')
return False
return True
@ -163,8 +150,9 @@ for changes_file in changes_files:
for filepath in filepaths:
if not upload_file(package_name, filepath):
print(
f' - {filepath}: fail to upload file. See APTLY API logs '
'for details.')
f' - {filepath}: fail to upload file, pass this changes '
'file'
)
sys.exit(1)
else:
print(f' - {filepath}')
@ -194,35 +182,30 @@ error = (
not data.get('CreatedAt')
)
if error:
print(
f'Fail to create snapshot "{snap_name}" of repository "{REPO_NAME}".'
'See APTLY API logs for details.')
print(f'Fail to create snapshot "{snap_name}" of repository "{REPO_NAME}"')
sys.exit(1)
# Update published snapshot of repository for each distributions
for distribution in DISTRIBUTIONS:
print(
f'Update published snapshot of distribution "{distribution}" to '
f'"{snap_name}" (prefix: {PREFIX})')
url = f'{API_URL}/publish/:{PREFIX}/{distribution}'
payload = {
# Update published snapshot of repository
print(
f'Update published snapshot of repository "{REPO_NAME}" to "{snap_name}"')
url = f'{API_URL}/publish/:./{REPO_NAME}'
payload = {
'Snapshots': [
{
'Component': REPO_COMPONENT,
'Name': snap_name
}
]
}
result = session.put(url, json=payload)
if (
}
result = session.put(url, json=payload)
if (
result.status_code < 200 or
result.status_code > 299
):
):
print(
f'Fail to update published snapshot of distribution "{distribution}" '
f'to "{snap_name}" (prefix: {PREFIX}). See APTLY API logs for '
'details.')
f'Fail to update published snapshot of repository "{REPO_NAME}" to '
f'"{snap_name}"')
sys.exit(1)
print("Done.")