wn/gitlabreleaseuploader
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ca bundle added

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-02-28 19:34:31 +01:00
parent 3ea721a4e7
commit 5fd785a826
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deleterelease.py
View File

@ -23,11 +23,15 @@ parser.add_argument('--verbose', '-v',
required=False, required=False,
action='store_true', action='store_true',
default=False) default=False)
parser.add_argument('--insecure', #parser.add_argument('--insecure',
help='insecure ssl connect', # help='insecure ssl connect',
required=False, # required=False,
action='store_true', # action='store_true',
default=False) # default=False)
parser.add_argument('--caBundle', '-B',
help='File with the CA certificates to trust', required=False,
default='/etc/ssl/certs/ca-certificates.crt')
args = parser.parse_args() args = parser.parse_args()
privateToken = args.privateToken privateToken = args.privateToken
@ -35,7 +39,9 @@ projectId = args.projectId
releaseTag = args.releaseTag releaseTag = args.releaseTag
instanceUrl = args.instanceUrl instanceUrl = args.instanceUrl
verbose = args.verbose verbose = args.verbose
insecure = args.insecure #insecure = args.insecure
caBundle = args.caBundle
# --- delete release # --- delete release
@ -45,7 +51,7 @@ headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
if verbose: if verbose:
print("URL: %s" % deleteReleaseUrl) print("URL: %s" % deleteReleaseUrl)
deleteReleaseResult = requests.delete(deleteReleaseUrl, headers=headers, verify=(not insecure)) deleteReleaseResult = requests.delete(deleteReleaseUrl, headers=headers, verify=caBundle)
if deleteReleaseResult.status_code != 200: if deleteReleaseResult.status_code != 200:
print(deleteReleaseResult) print(deleteReleaseResult)

12
gitlabreleaseuploader.py
View File

@ -42,6 +42,9 @@ parser.add_argument('--releaseInfoFile', '-F',
parser.add_argument('--instanceUrl', '-I', parser.add_argument('--instanceUrl', '-I',
help='URL of your gitlab instance', required=False, help='URL of your gitlab instance', required=False,
default='https://gitlab.com') 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', parser.add_argument('--verbose', '-v',
help='verbose output', help='verbose output',
required=False, required=False,
@ -60,6 +63,7 @@ releaseDescription = args.description
instanceUrl = args.instanceUrl instanceUrl = args.instanceUrl
createReleaseTag = args.createReleaseTag createReleaseTag = args.createReleaseTag
releaseInfoFilename = args.releaseInfoFile releaseInfoFilename = args.releaseInfoFile
caBundle = args.caBundle
verbose = args.verbose verbose = args.verbose
releaseInfo = {} releaseInfo = {}
@ -94,7 +98,7 @@ uploadUrl = "%s/api/v4/projects/%s/uploads" % (instanceUrl, projectId)
headers = {"PRIVATE-TOKEN": privateToken} headers = {"PRIVATE-TOKEN": privateToken}
files = {"file": open(fileToUpload, 'rb')} files = {"file": open(fileToUpload, 'rb')}
uploadResult = requests.post(uploadUrl, files=files, headers=headers) uploadResult = requests.post(uploadUrl, files=files, headers=headers, verify=caBundle)
if uploadResult.status_code != 201: if uploadResult.status_code != 201:
print(uploadResult) print(uploadResult)
@ -124,7 +128,8 @@ if createReleaseTag:
createReleaseTagResult = requests.post(createReleaseTagUrl, createReleaseTagResult = requests.post(createReleaseTagUrl,
headers=headers, headers=headers,
data=json.dumps(payloadCreateReleaseTag)) data=json.dumps(payloadCreateReleaseTag),
verify=caBundle)
if createReleaseTagResult.status_code != 201: if createReleaseTagResult.status_code != 201:
print(createReleaseTagResult) print(createReleaseTagResult)
@ -157,7 +162,8 @@ payloadCreateRelease = {
} }
createReleaseResult = requests.post(createReleaseUrl, headers=headers, createReleaseResult = requests.post(createReleaseUrl, headers=headers,
data=json.dumps(payloadCreateRelease)) data=json.dumps(payloadCreateRelease),
verify=caBundle)
if createReleaseResult.status_code != 201: if createReleaseResult.status_code != 201:
print(createReleaseResult) print(createReleaseResult)

6
info.json
View File

@ -1,7 +1,7 @@
{ {
"releaseTag": "v1.7", "releaseTag": "v1.8",
"createReleaseTag": "true", "createReleaseTag": "true",
"releaseName": "Delete Release supporting release", "releaseName": "CA Bundle",
"description": "Separate tool to delete releases added" "description": "Option to provide CA bundle file for ssl verification"
} }

2
readme.md
View File

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