info.json updated

.gitlab-ci.yml

@@ -4,18 +4,18 @@ stages:
 
 build:
         stage: check
-        image: registry.gitlab.com/wolutator/base-build-env:latest
+        image: registry.hottis.de/dockerized/base-build-env:latest
         tags:
                 - hottis
                 - linux
                 - docker
         script:
                 - for I in *.py; do python -m py_compile $I; done
-                - for I in *.py; do python -m pycodestyle --max-line-length=120 $I; done
+                - for I in *.py; do python -m pycodestyle --ignore=E501 $I; done
 
 release:
         stage: release
-        image: registry.gitlab.com/wolutator/base-build-env
+        image: registry.hottis.de/dockerized/base-build-env:latest
         tags:
                 - hottis
                 - linux
@@ -23,7 +23,7 @@ release:
         only:
                 - release
         script:
-                - zip GitlabReleaseTool.zip gitlabreleaseuploader.py deleterelease.py
+                - zip GitlabReleaseTool.zip gitlabreleaseuploader.py deleterelease.py checksemver.py
                 - python gitlabreleaseuploader.py -p $PRIVATE_TOKEN -i $CI_PROJECT_ID -u $CI_PROJECT_URL -I $CI_SERVER_URL
                   -f GitlabReleaseTool.zip -F info.json -T $CI_COMMIT_REF_NAME
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Wolfgang Hottgenroth
+Copyright (c) 2019-2020 Wolfgang Hottgenroth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

checksemver.py

@@ -0,0 +1,80 @@
+#!/usr/bin/python
+
+import re
+import argparse
+import sys
+
+parser = argparse.ArgumentParser(description='Semantic Version Validator')
+parser.add_argument('--versionToValidate', '-V',
+                    help='The version to validate against the semantic versioning rules',
+                    required=True)
+parser.add_argument('--messageToValidate', '-M',
+                    help='A message to validate, means: it must not be empty',
+                    default='',
+                    required=False)
+parser.add_argument('--validateMessage', '-m',
+                    help='Consider -M',
+                    required=False,
+                    action='store_true',
+                    default=False)
+parser.add_argument('--printExports', '-e',
+                    help='Print exports',
+                    action='store_true',
+                    default=False,
+                    required=False)
+parser.add_argument('--exportFormat', '-f',
+                    help='Print exports in >bash< or >powershell< format, to be used in '
+                         'backticks or with Invoke-Expression',
+                    default='bash',
+                    required=False)
+parser.add_argument('--verbose', '-v',
+                    help='Verbose output, overrides -q',
+                    required=False,
+                    action='store_true',
+                    default=False)
+args = parser.parse_args()
+
+verbose = args.verbose
+versionToValidate = args.versionToValidate
+messageToValidate = args.messageToValidate
+validateMessage = args.validateMessage
+printExports = args.printExports
+exportFormat = args.exportFormat
+
+r = re.compile(r'^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$')
+
+if verbose:
+    print("Version to validate: {}".format(versionToValidate))
+
+m = r.match(versionToValidate)
+
+if m:
+    if verbose:
+        for i in r.groupindex:
+            print("Found: {}: {}".format(i, m.group(i)))
+    if validateMessage:
+        if verbose:
+            print("Checking message {}".format(messageToValidate))
+        if messageToValidate == '':
+            if verbose:
+                print("Message shall be validate and is invalid")
+            sys.exit(1)
+        else:
+            if printExports:
+                if exportFormat == "bash":
+                    print("export MESSAGE={}".format(messageToValidate))
+                elif exportFormat == "powershell":
+                    print("set MESSAGE {}".format(messageToValidate))
+
+    if printExports:
+        for i in r.groupindex:
+            if exportFormat == "bash":
+                print("export {}={}".format(i.upper(), '' if m.group(i) is None else m.group(i)))
+            elif exportFormat == "powershell":
+                print("set {} {}".format(i.upper(), '""' if m.group(i) is None else m.group(i)))
+
+    sys.exit(0)
+else:
+    if verbose:
+        print("Version is invalid")
+    sys.exit(1)

gitlabreleaseuploader.py

@@ -16,10 +16,15 @@ parser.add_argument('--projectUrl', '-u',
 parser.add_argument('--file', '-f',
                     help='File to be released, can appear multiple times',
                     action='append',
-                    required=True)
+                    required=False)
 parser.add_argument('--releaseName', '-n',
                     help='Name of the release', required=False,
                     default='')
