diff --git a/README.MD b/README.MD index de69bb3d..9048c39c 100644 --- 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 index d341ded8..cb5aee08 100644 --- 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)| \ No newline at end of file +| 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 index bb4eb28a..ee054f71 100644 --- a/pipeline/Terraform/.terraform.lock.hcl +++ b/pipeline/Terraform/.terraform.lock.hcl @@ -82,4 +82,4 @@ provider "registry.terraform.io/hashicorp/time" { "zh:f99ef33b1629a3b2278201142a3011a8489e66d92da832a5b99e442204de18fb", "zh:fded14754ea46fdecc62a52cd970126420d4cd190e598cb61190b4724a727edb", ] -} +} \ No newline at end of file diff --git a/pipeline/Terraform/s3.tf b/pipeline/Terraform/s3.tf index 42b567a3..0cbb71d7 100644 --- 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 index 63faf000..9e82069f 100644 --- 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 index b9b9e11d..efd3a5dd 100644 --- a/pipeline/config/packages_p310.csv +++ b/pipeline/config/packages_p310.csv @@ -33,3 +33,5 @@ scipy,BSD-3-Clause,scipy-dev@python.org openai,Apache Software License,support@openai.com llama-index,MIT,Jerry Liu praw,https://github.com/praw-dev/praw/blob/master/LICENSE.txt,Bryce Boe +jsonschema,MIT,Julian Berman +pymssql, LGPL-2.1, https://github.com/pymssql/pymssql diff --git a/pipeline/config/packages_p311.csv b/pipeline/config/packages_p311.csv index 21c6d65d..4d4619b0 100644 --- a/pipeline/config/packages_p311.csv +++ b/pipeline/config/packages_p311.csv @@ -42,3 +42,4 @@ msal, MIT, Microsoft lxml, BSD, Infrae reportlab, BSD, ReportLab Europe Ltd. praw,https://github.com/praw-dev/praw/blob/master/LICENSE.txt,Bryce Boe +jsonschema,MIT,Julian Berman diff --git a/pipeline/config/packages_p312-arm64.csv b/pipeline/config/packages_p312-arm64.csv index 0d963796..e45a5076 100644 --- 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 requests,Apache-2.0,Kenneth Reitz mysql-connector-python,GNU GPLv2,Oracle -tabulate,MIT,s.astanin@gmail.com \ No newline at end of file +tabulate,MIT,s.astanin@gmail.com +pycryptodome,BSD,Helder Eijs +fake-useragent, Apache-2.0, Melroy van den Berg diff --git a/pipeline/config/packages_p312.csv b/pipeline/config/packages_p312.csv index 46c08807..19867f57 100644 --- 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 tabulate,MIT,s.astanin@gmail.com dnspython,ISC License (ISCL),halley@dnspython.org -python-pptx, MIT, python-pptx -memray, Apache 2.0, godlygeek pablogsal -polars, MIT, Ritchie Vink +python-pptx,MIT, python-pptx +memray,Apache 2.0, godlygeek pablogsal +polars,MIT, Ritchie Vink Pillow,https://github.com/python-pillow/Pillow/blob/master/LICENSE,Alex Clark -psycopg, LGPL-3.0, Daniele Varrazzo -praw,https://github.com/praw-dev/praw/blob/master/LICENSE.txt,Bryce Boe \ No newline at end of file +psycopg,LGPL-3.0, Daniele Varrazzo +praw,https://github.com/praw-dev/praw/blob/master/LICENSE.txt,Bryce Boe +orjson, Apache 2.0,ijl +pymssql, LGPL-2.1, https://github.com/pymssql/pymssql +awswrangler,Apache 2.0,AWS \ No newline at end of file