From bcbcba69f6a121ebc86aadf51a388a082a269afb Mon Sep 17 00:00:00 2001 From: BosAtWork Date: Tue, 14 Jan 2020 17:05:42 +0100 Subject: [PATCH 1/3] Add support for bitbucket server 6.6.2 Sample json that bitbucket server 6.6.2 sends as hook { "eventKey":"repo:refs_changed", "date":"2020-01-14T16:30:45+0100", "actor":{ "name":"****", "emailAddress":"****", "id":8361, "displayName":"****", "active":true, "slug":"****", "type":"NORMAL", "links":{ "self":[ { "href":"****" } ] } }, "repository":{ "slug":"****", "id":2659, "name":"****", "scmId":"git", "state":"AVAILABLE", "statusMessage":"Available", "forkable":false, "project":{ "key":"****", "id":2264, "name":"****", "description":"****", "public":false, "type":"NORMAL", "links":{ "self":[ { "href":"****" } ] } }, "public":false, "links":{ "clone":[ { "href":"****.git", "name":"http" }, { "href":"ssh://git@****.git", "name":"ssh" } ], "self":[ { "href":"https://****/browse" } ] } }, "changes":[ { "ref":{ "id":"refs/heads/hotfix/transfer-should-be-checked", "displayId":"hotfix/transfer-should-be-checked", "type":"BRANCH" }, "refId":"refs/heads/hotfix/transfer-should-be-checked", "fromHash":"0000000000000000000000000000000000000000", "toHash":"4a24622fd85f304770079a8b4dbf9566ea1928c5", "type":"ADD" } ] } --- functions/source/GitPullS3/lambda_function.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/functions/source/GitPullS3/lambda_function.py b/functions/source/GitPullS3/lambda_function.py index 4686be2..3d18384 100644 --- a/functions/source/GitPullS3/lambda_function.py +++ b/functions/source/GitPullS3/lambda_function.py @@ -191,7 +191,11 @@ def lambda_handler(event, context): # Bibucket server branch_name = event['body-json']['push']['changes'][0]['new']['name'] except: - branch_name = 'master' + # Bitbucket Server v6.6.1 + try: + branch_name = event['body-json']['changes'][0]['ref']['displayId'] + except: + branch_name = 'master' try: # GitLab remote_url = event['body-json']['project']['git_ssh_url'] From 277f6da12e96027ed974b640370114855c2d5c6d Mon Sep 17 00:00:00 2001 From: Jay McConnell Date: Fri, 14 Aug 2020 14:59:24 -0700 Subject: [PATCH 2/3] update zip --- functions/packages/GitPullS3/lambda.zip | Bin 6799464 -> 6799513 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/functions/packages/GitPullS3/lambda.zip b/functions/packages/GitPullS3/lambda.zip index d92f9ce8476e21399a4b8af1e9cbe78e4b091af0..f21509d36ee553543684cc9fdfb8ed5ef855e965 100644 GIT binary patch delta 6393 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 X+Bhl2nn9F3h;B11Nq?^d1_}QU4H|D1 delta 6389 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 From 46d668cc850bfde2728057529cabaa6b9f23b0c9 Mon Sep 17 00:00:00 2001 From: Chandrashekar Date: Tue, 15 Sep 2020 19:17:03 -0500 Subject: [PATCH 3/3] fixed dockerfile to use python 3.8 --- .gitignore | 3 ++- functions/source/CreateSSHKey/Dockerfile | 4 ++-- templates/git2s3.template.yaml | 13 ++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 7490f9f..3aaca1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ functions/packages .idea -.DS_Store \ No newline at end of file +.DS_Store +taskcat_outputs \ No newline at end of file diff --git a/functions/source/CreateSSHKey/Dockerfile b/functions/source/CreateSSHKey/Dockerfile index 4e386cf..80b85e6 100644 --- a/functions/source/CreateSSHKey/Dockerfile +++ b/functions/source/CreateSSHKey/Dockerfile @@ -1,9 +1,9 @@ -FROM lambci/lambda:build-python3.7 +FROM lambci/lambda:build-python3.8 COPY . . RUN mkdir -p python/ && \ - pip install -t python/ -r ./requirements.txt && \ + pip install -t ./ -r ./requirements.txt && \ find . -name "*.dist-info" -exec rm -rf {} \; | true && \ find . -name "*.egg-info" -exec rm -rf {} \; | true && \ find . -name "*.pth" -exec rm -rf {} \; | true && \ diff --git a/templates/git2s3.template.yaml b/templates/git2s3.template.yaml index 01eda46..31b91f7 100644 --- a/templates/git2s3.template.yaml +++ b/templates/git2s3.template.yaml @@ -144,7 +144,6 @@ Resources: - functions/packages/CreateSSHKey/lambda.zip - functions/packages/DeleteBucketContents/lambda.zip - functions/packages/GitPullS3/lambda.zip - - functions/packages/CustomActionLambda/lambda.zip CopyZipsRole: Type: AWS::IAM::Role @@ -383,10 +382,10 @@ Resources: Type: AWS::Lambda::Function Properties: Handler: lambda_function.lambda_handler - MemorySize: '128' + MemorySize: 128 Role: !GetAtt 'CreateSSHKeyRole.Arn' Runtime: python3.8 - Timeout: '300' + Timeout: 300 Code: S3Bucket: !Ref 'LambdaZipsBucket' S3Key: !Sub '${QSS3KeyPrefix}functions/packages/CreateSSHKey/lambda.zip' @@ -451,10 +450,10 @@ Resources: Type: AWS::Lambda::Function Properties: Handler: lambda_function.lambda_handler - MemorySize: '128' + MemorySize: 128 Role: !GetAtt 'DeleteBucketContentsRole.Arn' Runtime: python3.8 - Timeout: '300' + Timeout: 300 Code: S3Bucket: !Ref 'LambdaZipsBucket' S3Key: !Sub '${QSS3KeyPrefix}functions/packages/DeleteBucketContents/lambda.zip' @@ -693,10 +692,10 @@ Resources: Type: AWS::Lambda::Function Properties: Handler: lambda_function.lambda_handler - MemorySize: '128' + MemorySize: 128 Role: !GetAtt 'GitPullRole.Arn' Runtime: python3.8 - Timeout: '900' + Timeout: 900 VpcConfig: !If - ShouldRunInVPC - SecurityGroupIds: