Merge pull request tmobile#1286 from devsatishm/develop

Enhancements to website creation workflow + fixing vulnerabilities w/ dependencies
JonahPiktorLabs · Jun 3, 2020 · d9aecc6 · d9aecc6
2 parents 53d2f92 + 958a8e6
commit d9aecc6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 60 deletions.
diff --git a/builds/jenkins-build-pack-website/Jenkinsfile b/builds/jenkins-build-pack-website/Jenkinsfile
@@ -804,6 +804,7 @@ def generateDistributionConfig(originAccessIdentity) {
 	def cloudFrontOriginAccessIdentity = "origin-access-identity/cloudfront/"+originAccessIdentity
 	sh "sed -i -- 's/{service_name}/${service_config['domain']}-${service_config['service']}/g' distribution_config_with_tags.json"
 	sh "sed -i -- 's/{env}/${environment}/g' distribution_config_with_tags.json"
+	sh "sed -i -- 's/{region}/${service_config['region']}/g' distribution_config_with_tags.json"
 	sh "sed -i -- 's/{conf_s3bucketname}/${s3Bucket}/g' distribution_config_with_tags.json"
 	sh "sed -i -- 's/{conf_stack_prefix}/${configLoader.INSTANCE_PREFIX}/g' distribution_config_with_tags.json"
 	sh "sed -i -- 's:{conf_origin_id}:${cloudFrontOriginAccessIdentity}:g' distribution_config_with_tags.json"

diff --git a/builds/website-distribution-pack/distribution_config.json b/builds/website-distribution-pack/distribution_config.json
diff --git a/builds/website-distribution-pack/distribution_config_with_tags.json b/builds/website-distribution-pack/distribution_config_with_tags.json
@@ -8,7 +8,7 @@
       "Quantity": 1,
       "Items": [{
         "Id": "{conf_stack_prefix}-{env}-static-website-origin-{service_name}",
-        "DomainName": "{conf_s3bucketname}.s3.amazonaws.com",
+        "DomainName": "{conf_s3bucketname}.s3.{region}.amazonaws.com",
         "OriginPath": "/{origin_path}",
         "S3OriginConfig": {
           "OriginAccessIdentity": "{conf_origin_id}"

diff --git a/templates/api-template-java/pom.xml b/templates/api-template-java/pom.xml
@@ -21,7 +21,7 @@
 	<dependency>
 		<groupId>com.fasterxml.jackson.core</groupId>
 		<artifactId>jackson-databind</artifactId>
-		<version>2.10.0.pr3</version>
+		<version>2.9.10.4</version>
 	</dependency>
 	<dependency>
 	    <groupId>com.amazonaws</groupId>

diff --git a/templates/function-template-java/pom.xml b/templates/function-template-java/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
 		<groupId>com.fasterxml.jackson.core</groupId>
 		<artifactId>jackson-databind</artifactId>
-		<version>2.10.0.pr3</version>
+		<version>2.9.10.4</version>
 	</dependency>
 	<dependency>
 	    <groupId>com.amazonaws</groupId>

diff --git a/templates/sls-app-template-java/pom.xml b/templates/sls-app-template-java/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
 		<groupId>com.fasterxml.jackson.core</groupId>
 		<artifactId>jackson-databind</artifactId>
-		<version>2.8.11.2</version>
+		<version>2.9.10.4</version>
 	</dependency>
 	<dependency>
 	    <groupId>com.amazonaws</groupId>