From 7bf3c1b83086d4b390a32b50eedcfb29eab1901b Mon Sep 17 00:00:00 2001 From: liu-hm19 Date: Thu, 14 Sep 2023 12:40:11 +0800 Subject: [PATCH] fix: fix aws database generator (#542) --- .../generator/accessories/database/aws_rds.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkg/generator/appconfiguration/generator/accessories/database/aws_rds.go b/pkg/generator/appconfiguration/generator/accessories/database/aws_rds.go index 80931ea7d..bae47cfe4 100644 --- a/pkg/generator/appconfiguration/generator/accessories/database/aws_rds.go +++ b/pkg/generator/appconfiguration/generator/accessories/database/aws_rds.go @@ -22,10 +22,15 @@ var ( ) type awsSecurityGroupTraffic struct { - CidrBlocks []string `yaml:"cidr_blocks,omitempty" json:"cidr_blocks,omitempty"` - Protocol string `yaml:"protocol,omitempty" json:"protoco,omitempty"` - FromPort int `yaml:"from_port,omitempty" json:"from_port,omitempty"` - ToPort int `yaml:"to_port,omitempty" json:"to_port,omitempty"` + CidrBlocks []string `yaml:"cidr_blocks" json:"cidr_blocks"` + Description string `yaml:"description" json:"description"` + FromPort int `yaml:"from_port" json:"from_port"` + IPv6CIDRBlocks []string `yaml:"ipv6_cidr_blocks" json:"ipv6_cidr_blocks"` + PrefixListIDs []string `yaml:"prefix_list_ids" json:"prefix_list_ids"` + Protocol string `yaml:"protocol" json:"protocol"` + SecurityGroups []string `yaml:"security_groups" json:"security_groups"` + Self bool `yaml:"self" json:"self"` + ToPort int `yaml:"to_port" json:"to_port"` } func (g *databaseGenerator) generateAWSResources(db *database.Database, spec *models.Spec) (*v1.Secret, error) { @@ -127,7 +132,7 @@ func (g *databaseGenerator) generateAWSDBInstance(region, awsSecurityGroupID, ra "publicly_accessible": isPublicAccessible(db.SecurityIPs), "skip_final_snapshot": true, "username": db.Username, - "vpc_security_groups_ids": []string{ + "vpc_security_group_ids": []string{ appconfiguration.KusionPathDependency(awsSecurityGroupID, "id"), }, }