From 8f4639c3c1da5da9401fb1ab11c2cb8802e1e846 Mon Sep 17 00:00:00 2001 From: Pawel Firlej Date: Thu, 11 Jan 2018 10:25:57 +0100 Subject: [PATCH] Change avialiability zone --- lambda/lib/build.js | 5 +++-- lambda/lib/result.js | 2 +- lambda/lib/status.js | 2 +- lambda/package.json | 5 ++--- resources/create | 4 ++-- resources/find_keys | 6 +++--- resources/resources.yaml | 8 +++----- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/lambda/lib/build.js b/lambda/lib/build.js index 86892bf..5f356c3 100644 --- a/lambda/lib/build.js +++ b/lambda/lib/build.js @@ -1,5 +1,5 @@ const AWS = require('aws-sdk') -AWS.config.update({ region: 'us-east-1' }); +AWS.config.update({ region: 'eu-central-1' }); const codebuild = new AWS.CodeBuild() const status = require('./status') @@ -10,7 +10,8 @@ module.exports.run = (sourceVersion) => { codebuild.startBuild({ projectName: process.env.PROJECT_NAME, artifactsOverride: { type: 'NO_ARTIFACTS' }, - sourceVersion: sourceVersion + sourceVersion: sourceVersion, + environmentVariablesOverride: [ { name: 'TRIGGERED_BY_GITHUB', value: 'true' } ] }) .promise() diff --git a/lambda/lib/result.js b/lambda/lib/result.js index 0a205ce..23d7297 100644 --- a/lambda/lib/result.js +++ b/lambda/lib/result.js @@ -1,5 +1,5 @@ const AWS = require('aws-sdk') -AWS.config.update({ region: 'us-east-1' }); +AWS.config.update({ region: 'eu-central-1' }); const codebuild = new AWS.CodeBuild() const status = require('./status') const promiseRetry = require('promise-retry'); diff --git a/lambda/lib/status.js b/lambda/lib/status.js index 1fbf008..f23d703 100644 --- a/lambda/lib/status.js +++ b/lambda/lib/status.js @@ -6,7 +6,7 @@ module.exports.update = (status, description, commit, buildId) => { const ghrepo = client.repo(process.env.GITHUB_PROJECT_NAME) return new Promise((resolve, reject) => { - const url = `https://console.aws.amazon.com/codebuild/home?region=us-east-1#/builds/${buildId}/view/new` + const url = `https://console.aws.amazon.com/codebuild/home?region=eu-central-1#/builds/${buildId}/view/new` ghrepo.status(commit, { "state": status, "target_url": url, diff --git a/lambda/package.json b/lambda/package.json index 57a39d6..ceaba40 100644 --- a/lambda/package.json +++ b/lambda/package.json @@ -4,7 +4,7 @@ "description": "", "main": "index.js", "scripts": { - "deploy": "zip -q -r package.zip * && aws lambda update-function-code --function-name $PROJECT_NAME --zip-file 'fileb://package.zip'", + "deploy": "zip -q -r package.zip * && aws --profile staging lambda update-function-code --function-name $PROJECT_NAME --zip-file 'fileb://package.zip'", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", @@ -14,6 +14,5 @@ "octonode": "0.7.7", "promise-retry": "1.1.1" }, - "devDependencies": { - } + "devDependencies": {} } diff --git a/resources/create b/resources/create index 5b319da..f3bd9ca 100755 --- a/resources/create +++ b/resources/create @@ -2,7 +2,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -aws cloudformation create-stack \ +aws --profile staging cloudformation create-stack \ --stack-name $PROJECT_NAME \ --parameters ParameterKey=GithubProjectName,ParameterValue=$GITHUB_PROJECT_NAME \ ParameterKey=GithubToken,ParameterValue=$GITHUB_TOKEN \ @@ -11,5 +11,5 @@ aws cloudformation create-stack \ --capabilities CAPABILITY_IAM \ --capabilities CAPABILITY_NAMED_IAM && \ - aws cloudformation wait stack-create-complete \ + aws --profile staging cloudformation wait stack-create-complete \ --stack-name $PROJECT_NAME diff --git a/resources/find_keys b/resources/find_keys index 68629e2..070e2d9 100755 --- a/resources/find_keys +++ b/resources/find_keys @@ -2,11 +2,11 @@ # 2 stackname # 3 -key=$(aws cloudformation describe-stacks --stack-name $PROJECT_NAME --query 'Stacks[0].Outputs[?OutputKey==`AccessKeyId`] | [0].OutputValue' --output json | xargs echo) +key=$(aws --profile staging cloudformation describe-stacks --stack-name $PROJECT_NAME --query 'Stacks[0].Outputs[?OutputKey==`AccessKeyId`] | [0].OutputValue' --output json | xargs echo) echo "AccessKeyId: ${key}" -secret=$(aws cloudformation describe-stacks --stack-name $PROJECT_NAME --query 'Stacks[0].Outputs[?OutputKey==`SecretAccessKey`] | [0].OutputValue' --output json | xargs echo) +secret=$(aws --profile staging cloudformation describe-stacks --stack-name $PROJECT_NAME --query 'Stacks[0].Outputs[?OutputKey==`SecretAccessKey`] | [0].OutputValue' --output json | xargs echo) echo "SecretAccessKey: ${secret}" -arn=$(aws cloudformation describe-stacks --stack-name $PROJECT_NAME --query 'Stacks[0].Outputs[?OutputKey==`SNSTopic`] | [0].OutputValue' --output json | xargs echo) +arn=$(aws --profile staging cloudformation describe-stacks --stack-name $PROJECT_NAME --query 'Stacks[0].Outputs[?OutputKey==`SNSTopic`] | [0].OutputValue' --output json | xargs echo) echo "SNSTopic: ${arn}" diff --git a/resources/resources.yaml b/resources/resources.yaml index 5367159..e79dd4b 100644 --- a/resources/resources.yaml +++ b/resources/resources.yaml @@ -46,9 +46,7 @@ Resources: - Effect: Allow Principal: Service: - - codebuild.us-east-1.amazonaws.com - - codebuild.us-west-2.amazonaws.com - - codebuild.eu-west-1.amazonaws.com + - codebuild.amazonaws.com Action: - sts:AssumeRole Path: "/" @@ -81,9 +79,9 @@ Resources: Environment: Type: linuxContainer ComputeType: BUILD_GENERAL1_SMALL - Image: aws/codebuild/nodejs:4.4.7 + Image: aws/codebuild/java:openjdk-8 Source: - Location: https://github.com/tatums/aws-sam-example.git + Location: https://github.com/PayU/red-dragon.git Type: GITHUB TimeoutInMinutes: 10