Skip to content

Commit

Permalink
remove updatePolicy which needs to be as part of install/adding accou…
Browse files Browse the repository at this point in the history 
…nt to the stack. (tmobile#1226)
  • Loading branch information
@raghits @devsatishm
raghits authored and devsatishm committed Nov 21, 2019
1 parent 270d372 commit 08897e5
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 130 deletions.
44 changes: 0 additions & 44 deletions builds/jenkins-build-pack-api/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,6 @@ def createSubscriptionFilters(config, region, roleId, accountDetails, env_key, c
destARN = data.LOGS.PROD
}
}
updatePolicy(env_key, destARN);
sh "aws logs put-subscription-filter --output json --log-group-name \"${lambda}\" --filter-name \"${lambda}\" --filter-pattern \"\" --destination-arn \"${destARN}\" --profile ${credsId}"
} else {
sh "aws logs put-subscription-filter --output json --log-group-name \"${lambda}\" --filter-name \"${lambda}\" --filter-pattern \"\" --destination-arn \"${logStreamer}\" --role-arn ${accountDetails.IAM.PLATFORMSERVICES_ROLEID} --profile ${credsId}"
Expand All @@ -1069,49 +1068,6 @@ def createSubscriptionFilters(config, region, roleId, accountDetails, env_key, c
}
}

def updatePolicy(env, destARN){

def primaryDataValue = utilModule.getAccountInfoPrimary();
def primaryRegionValue
for (item in primaryDataValue.REGIONS) {
if(item.PRIMARY){
primaryRegionValue = item.REGION
}
}
def primaryCredsId = null;

withCredentials([
[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'PRIMARY_AWS_ACCESS_KEY_ID', credentialsId: primaryDataValue.CREDENTIAL_ID, secretKeyVariable: 'PRIMARY_AWS_SECRET_ACCESS_KEY']
]) {
try {
// initialize aws credentials
def randomStringPrimary = utilModule.generateRequestId();
primaryCredsId = "jazzprimary-${randomStringPrimary}";

sh "aws configure set profile.${primaryCredsId}.region ${primaryRegionValue}"
sh "aws configure set profile.${primaryCredsId}.aws_access_key_id $PRIMARY_AWS_ACCESS_KEY_ID"
sh "aws configure set profile.${primaryCredsId}.aws_secret_access_key $PRIMARY_AWS_SECRET_ACCESS_KEY"

def destinationName = destARN;
def destArnArray = [];
destArnArray = destinationName.tokenize(":").last();

def policy = JsonOutput.toJson(parseJson("{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"sid123\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"${service_config.accountId}\"},\"Action\":\"logs:PutSubscriptionFilter\",\"Resource\":\"${destARN}\"}]}"));
sh "aws logs put-destination-policy --destination-name ${destArnArray} --access-policy \'${policy}\' --region ${service_config.region} --profile ${primaryCredsId}"

} catch(ex){
send_status_email('FAILED', '')
events.sendFailureEvent('UPDATE_ENVIRONMENT', ex.getMessage(), environmentDeploymentMetadata.generateEnvironmentMap("deployment_failed", environment_logical_id, null), environment_logical_id)
events.sendFailureEvent('UPDATE_DEPLOYMENT', ex.getMessage(), environmentDeploymentMetadata.generateDeploymentMap("failed", environment_logical_id, gitCommitHash), environment_logical_id)
events.sendFailureEvent('DEPLOY_TO_AWS', ex.getMessage(), context_map, environment_logical_id)
error ex.getMessage()
} finally {
// reset Credentials
resetCredentials(primaryCredsId)
}
}
}