+parser.add_argument('--createRelease', '-C',
+                    help='Shall the release be created here',
+                    required=False,
+                    action='store_true',
+                    default=False)
 parser.add_argument('--releaseTag', '-t',
                     help='Tag of the release in the repo',
                     required=False,
@@ -29,7 +34,7 @@ parser.add_argument('--releaseTagTarget', '-T',
                     required=False,
                     default='')
 parser.add_argument('--createReleaseTag', '-c',
-                    help='Shall the release be created here',
+                    help='Shall the release tag be created here',
                     required=False,
                     action='store_true',
                     default=False)
@@ -47,6 +52,11 @@ parser.add_argument('--instanceUrl', '-I',
 parser.add_argument('--caBundle', '-B',
                     help='File with the CA certificates to trust', required=False,
                     default='/etc/ssl/certs/ca-certificates.crt')
+parser.add_argument('--insecure',
+                    help='insecure ssl connect',
+                    required=False,
+                    action='store_true',
+                    default=False)
 parser.add_argument('--verbose', '-v',
                     help='verbose output',
                     required=False,
@@ -59,6 +69,7 @@ projectId = args.projectId
 projectUrl = args.projectUrl
 filesToUpload = args.file
 releaseName = args.releaseName
+createRelease = args.createRelease
 releaseTag = args.releaseTag
 releaseTagTarget = args.releaseTagTarget
 releaseDescription = args.description
@@ -67,14 +78,18 @@ createReleaseTag = args.createReleaseTag
 releaseInfoFilename = args.releaseInfoFile
 caBundle = args.caBundle
 verbose = args.verbose
-releaseInfo = {}
+insecure = args.insecure
 
+releaseInfo = {}
 if (releaseInfoFilename):
     with open(releaseInfoFilename, 'r') as releaseInfoFile:
         releaseInfo = releaseInfoFile.read()
     releaseInfo = json.loads(releaseInfo)
     if 'releaseName' in releaseInfo:
         releaseName = releaseInfo['releaseName']
+    if 'createRelease' in releaseInfo:
+        createRelease = (releaseInfo['createRelease'] in
+                         ('true', 'True'))
     if 'releaseTag' in releaseInfo:
         releaseTag = releaseInfo['releaseTag']
     if 'releaseTagTarget' in releaseInfo:
@@ -87,91 +102,159 @@ if (releaseInfoFilename):
 
 if releaseName == '':
     raise Exception('No release name given')
-if releaseTag == '':
+if (releaseTag == '') and createRelease:
-    raise Exception('No release tag given')
+    raise Exception('No release tag given but creation of release requested')
-if releaseTagTarget == '':
+if (releaseTagTarget == '') and createReleaseTag:
-    raise Exception('No release tag target given')
+    raise Exception('No release tag target given but creation of tag requested')
-if releaseDescription == '':
+if (releaseDescription == '') and createRelease:
-    raise Exception('No release description given')
+    raise Exception('No release description given but creation of release requested')
+
+if insecure:
+    caBundle = (False)
+
+
+def checkAndShowResult(result, expectedCode, errorMessage):
+    global verbose
+
+    if result.status_code != expectedCode:
+        print(result)
+        print(result.text)
+        raise Exception(errorMessage)
+
+    if verbose:
+        print(result)
+        print(result.text)
 
 
 # --- upload the file
-uploadUrl = "%s/api/v4/projects/%s/uploads" % (instanceUrl, projectId)
+assets = []  # is required later, must be defined
-headers = {"PRIVATE-TOKEN": privateToken}
+if filesToUpload:
+    url = "%s/api/v4/projects/%s/uploads" % (instanceUrl, projectId)
+    headers = {"PRIVATE-TOKEN": privateToken}
 
-assets = []
+    for filename in filesToUpload:
-for filename in filesToUpload:
         with open(filename, 'rb') as filehandle:
             files = {"file": filehandle}
 
-        uploadResult = requests.post(uploadUrl, files=files, headers=headers, verify=caBundle)
-
-        if uploadResult.status_code != 201:
-            print(uploadResult)
-            print(uploadResult.text)
-            raise Exception('Unable to upload file to Gitlab')
-
             if verbose:
-            print(uploadResult)
+                print("POST to {}".format(url))
-            print(uploadResult.text)
+            result = requests.post(url, files=files, headers=headers, verify=caBundle)
-        print('File {} successfully uploaded'.format(filename))
 
-        url = projectUrl + json.loads(uploadResult.text)['url']
+            checkAndShowResult(result, 201, 'Unable to upload file to Gitlab')
-        assets.append({'name': filename, 'url': url})
+
+            assetUrl = projectUrl + json.loads(result.text)['url']
+            assets.append({'name': filename, 'url': assetUrl, 'id': "new-link-{}".format(len(assets))})
+
+            print('File {} successfully uploaded, url is {}'.format(filename, assetUrl))
 
 # --- create release tag
 if createReleaseTag:
-    createReleaseTagUrl = ("%s/api/v4//projects/%s/repository/tags" %
+    url = ("%s/api/v4//projects/%s/repository/tags" % (instanceUrl, projectId))
-                           (instanceUrl, projectId))
+    headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
-    headers = {"PRIVATE-TOKEN": privateToken,
-               "Content-Type": "application/json"}
 
-    payloadCreateReleaseTag = {
+    payload = {
         "tag_name": releaseTag,
         "id": projectId,
         "ref": releaseTagTarget,
         "message": "Tag for release %s" % releaseName
     }
 
-    createReleaseTagResult = requests.post(createReleaseTagUrl,
-                                           headers=headers,
-                                           data=json.dumps(payloadCreateReleaseTag),
-                                           verify=caBundle)
-
-    if createReleaseTagResult.status_code != 201:
-        print(createReleaseTagResult)
-        print(createReleaseTagResult.text)
-        raise Exception('Unable to create release tag')
-
     if verbose:
-        print(createReleaseTagResult)
+        print("POST to {}".format(url))
-        print(createReleaseTagResult.text)
+    result = requests.post(url, headers=headers, data=json.dumps(payload), verify=caBundle)
+
+    checkAndShowResult(result, 201, 'Unable to create release tag')
+
     print('Tag successfully created')
 
 
 # --- create release
-createReleaseUrl = "%s/api/v4/projects/%s/releases" % (instanceUrl, projectId)
+if createRelease:
-headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
+    url = "%s/api/v4/projects/%s/releases" % (instanceUrl, projectId)
+    headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
 
-payloadCreateRelease = {
+    payload = {
         "name": releaseName,
         "tag_name": releaseTag,
-  "description": releaseDescription,
+        "description": releaseDescription
-  "assets": {
-    "links": assets
     }
-}
 
-createReleaseResult = requests.post(createReleaseUrl, headers=headers,
+    if verbose:
-                                    data=json.dumps(payloadCreateRelease),
+        print("POST to {}".format(url))
-                                    verify=caBundle)
+    result = requests.post(url, headers=headers, data=json.dumps(payload), verify=caBundle)
 
-if createReleaseResult.status_code != 201:
+    checkAndShowResult(result, 201, 'Unable to create release')
-    print(createReleaseResult)
-    print(createReleaseResult.text)
-    raise Exception('Unable to create release')
 
+    print('Release successfully created')
+
+
+# --- update release in case of additional description
+if not createRelease and releaseDescription:
+    # --- get release to fetch existing description
+    url = "%s/api/v4/projects/%s/releases/%s" % (instanceUrl, projectId, releaseName)
+    headers = {"PRIVATE-TOKEN": privateToken}
+
+    if verbose:
+        print("GET to {}".format(url))
+    result = requests.get(url, headers=headers, verify=caBundle)
+
+    checkAndShowResult(result, 200, 'Unable to get release')
+    existingDescription = json.loads(result.text)['description']
+    print("Existing description is {}".format(existingDescription))
+
+    releaseDescription += "\n\n---------------------------------------------\n\n"
+    releaseDescription += existingDescription
+
+    # --- update release
+    url = "%s/api/v4/projects/%s/releases/%s" % (instanceUrl, projectId, releaseName)
+    headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
+
+    payload = {
+        "name": releaseName,
+        "tag_name": releaseTag,
+        "description": releaseDescription
+    }
+
+    if verbose:
+        print("PUT to {}".format(url))
+    result = requests.put(url, headers=headers, data=json.dumps(payload), verify=caBundle)
+
+    checkAndShowResult(result, 200, 'Unable to update release')
+
+    print('Release successfully update')
+
+
+# --- add assets
+# get existing assets
+headers = {"PRIVATE-TOKEN": privateToken}
+url = "%s/api/v4/projects/%s/releases/%s" % (instanceUrl, projectId, releaseName)
 if verbose:
-    print(createReleaseResult)
+    print("GET to {}".format(url))
-    print(createReleaseResult.text)
+result = requests.get(url, headers=headers, verify=caBundle)
-print('Release successfully created')
+checkAndShowResult(result, 200, 'Unable to get release information')
+
+# add existing assets to list of assets
+links = json.loads(result.text)['assets']['links']
+assets.extend(links)
+
+# delete existing assets
+headers = {"PRIVATE-TOKEN": privateToken}
+for link in links:
+    assetId = link['id']
+    url = "%s/api/v4/projects/%s/releases/%s/assets/links/%s" % (instanceUrl, projectId, releaseName, assetId)
+    if verbose:
+        print("DELETE to {}".format(url))
+    result = requests.delete(url, headers=headers, verify=caBundle)
+    checkAndShowResult(result, 200, 'Unable to delete asset')
+    print("Asset {} successfully deleted".format(assetId))
+
+
+# create all assets ("existing" and new)
+headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
+url = "%s/api/v4/projects/%s/releases/%s/assets/links" % (instanceUrl, projectId, releaseName)
+for asset in assets:
+    if verbose:
+        print("POST to {}".format(url))
+    result = requests.post(url, headers=headers, data=json.dumps(asset), verify=caBundle)
+    checkAndShowResult(result, 201, "Unable to create asset")
+    print("Asset {} successfully created".format(asset))

info.json

@@ -1,7 +1,7 @@
 {
-  "releaseTag": "v1.10d",
+  "releaseTag": "v1.12",
   "createReleaseTag": "true",
-  "releaseName": "re-add insecure, second fix",
+  "releaseName": "updater release",
-  "description": "re-add insecure option to deleterelease script, second fix"
+  "description": "add option to add files to existing release or extend description of existing release"
 }