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.

Sign up for GitHub

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

feat(misconf): ssl_mode support for GCP SQL DB instance #7564

Merged
merged 1 commit into from
Oct 17, 2024
Merged

feat(misconf): ssl_mode support for GCP SQL DB instance #7564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions pkg/iac/adapters/terraform/google/sql/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ func adaptInstance(resource *terraform.Block) sql.DatabaseInstance {
IPConfiguration: sql.IPConfiguration{
Metadata: resource.GetMetadata(),
RequireTLS: iacTypes.BoolDefault(false, resource.GetMetadata()),
SSLMode: iacTypes.String("", resource.GetMetadata()),
EnableIPv4: iacTypes.BoolDefault(true, resource.GetMetadata()),
AuthorizedNetworks: nil,
},
Expand Down Expand Up @@ -125,12 +126,6 @@ func adaptIPConfig(resource *terraform.Block) sql.IPConfiguration {
CIDR iacTypes.StringValue
}

tlsRequiredAttr := resource.GetAttribute("require_ssl")
tlsRequiredVal := tlsRequiredAttr.AsBoolValueOrDefault(false, resource)

ipv4enabledAttr := resource.GetAttribute("ipv4_enabled")
ipv4enabledVal := ipv4enabledAttr.AsBoolValueOrDefault(true, resource)

authNetworksBlocks := resource.GetBlocks("authorized_networks")
for _, authBlock := range authNetworksBlocks {
nameVal := authBlock.GetAttribute("name").AsStringValueOrDefault("", authBlock)
Expand All @@ -147,8 +142,9 @@ func adaptIPConfig(resource *terraform.Block) sql.IPConfiguration {

return sql.IPConfiguration{
Metadata: resource.GetMetadata(),
RequireTLS: tlsRequiredVal,
EnableIPv4: ipv4enabledVal,
RequireTLS: resource.GetAttribute("require_ssl").AsBoolValueOrDefault(false, resource),
SSLMode: resource.GetAttribute("ssl_mode").AsStringValueOrDefault("", resource),
EnableIPv4: resource.GetAttribute("ipv4_enabled").AsBoolValueOrDefault(true, resource),
AuthorizedNetworks: authorizedNetworks,
}
}
2 changes: 2 additions & 0 deletions pkg/iac/adapters/terraform/google/sql/adapt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ func Test_Adapt(t *testing.T) {
name = "internal"
}
require_ssl = true
ssl_mode = "TRUSTED_CLIENT_CERTIFICATE_REQUIRED"
}
}
}
Expand Down Expand Up @@ -67,6 +68,7 @@ func Test_Adapt(t *testing.T) {
Metadata: iacTypes.NewTestMetadata(),
RequireTLS: iacTypes.Bool(true, iacTypes.NewTestMetadata()),
EnableIPv4: iacTypes.Bool(false, iacTypes.NewTestMetadata()),
SSLMode: iacTypes.StringTest("TRUSTED_CLIENT_CERTIFICATE_REQUIRED"),
AuthorizedNetworks: []struct {
Name iacTypes.StringValue
CIDR iacTypes.StringValue
Expand Down
1 change: 1 addition & 0 deletions pkg/iac/providers/google/sql/sql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ type Backups struct {
type IPConfiguration struct {
Metadata iacTypes.Metadata
RequireTLS iacTypes.BoolValue
SSLMode iacTypes.StringValue
EnableIPv4 iacTypes.BoolValue
AuthorizedNetworks []struct {
Name iacTypes.StringValue
Expand Down
4 changes: 4 additions & 0 deletions pkg/iac/rego/schemas/cloud.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6987,6 +6987,10 @@
"requiretls": {
"type": "object",
"$ref": "#/definitions/github.aaakk.us.kg.aquasecurity.trivy.pkg.iac.types.BoolValue"
},
"sslmode": {
"type": "object",
"$ref": "#/definitions/github.aaakk.us.kg.aquasecurity.trivy.pkg.iac.types.StringValue"
}
}
},
Expand Down