/**
* For getting token to access catalog APIs.
* Must be a service account which has access to all services
Expand Down
45 changes: 0 additions & 45 deletions builds/jenkins-build-pack-function/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,6 @@ def createSubscriptionFilters(config, env_key, credsId, accountDetails) {
destARN = data.LOGS.PROD
}
}
updatePolicy(env_key, destARN);
sh "aws logs put-subscription-filter --output json --log-group-name \"${lambda}\" --filter-name \"${lambda}\" --filter-pattern \"\" --destination-arn \"${destARN}\" --profile ${credsId}"
} else {
sh "aws logs put-subscription-filter --output json --log-group-name \"${lambda}\" --filter-name \"${lambda}\" --filter-pattern \"\" --destination-arn \"${logStreamer}\" --role-arn ${accountDetails.IAM.PLATFORMSERVICES_ROLEID} --profile ${credsId}"
Expand All @@ -883,50 +882,6 @@ def createSubscriptionFilters(config, env_key, credsId, accountDetails) {
}
}

def updatePolicy(env, destARN){

def primaryData = utilModule.getAccountInfoPrimary();
def primaryRegion
for (item in primaryData.REGIONS) {
if(item.PRIMARY){
primaryRegion = item.REGION
}
}
def primaryCredsId = null

withCredentials([
[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'PRIMARY_AWS_ACCESS_KEY_ID', credentialsId: primaryData.CREDENTIAL_ID, secretKeyVariable: 'PRIMARY_AWS_SECRET_ACCESS_KEY']
]) {
try {
// initialize aws credentials
def randomStringPrimary = utilModule.generateRequestId();
primaryCredsId = "jazzprimary-${randomStringPrimary}";

sh "aws configure set profile.${primaryCredsId}.region ${primaryRegion}"
sh "aws configure set profile.${primaryCredsId}.aws_access_key_id $PRIMARY_AWS_ACCESS_KEY_ID"
sh "aws configure set profile.${primaryCredsId}.aws_secret_access_key $PRIMARY_AWS_SECRET_ACCESS_KEY"

def destinationName = destARN;
def destArnArray = [];
destArnArray = destinationName.tokenize(":").last();

def policy = JsonOutput.toJson(parseJson("{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"sid123\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"${service_config.accountId}\"},\"Action\":\"logs:PutSubscriptionFilter\",\"Resource\":\"${destARN}\"}]}"));
sh "aws logs put-destination-policy --destination-name ${destArnArray} --access-policy \'${policy}\' --region ${service_config.region} --profile ${primaryCredsId}"

} catch(ex){
send_status_email('FAILED', '')
events.sendFailureEvent('UPDATE_ENVIRONMENT', ex.getMessage(), environmentDeploymentMetadata.generateEnvironmentMap("deployment_failed", environment_logical_id, null), environment_logical_id)
events.sendFailureEvent('UPDATE_DEPLOYMENT', ex.getMessage(), environmentDeploymentMetadata.generateDeploymentMap("failed", environment_logical_id, gitCommitHash), environment_logical_id)
events.sendFailureEvent('DEPLOY_TO_AWS', ex.getMessage(), context_map, environment_logical_id)
error ex.getMessage()
} finally {
// reset Credentials
resetCredentials(primaryCredsId)
}
}
}


def writeServerlessFile(config, env, accountDetails) {

def iamRoleArnValue;
Expand Down
41 changes: 0 additions & 41 deletions builds/jenkins-build-pack-sls-app/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,6 @@ def createSubscriptionFilters(config, accountDetails, env_key, credsId) {
def isPrimaryAccount = configLoader.AWS.ACCOUNTS.find{ it.ACCOUNTID == config.accountId}.PRIMARY ? true : false

if(!isPrimaryAccount){
updatePolicy(env_key, destLogStreamArn);
sh "aws logs put-subscription-filter --output json --log-group-name \"${logGroupName}\" --filter-name \"${logGroupName}\" --filter-pattern \"\" --destination-arn \"${destLogStreamArn}\" --profile ${credsId} --region ${config.region}"
} else {
sh "aws logs put-subscription-filter --output json --log-group-name \"${logGroupName}\" --filter-name \"${logGroupName}\" --filter-pattern \"\" --destination-arn \"${destLogStreamArn}\" --role-arn ${accountDetails.IAM.PLATFORMSERVICES_ROLEID} --profile ${credsId} --region ${config.region}"
Expand All @@ -766,46 +765,6 @@ def createSubscriptionFilters(config, accountDetails, env_key, credsId) {
}
}

def updatePolicy(env, destARN){
def primaryData = utilModule.getAccountInfoPrimary();
def primaryRegion
for (item in primaryData.REGIONS) {
if(item.PRIMARY){
primaryRegion = item.REGION
}
}
def primaryCredsId = null

withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'PRIMARY_AWS_ACCESS_KEY_ID', credentialsId: primaryData.CREDENTIAL_ID, secretKeyVariable: 'PRIMARY_AWS_SECRET_ACCESS_KEY']]) {
try {
// initialize aws credentials
def randomStringPrimary = utilModule.generateRequestId();
primaryCredsId = "jazzprimary-${randomStringPrimary}";

sh "aws configure set profile.${primaryCredsId}.region ${primaryRegion}"
sh "aws configure set profile.${primaryCredsId}.aws_access_key_id $PRIMARY_AWS_ACCESS_KEY_ID"
sh "aws configure set profile.${primaryCredsId}.aws_secret_access_key $PRIMARY_AWS_SECRET_ACCESS_KEY"

def destinationName = destARN;
def destArnArray = [];
destArnArray = destinationName.tokenize(":").last();

def policy = JsonOutput.toJson(parseJson("{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"sid123\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"${config.accountId}\"},\"Action\":\"logs:PutSubscriptionFilter\",\"Resource\":\"${destARN}\"}]}"));
sh "aws logs put-destination-policy --destination-name ${destArnArray} --access-policy \'${policy}\' --region ${config['region']} --profile ${primaryCredsId}"
} catch(ex){
send_status_email('FAILED', '')
events.sendFailureEvent('UPDATE_ENVIRONMENT', ex.getMessage(), environmentDeploymentMetadata.generateEnvironmentMap("deployment_failed", environment_logical_id, null), environment_logical_id)
events.sendFailureEvent('UPDATE_DEPLOYMENT', ex.getMessage(), environmentDeploymentMetadata.generateDeploymentMap("failed", environment_logical_id, gitCommitHash), environment_logical_id)
events.sendFailureEvent('DEPLOY_TO_AWS', ex.getMessage(), context_map, environment_logical_id)
error ex.getMessage()
} finally {
// reset Credentials
resetCredentials(primaryCredsId)
}
}
}


/**
* For getting token to access catalog APIs.
* Must be a service account which has access to all services
Expand Down

0 comments on commit 08897e5

Please sign in to comment.