Merge pull request #36 from byu-oit/arm

stuft2 · web-flow · commit 43f64a30d940 · 2022-11-18T16:13:32.000-07:00
feat: allow passing through lambda architectures
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Terraform Setup
-        uses: hashicorp/setup-terraform@v2.0.2
+        uses: hashicorp/setup-terraform@v2.0.3
         with:
           terraform_version: 1.0.0
 
@@ -76,7 +76,7 @@ jobs:
           aws-region: us-west-2
 
       - name: Terraform Setup
-        uses: hashicorp/setup-terraform@v2.0.2
+        uses: hashicorp/setup-terraform@v2.0.3
         with:
           terraform_version: ${{ matrix.env.tf_version }}
 
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2022 Brigham Young University
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.
diff --git a/README.md b/README.md
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v2.2.0
+11/18/2022 - support ARM 64 architecture
+- allow pass through of architecture to support arm64. Default is x86_64.
+- update terraform setup action
+- update license
+
 ## v2.1.1
 4/25/2022 - fixed race condition when resources depend on the function existing before their creation
 - updated references to the lambda arn where it should be the function name
diff --git a/examples/ci-0_13/ci.tf b/examples/ci-0_13/ci.tf
@@ -8,7 +8,7 @@ provider "aws" {
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.5.0"
 }
 
 module "lambda_api" {
diff --git a/examples/ci-0_14/ci.tf b/examples/ci-0_14/ci.tf
@@ -8,7 +8,7 @@ provider "aws" {
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.5.0"
 }
 
 module "lambda_api" {
diff --git a/examples/ci-1/ci.tf b/examples/ci-1/ci.tf
@@ -13,7 +13,7 @@ provider "aws" {
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.5.0"
 }
 
 module "lambda_api" {
diff --git a/examples/docker-lambda/docker.tf b/examples/docker-lambda/docker.tf
@@ -4,12 +4,12 @@ provider "aws" {
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.5.0"
 }
 
 module "lambda_api" {
   #  source                        = "../../"
-  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.1"
+  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.2.0"
   app_name                      = "my-docker-lambda"
   image_uri                     = "my-image-from-my-ecr:latest"
   hosted_zone                   = module.acs.route53_zone
diff --git a/examples/no-codedeploy/example.tf b/examples/no-codedeploy/example.tf
@@ -4,12 +4,12 @@ provider "aws" {
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.5.0"
 }
 
 module "lambda_api" {
   #  source = "../../"
-  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.1"
+  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.2.0"
   app_name                      = "my-lambda-dev"
   zip_filename                  = "./src/lambda.zip"
   zip_handler                   = "index.handler"
diff --git a/examples/simple-lambda-in-vpc/example.tf b/examples/simple-lambda-in-vpc/example.tf
@@ -4,12 +4,12 @@ provider "aws" {
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.5.0"
 }
 
 module "lambda_api" {
   # source                        = "../../"
-  source       = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.1"
+  source       = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.2.0"
   app_name     = "my-lambda-dev"
   zip_filename = "./src/lambda.zip"
   zip_handler  = "index.handler"
diff --git a/examples/simple-lambda-with-deploy-test/example.tf b/examples/simple-lambda-with-deploy-test/example.tf
@@ -4,12 +4,12 @@ provider "aws" {
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.5.0"
 }
 
 module "lambda_api" {
   #  source = "../../"
-  source       = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.1"
+  source       = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.2.0"
   app_name     = "my-lambda-codedeploy-dev"
   env          = "dev"
   zip_filename = "./src/lambda.zip"
diff --git a/main.tf b/main.tf
@@ -254,6 +254,7 @@ resource "aws_lambda_function" "zip_api" {
   layers           = var.lambda_layers
   timeout          = var.timeout
   memory_size      = var.memory_size
+  architectures    = [var.architecture]
 
   tracing_config {
     mode = var.xray_enabled == true ? "Active" : "PassThrough"
@@ -285,6 +286,7 @@ resource "aws_lambda_function" "docker_api" {
   publish       = true
   timeout       = var.timeout
   memory_size   = var.memory_size
+  architectures = [var.architecture]
 
   tracing_config {
     mode = var.xray_enabled == true ? "Active" : "PassThrough"
diff --git a/variables.tf b/variables.tf
@@ -146,3 +146,9 @@ variable "xray_enabled" {
   description = "Whether or not the X-Ray daemon should be created with the Lambda API."
   default     = false
 }
+
+variable "architecture" {
+  type        = string
+  description = "Instruction set architecture for your Lambda function. Valid values are \"x86_64\" and \"arm64\". Default is \"x86_64\"."
+  default     = "x86_64"
+}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ provider "aws" {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`module "acs" {`
`11`		`- source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"`
	`11`	`+ source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.5.0"`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`module "lambda_api" {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ provider "aws" {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`module "acs" {`
`16`		`- source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"`
	`16`	`+ source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.5.0"`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`module "lambda_api" {`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@ provider "aws" {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`module "acs" {`
`7`		`- source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"`
	`7`	`+ source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.5.0"`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`module "lambda_api" {`
`11`	`11`	`# source = "../../"`
`12`		`- source = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.1"`
	`12`	`+ source = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.2.0"`
`13`	`13`	`app_name = "my-docker-lambda"`
`14`	`14`	`image_uri = "my-image-from-my-ecr:latest"`
`15`	`15`	`hosted_zone = module.acs.route53_zone`