update cft map for elb/s3 bucket (#1434)

tenable · Nov 1, 2022 · 5a49729 · 5a49729
1 parent d2f8770
commit 5a49729
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/pkg/mapper/iac-providers/cft/config/elasticloadbalancingv2-listener.go b/pkg/mapper/iac-providers/cft/config/elasticloadbalancingv2-listener.go
@@ -25,6 +25,7 @@ import (
 type ElasticLoadBalancingV2ListenerConfig struct {
 	Config
 	Protocol      string                `json:"protocol"`
+	Port          int                   `json:"port"`
 	DefaultAction []DefaultActionConfig `json:"default_action"`
 }
 
@@ -36,6 +37,7 @@ type DefaultActionConfig struct {
 // RedirectConfig holds config for redirect attirbute of default_action
 type RedirectConfig struct {
 	Protocol string `json:"protocol"`
+	Port     string `json:"port"`
 }
 
 // GetElasticLoadBalancingV2ListenerConfig returns config for aws_lb_listener
@@ -49,13 +51,15 @@ func GetElasticLoadBalancingV2ListenerConfig(l *elasticloadbalancingv2.Listener)
 		cf := ElasticLoadBalancingV2ListenerConfig{
 			Config:   Config{},
 			Protocol: functions.GetVal(l.Protocol),
+			Port:     functions.GetVal(l.Port),
 		}
 		if action.RedirectConfig != nil {
 			defaultAction := []DefaultActionConfig{
 				{
 					RedirectConfig: []RedirectConfig{
 						{
 							Protocol: functions.GetVal(action.RedirectConfig.Protocol),
+							Port:     functions.GetVal(action.RedirectConfig.Port),
 						},
 					},
 				},

diff --git a/pkg/mapper/iac-providers/cft/config/s3-bucket-policy.go b/pkg/mapper/iac-providers/cft/config/s3-bucket-policy.go
@@ -26,6 +26,7 @@ import (
 type S3BucketPolicyConfig struct {
 	Config
 	PolicyDocument string `json:"policy"`
+	Bucket         string `json:"bucket"`
 }
 
 // GetS3BucketPolicyConfig returns config for aws_s3_bucket_policy
@@ -34,6 +35,7 @@ func GetS3BucketPolicyConfig(p *s3.BucketPolicy) []AWSResourceConfig {
 		Config: Config{
 			Name: p.Bucket,
 		},
+		Bucket: p.Bucket,
 	}
 
 	policyDocument, err := json.Marshal(p.PolicyDocument)