Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update lambda function mapper #1199

Merged
merged 8 commits into from
Mar 30, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/mapper/iac-providers/cft/cft.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (
"github.com/awslabs/goformation/v5/cloudformation/qldb"
"github.com/awslabs/goformation/v5/cloudformation/ram"
"github.com/awslabs/goformation/v5/cloudformation/sagemaker"
"github.com/awslabs/goformation/v5/cloudformation/serverless"
"github.com/awslabs/goformation/v5/cloudformation/sns"
"github.com/awslabs/goformation/v5/cloudformation/sqs"
"github.com/awslabs/goformation/v5/cloudformation/waf"
Expand Down Expand Up @@ -270,6 +271,8 @@ func (m cftMapper) mapConfigForResource(r cloudformation.Resource, resourceName
return config.GetCognitoUserPoolConfig(resource)
case *lambda.Function:
return config.GetLambdaFunctionConfig(resource)
case *serverless.Function:
return config.GetLambdaFunctionConfig(resource)
case *certificatemanager.Certificate:
return config.GetCertificateManagerCertificateConfig(resource)
case *sagemaker.NotebookInstance:
Expand Down
94 changes: 73 additions & 21 deletions pkg/mapper/iac-providers/cft/config/lambda-function.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package config

import (
"github.com/awslabs/goformation/v5/cloudformation/lambda"
"github.com/awslabs/goformation/v5/cloudformation/serverless"
)

// TracingConfigBlock holds config for TracingConfig
Expand All @@ -39,11 +40,9 @@ type EnvironmentBlock struct {
// LambdaFunctionConfig holds config for LambdaFunction
type LambdaFunctionConfig struct {
Config
FileName string `json:"filename"`
FunctionName string `json:"function_name"`
Role string `json:"role"`
Handler string `json:"handler"`
SourceCodeHash string `json:"source_code_hash"`
MemorySize int `json:"memory_size"`
ReservedConcurrentExecutions int `json:"reserved_concurrent_executions"`
Runtime string `json:"runtime"`
Expand All @@ -55,49 +54,102 @@ type LambdaFunctionConfig struct {
}

// GetLambdaFunctionConfig returns config for LambdaFunction
func GetLambdaFunctionConfig(f *lambda.Function) []AWSResourceConfig {
func GetLambdaFunctionConfig(sf interface{}) []AWSResourceConfig {
if l, ok := sf.(*lambda.Function); ok {
return getLambdaConfig(l)
}

if s, ok := sf.(*serverless.Function); ok {
return getServerlessConfig(s)
}
gaurav-gogia marked this conversation as resolved.
Show resolved Hide resolved

return []AWSResourceConfig{{}}
}

func getServerlessConfig(sf *serverless.Function) []AWSResourceConfig {
tracingConfig := make([]TracingConfigBlock, 1)
tracingConfig[0].Mode = sf.Tracing

var vpcConfig []VPCConfigBlock
if sf.VpcConfig != nil {
vpcConfig = make([]VPCConfigBlock, 1)

vpcConfig[0].SecurityGroupIDs = sf.VpcConfig.SecurityGroupIds
vpcConfig[0].SubnetIDs = sf.VpcConfig.SubnetIds
}

var environment []EnvironmentBlock
if sf.Environment != nil {
environment = make([]EnvironmentBlock, 1)

environment[0].Variables = sf.Environment.Variables
}

cf := LambdaFunctionConfig{
Config: Config{
Name: sf.FunctionName,
},
FunctionName: sf.FunctionName,
Role: sf.Role,
Handler: sf.Handler,
MemorySize: sf.MemorySize,
ReservedConcurrentExecutions: sf.ReservedConcurrentExecutions,
Runtime: sf.Runtime,
Timeout: sf.Timeout,
TracingConfig: tracingConfig,
VPCConfig: vpcConfig,
Environment: environment,
KMSKeyARN: sf.KmsKeyArn,
}

return []AWSResourceConfig{{
Resource: cf,
Metadata: sf.AWSCloudFormationMetadata,
}}
}

func getLambdaConfig(lf *lambda.Function) []AWSResourceConfig {
var tracingConfig []TracingConfigBlock
if f.TracingConfig != nil {
if lf.TracingConfig != nil {
tracingConfig = make([]TracingConfigBlock, 1)

tracingConfig[0].Mode = f.TracingConfig.Mode
tracingConfig[0].Mode = lf.TracingConfig.Mode
}

var vpcConfig []VPCConfigBlock
if f.VpcConfig != nil {
if lf.VpcConfig != nil {
vpcConfig = make([]VPCConfigBlock, 1)

vpcConfig[0].SecurityGroupIDs = f.VpcConfig.SecurityGroupIds
vpcConfig[0].SubnetIDs = f.VpcConfig.SubnetIds
vpcConfig[0].SecurityGroupIDs = lf.VpcConfig.SecurityGroupIds
vpcConfig[0].SubnetIDs = lf.VpcConfig.SubnetIds
}

var environment []EnvironmentBlock
if f.Environment != nil {
if lf.Environment != nil {
environment = make([]EnvironmentBlock, 1)

environment[0].Variables = f.Environment.Variables
environment[0].Variables = lf.Environment.Variables
}

cf := LambdaFunctionConfig{
Config: Config{
Name: f.FunctionName,
Name: lf.FunctionName,
},
FileName: f.Code.ZipFile,
FunctionName: f.FunctionName,
Role: f.Role,
Handler: f.Handler,
MemorySize: f.MemorySize,
ReservedConcurrentExecutions: f.ReservedConcurrentExecutions,
Runtime: f.Runtime,
Timeout: f.Timeout,
FunctionName: lf.FunctionName,
Role: lf.Role,
Handler: lf.Handler,
MemorySize: lf.MemorySize,
ReservedConcurrentExecutions: lf.ReservedConcurrentExecutions,
Runtime: lf.Runtime,
Timeout: lf.Timeout,
TracingConfig: tracingConfig,
VPCConfig: vpcConfig,
Environment: environment,
KMSKeyARN: f.KmsKeyArn,
KMSKeyARN: lf.KmsKeyArn,
}

return []AWSResourceConfig{{
Resource: cf,
Metadata: f.AWSCloudFormationMetadata,
Metadata: lf.AWSCloudFormationMetadata,
}}
}
1 change: 1 addition & 0 deletions pkg/mapper/iac-providers/cft/store/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ var ResourceTypes = map[string]string{
"AWS::EC2::Instance.NetworkInterface": AwsEc2NetworkInterface,
"AWS::Cognito::UserPool": AwsCognitoUserPool,
"AWS::Lambda::Function": AwsLambdaFunction,
"AWS::Serverless::Function": AwsLambdaFunction,
"AWS::CertificateManager::Certificate": AwsAcmCertificate,
"AWS::SageMaker::NotebookInstance": AwsSagemakerNotebookInstance,
"AWS::SageMaker::Model": AwsSagemakerModel,
Expand Down