second fix

deleterelease.py

@@ -23,11 +23,16 @@ parser.add_argument('--verbose', '-v',
                     required=False,
                     action='store_true',
                     default=False)
+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)
+
+
 args = parser.parse_args()
 
 privateToken = args.privateToken
@@ -35,9 +40,9 @@ projectId = args.projectId
 releaseTag = args.releaseTag
 instanceUrl = args.instanceUrl
 verbose = args.verbose
+caBundle = args.caBundle
 insecure = args.insecure
 
-
 # --- delete release
 deleteReleaseUrl = "%s/api/v4/projects/%s/releases/%s" % (instanceUrl, projectId, releaseTag)
 headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
@@ -45,7 +50,10 @@ headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
 if verbose:
     print("URL: %s" % deleteReleaseUrl)
 
-deleteReleaseResult = requests.delete(deleteReleaseUrl, headers=headers, verify=(not insecure))
+if insecure:
+    caBundle = (False)
+
+deleteReleaseResult = requests.delete(deleteReleaseUrl, headers=headers, verify=caBundle)
 
 if deleteReleaseResult.status_code != 200:
     print(deleteReleaseResult)

gitlabreleaseuploader.py

@@ -14,7 +14,9 @@ parser.add_argument('--projectId', '-i',
 parser.add_argument('--projectUrl', '-u',
                     help='URL of the related project at Gitlab', required=True)
 parser.add_argument('--file', '-f',
-                    help='File to be released', required=True)
+                    help='File to be released, can appear multiple times',
+                    action='append',
+                    required=True)
 parser.add_argument('--releaseName', '-n',
                     help='Name of the release', required=False,
                     default='')
@@ -42,6 +44,9 @@ parser.add_argument('--releaseInfoFile', '-F',
 parser.add_argument('--instanceUrl', '-I',
                     help='URL of your gitlab instance', required=False,
                     default='https://gitlab.com')
+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('--verbose', '-v',
                     help='verbose output',
                     required=False,
@@ -52,7 +57,7 @@ args = parser.parse_args()
 privateToken = args.privateToken
 projectId = args.projectId
 projectUrl = args.projectUrl
-fileToUpload = args.file
+filesToUpload = args.file
 releaseName = args.releaseName
 releaseTag = args.releaseTag
 releaseTagTarget = args.releaseTagTarget
@@ -60,6 +65,7 @@ releaseDescription = args.description
 instanceUrl = args.instanceUrl
 createReleaseTag = args.createReleaseTag
 releaseInfoFilename = args.releaseInfoFile
+caBundle = args.caBundle
 verbose = args.verbose
 releaseInfo = {}
 
@@ -92,21 +98,26 @@ if releaseDescription == '':
 # --- upload the file
 uploadUrl = "%s/api/v4/projects/%s/uploads" % (instanceUrl, projectId)
 headers = {"PRIVATE-TOKEN": privateToken}
-files = {"file": open(fileToUpload, 'rb')}
 
-uploadResult = requests.post(uploadUrl, files=files, headers=headers)
+assets = []
+for filename in filesToUpload:
+    with open(filename, 'rb') as filehandle:
+        files = {"file": filehandle}
 
-if uploadResult.status_code != 201:
+        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:
+        if verbose:
             print(uploadResult)
             print(uploadResult.text)
-print('File successfully uploaded')
+        print('File {} successfully uploaded'.format(filename))
 
-uploadResultJson = json.loads(uploadResult.text)
+        url = projectUrl + json.loads(uploadResult.text)['url']
+        assets.append({'name': filename, 'url': url})
 
 # --- create release tag
 if createReleaseTag:
@@ -124,7 +135,8 @@ if createReleaseTag:
 
     createReleaseTagResult = requests.post(createReleaseTagUrl,
                                            headers=headers,
-                                           data=json.dumps(payloadCreateReleaseTag))
+                                           data=json.dumps(payloadCreateReleaseTag),
+                                           verify=caBundle)
 
     if createReleaseTagResult.status_code != 201:
         print(createReleaseTagResult)
@@ -140,24 +152,19 @@ if createReleaseTag:
 # --- create release
 createReleaseUrl = "%s/api/v4/projects/%s/releases" % (instanceUrl, projectId)
 headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
-fullUrl = projectUrl + uploadResultJson['url']
 
 payloadCreateRelease = {
   "name": releaseName,
   "tag_name": releaseTag,
   "description": releaseDescription,
   "assets": {
-    "links": [
-      {
-        "name": fileToUpload,
-        "url": fullUrl
-      }
-    ]
+    "links": assets
   }
 }
 
 createReleaseResult = requests.post(createReleaseUrl, headers=headers,
-                                    data=json.dumps(payloadCreateRelease))
+                                    data=json.dumps(payloadCreateRelease),
+                                    verify=caBundle)
 
 if createReleaseResult.status_code != 201:
     print(createReleaseResult)

info.json

@@ -1,7 +1,7 @@
 {
-  "releaseTag": "v1.7",
+  "releaseTag": "v1.10c",
   "createReleaseTag": "true",
-  "releaseName": "Delete Release supporting release",
-  "description": "Separate tool to delete releases added"
+  "releaseName": "re-add insecure, second fix",
+  "description": "re-add insecure option to deleterelease script, second fix"
 }
 

readme.md

@@ -21,6 +21,7 @@ Gitlab CI scripts.
                                     [--createReleaseTag]
                                     [--description DESCRIPTION]
                                     [--releaseInfoFile RELEASEINFOFILE]
+                                    [--caBundle FILE_WITH_CA_CERTIFICATES_TO_TRUST]
                                     [--instanceUrl INSTANCEURL] [--verbose]
 
     Gitlab Release Uploader
@@ -49,6 +50,7 @@ Gitlab CI scripts.
                             tag, create release tag, description
     --instanceUrl INSTANCEURL, -I INSTANCEURL
                             URL of your gitlab instance
+    --caBundle FILE_WITH_CA_CERTIFICATES_TO_TRUST, -B FILE_WITH_CA_CERTIFICATES_TO_TRUST                        
     --verbose, -v         verbose output
     wn@tron:~/workspace-python/gitlabreleaseuploader [master ≡]$