fixed conflicts

keithrozario · Jun 2, 2024 · f154429 · f154429
2 parents d5e698d + 11e1269
commit f154429
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 11 deletions.
diff --git a/README.MD b/README.MD
@@ -48,7 +48,7 @@ For the full list of Python packages, refer to the following, feel free to make
 
 ## Using the Layers
 
-You can use the layers anyway you see fit, and here are 4 options based on what method you use to deploy your lambda functions:
+You can use the layers anyway you see fit, and here are 6 options based on what method you use to deploy your lambda functions:
 
 ### Option 1: Using the Console
 
@@ -150,7 +150,7 @@ class MockStack(Stack):
         # Initialize Klayers Class
         klayers = Klayers(
             self,
-            python_version = runtime
+            python_version = runtime,
             region = "ap-southeast-1"
         )
 

diff --git a/deployments/python3.12/README.MD b/deployments/python3.12/README.MD
@@ -1,4 +1,4 @@
-# Layers for Python 3.11
+# Layers for Python 3.12
 
 
 | Region (Code) | Region (Name)| ARNs|
@@ -23,4 +23,4 @@
 | us-east-1 |US East (N. Virginia)| [json](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-east-1/json) \| [csv](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-east-1/csv) \| [html](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-east-1/html)|
 | us-east-2 |US East (Ohio)| [json](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-east-2/json) \| [csv](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-east-2/csv) \| [html](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-east-2/html)|
 | us-west-1 |US West (N. California)| [json](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-west-1/json) \| [csv](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-west-1/csv) \| [html](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-west-1/html)|
-| us-west-2 |US West (Oregon)| [json](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-west-2/json) \| [csv](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-west-2/csv) \| [html](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-west-2/html)|
+| us-west-2 |US West (Oregon)| [json](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-west-2/json) \| [csv](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-west-2/csv) \| [html](https://api.klayers.cloud/api/v2/p3.12/layers/latest/us-west-2/html)|
diff --git a/pipeline/Terraform/.terraform.lock.hcl b/pipeline/Terraform/.terraform.lock.hcl
diff --git a/pipeline/Terraform/s3.tf b/pipeline/Terraform/s3.tf
@@ -122,4 +122,24 @@ resource "aws_s3_bucket_lifecycle_configuration" "ddb_backup_bucket_config" {
   }
 }
 
+# Website bucket
 
+resource "aws_s3_bucket" "website_bucket" {
+  force_destroy = true
+}
+
+resource "aws_ssm_parameter" "website_bucket_name" {
+  type        = "String"
+  description = "Name of s3 bucket to hold website"
+  name        = "/${var.app_name}/${local.workspace_full_name}/website_bucket/name"
+  value       = aws_s3_bucket.website_bucket.bucket
+}
+
+resource "aws_s3_bucket_public_access_block" "website_bucket" {
+  bucket = aws_s3_bucket.website_bucket.id
+
+  block_public_acls       = true
+  block_public_policy     = true
+  ignore_public_acls      = true
+  restrict_public_buckets = true
+}
diff --git a/pipeline/Terraform/variables.tf b/pipeline/Terraform/variables.tf
@@ -10,3 +10,4 @@ variable "config_dir" { type = map(string) } # not used but declared to avoid wa
 variable "website_domain_name" { type = map(any) }
 variable "website_github_repo" { type = string }
 variable "website_role_name" { type = string }
+
diff --git a/pipeline/config/packages_p310.csv b/pipeline/config/packages_p310.csv
@@ -33,3 +33,5 @@ scipy,BSD-3-Clause,[email protected]
 openai,Apache Software License,[email protected]
 llama-index,MIT,Jerry Liu <[email protected]>
 praw,https://github.com/praw-dev/praw/blob/master/LICENSE.txt,Bryce Boe <[email protected]>
+jsonschema,MIT,Julian Berman <[email protected]>
+pymssql, LGPL-2.1, https://github.com/pymssql/pymssql
diff --git a/pipeline/config/packages_p311.csv b/pipeline/config/packages_p311.csv
@@ -42,3 +42,4 @@ msal, MIT, Microsoft
 lxml, BSD, Infrae <http://consulting.behnel.de/>
 reportlab, BSD, ReportLab Europe Ltd. <[email protected]>
 praw,https://github.com/praw-dev/praw/blob/master/LICENSE.txt,Bryce Boe <[email protected]>
+jsonschema,MIT,Julian Berman <[email protected]>
diff --git a/pipeline/config/packages_p312-arm64.csv b/pipeline/config/packages_p312-arm64.csv
@@ -14,4 +14,6 @@ pyqldb,Apache-2.0,AWS
 redshift-connector,Apache License Version 2.0,Amazon Web Services <[email protected]>
 requests,Apache-2.0,Kenneth Reitz <[email protected]>
 mysql-connector-python,GNU GPLv2,Oracle
-tabulate,MIT,[email protected]
+tabulate,MIT,[email protected]
+pycryptodome,BSD,Helder Eijs <[email protected]>
+fake-useragent, Apache-2.0, Melroy van den Berg <[email protected]>
diff --git a/pipeline/config/packages_p312.csv b/pipeline/config/packages_p312.csv
@@ -17,9 +17,12 @@ mysql-connector-python,GNU GPLv2,Oracle
 aliyun-python-sdk-actiontrail,Apache-2.0,Aliyun <[email protected]>
 tabulate,MIT,[email protected]
 dnspython,ISC License (ISCL),[email protected]
-python-pptx, MIT, python-pptx <[email protected]>
-memray, Apache 2.0, godlygeek pablogsal
-polars, MIT, Ritchie Vink <[email protected]>
+python-pptx,MIT, python-pptx <[email protected]>
+memray,Apache 2.0, godlygeek pablogsal
+polars,MIT, Ritchie Vink <[email protected]>
 Pillow,https://github.com/python-pillow/Pillow/blob/master/LICENSE,Alex Clark <[email protected]>
-psycopg, LGPL-3.0, Daniele Varrazzo <[email protected]>
-praw,https://github.com/praw-dev/praw/blob/master/LICENSE.txt,Bryce Boe <[email protected]>
+psycopg,LGPL-3.0, Daniele Varrazzo <[email protected]>
+praw,https://github.com/praw-dev/praw/blob/master/LICENSE.txt,Bryce Boe <[email protected]>
+orjson, Apache 2.0,ijl <[email protected]>
+pymssql, LGPL-2.1, https://github.com/pymssql/pymssql
+awswrangler,Apache 2.0,AWS
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ variable "config_dir" { type = map(string) } # not used but declared to avoid wa
		variable "website_domain_name" { type = map(any) }
		variable "website_github_repo" { type = string }
		variable "website_role_name" { type = string }