refactor: remove redundant zero defaults from cf adapters

nikpivkin · nikpivkin · commit fdce06d5b559 · 2026-05-29T16:18:54.000+06:00
diff --git a/pkg/iac/adapters/cloudformation/aws/ec2/launch_template.go b/pkg/iac/adapters/cloudformation/aws/ec2/launch_template.go
@@ -18,7 +18,7 @@ func getLaunchTemplates(file parser.FileContext) (templates []ec2.LaunchTemplate
 func adaptLaunchTemplate(r *parser.Resource) ec2.LaunchTemplate {
 	launchTemplate := ec2.LaunchTemplate{
 		Metadata: r.Metadata(),
-		Name:     r.GetStringProperty("LaunchTemplateName", ""),
+		Name:     r.GetStringProperty("LaunchTemplateName"),
 		Instance: ec2.Instance{
 			Metadata: r.Metadata(),
 			MetadataOptions: ec2.MetadataOptions{
@@ -39,7 +39,7 @@ func adaptLaunchTemplate(r *parser.Resource) ec2.LaunchTemplate {
 			}
 		}
 
-		launchTemplate.Instance.UserData = data.GetStringProperty("UserData", "")
+		launchTemplate.Instance.UserData = data.GetStringProperty("UserData")
 
 		blockDevices := getBlockDevices(r)
 		for i, device := range blockDevices {
diff --git a/pkg/iac/adapters/cloudformation/aws/ecr/repository.go b/pkg/iac/adapters/cloudformation/aws/ecr/repository.go
@@ -34,15 +34,15 @@ func getRepositories(ctx parser.FileContext) (repositories []ecr.Repository) {
 		if imageScanningProp := r.GetProperty("ImageScanningConfiguration"); imageScanningProp.IsNotNil() {
 			repository.ImageScanning = ecr.ImageScanning{
 				Metadata:   imageScanningProp.Metadata(),
-				ScanOnPush: imageScanningProp.GetBoolProperty("ScanOnPush", false),
+				ScanOnPush: imageScanningProp.GetBoolProperty("ScanOnPush"),
 			}
 		}
 
 		if encProp := r.GetProperty("EncryptionConfiguration"); encProp.IsNotNil() {
 			repository.Encryption = ecr.Encryption{
 				Metadata: encProp.Metadata(),
 				Type:     encProp.GetStringProperty("EncryptionType", ecr.EncryptionTypeAES256),
-				KMSKeyID: encProp.GetStringProperty("KmsKey", ""),
+				KMSKeyID: encProp.GetStringProperty("KmsKey"),
 			}
 		}
 
diff --git a/pkg/iac/adapters/cloudformation/aws/elb/loadbalancer.go b/pkg/iac/adapters/cloudformation/aws/elb/loadbalancer.go
@@ -33,7 +33,7 @@ func getListeners(lbr *parser.Resource, ctx parser.FileContext) (listeners []elb
 			listener := elb.Listener{
 				Metadata:       r.Metadata(),
 				Protocol:       r.GetStringProperty("Protocol", "HTTP"),
-				TLSPolicy:      r.GetStringProperty("SslPolicy", ""),
+				TLSPolicy:      r.GetStringProperty("SslPolicy"),
 				DefaultActions: getDefaultListenerActions(r),
 			}
 
diff --git a/pkg/iac/adapters/cloudformation/aws/msk/cluster.go b/pkg/iac/adapters/cloudformation/aws/msk/cluster.go
@@ -50,7 +50,7 @@ func getClusters(ctx parser.FileContext) (clusters []msk.Cluster) {
 		if encAtRestProp := r.GetProperty("EncryptionInfo.EncryptionAtRest"); encAtRestProp.IsNotNil() {
 			cluster.EncryptionAtRest = msk.EncryptionAtRest{
 				Metadata:  encAtRestProp.Metadata(),
-				KMSKeyARN: encAtRestProp.GetStringProperty("DataVolumeKMSKeyId", ""),
+				KMSKeyARN: encAtRestProp.GetStringProperty("DataVolumeKMSKeyId"),
 				Enabled:   iacTypes.BoolDefault(true, encAtRestProp.Metadata()),
 			}
 		}
@@ -61,15 +61,15 @@ func getClusters(ctx parser.FileContext) (clusters []msk.Cluster) {
 				cluster.Logging.Broker.Metadata = brokerLoggingProp.Metadata()
 				if s3Prop := brokerLoggingProp.GetProperty("S3"); s3Prop.IsNotNil() {
 					cluster.Logging.Broker.S3.Metadata = s3Prop.Metadata()
-					cluster.Logging.Broker.S3.Enabled = s3Prop.GetBoolProperty("Enabled", false)
+					cluster.Logging.Broker.S3.Enabled = s3Prop.GetBoolProperty("Enabled")
 				}
 				if cwProp := brokerLoggingProp.GetProperty("CloudWatchLogs"); cwProp.IsNotNil() {
 					cluster.Logging.Broker.Cloudwatch.Metadata = cwProp.Metadata()
-					cluster.Logging.Broker.Cloudwatch.Enabled = cwProp.GetBoolProperty("Enabled", false)
+					cluster.Logging.Broker.Cloudwatch.Enabled = cwProp.GetBoolProperty("Enabled")
 				}
 				if fhProp := brokerLoggingProp.GetProperty("Firehose"); fhProp.IsNotNil() {
 					cluster.Logging.Broker.Firehose.Metadata = fhProp.Metadata()
-					cluster.Logging.Broker.Firehose.Enabled = fhProp.GetBoolProperty("Enabled", false)
+					cluster.Logging.Broker.Firehose.Enabled = fhProp.GetBoolProperty("Enabled")
 				}
 			}
 		}
diff --git a/pkg/iac/adapters/cloudformation/aws/rds/instance.go b/pkg/iac/adapters/cloudformation/aws/rds/instance.go
@@ -31,9 +31,9 @@ func getClustersAndInstances(ctx parser.FileContext) ([]rds.Cluster, []rds.Insta
 			PublicAccess:                     r.GetBoolProperty("PubliclyAccessible", true),
 			Engine:                           r.GetStringProperty("Engine"),
 			IAMAuthEnabled:                   r.GetBoolProperty("EnableIAMDatabaseAuthentication"),
-			DeletionProtection:               r.GetBoolProperty("DeletionProtection", false),
+			DeletionProtection:               r.GetBoolProperty("DeletionProtection"),
 			DBInstanceArn:                    r.GetStringProperty("DBInstanceArn"),
-			StorageEncrypted:                 r.GetBoolProperty("StorageEncrypted", false),
+			StorageEncrypted:                 r.GetBoolProperty("StorageEncrypted"),
 			DBInstanceIdentifier:             r.GetStringProperty("DBInstanceIdentifier"),
 			DBParameterGroups:                getDBParameterGroups(ctx, r),
 			TagList:                          getTagList(r),
diff --git a/pkg/iac/adapters/cloudformation/aws/redshift/cluster.go b/pkg/iac/adapters/cloudformation/aws/redshift/cluster.go
@@ -26,7 +26,7 @@ func getClusters(ctx parser.FileContext) (clusters []redshift.Cluster) {
 				Metadata: r.Metadata(),
 				Port:     r.GetIntProperty("Endpoint.Port"),
 			},
-			SubnetGroupName: r.GetStringProperty("ClusterSubnetGroupName", ""),
+			SubnetGroupName: r.GetStringProperty("ClusterSubnetGroupName"),
 		}
 
 		clusters = append(clusters, cluster)
diff --git a/pkg/iac/adapters/cloudformation/aws/sam/api.go b/pkg/iac/adapters/cloudformation/aws/sam/api.go
@@ -12,7 +12,7 @@ func getApis(cfFile parser.FileContext) (apis []sam.API) {
 	for _, r := range apiResources {
 		api := sam.API{
 			Metadata:            r.Metadata(),
-			Name:                r.GetStringProperty("Name", ""),
+			Name:                r.GetStringProperty("Name"),
 			TracingEnabled:      r.GetBoolProperty("TracingEnabled"),
 			DomainConfiguration: getDomainConfiguration(r),
 			AccessLogging:       getAccessLogging(r),
@@ -70,7 +70,7 @@ func getAccessLogging(r *parser.Resource) sam.AccessLogging {
 	if access := r.GetProperty("AccessLogSetting"); access.IsNotNil() {
 		logging = sam.AccessLogging{
 			Metadata:              access.Metadata(),
-			CloudwatchLogGroupARN: access.GetStringProperty("DestinationArn", ""),
+			CloudwatchLogGroupARN: access.GetStringProperty("DestinationArn"),
 		}
 	}
 
diff --git a/pkg/iac/adapters/cloudformation/aws/sam/http_api.go b/pkg/iac/adapters/cloudformation/aws/sam/http_api.go
@@ -12,7 +12,7 @@ func getHttpApis(cfFile parser.FileContext) (apis []sam.HttpAPI) {
 	for _, r := range apiResources {
 		api := sam.HttpAPI{
 			Metadata:             r.Metadata(),
-			Name:                 r.GetStringProperty("Name", ""),
+			Name:                 r.GetStringProperty("Name"),
 			DomainConfiguration:  getDomainConfiguration(r),
 			AccessLogging:        getAccessLoggingV2(r),
 			DefaultRouteSettings: getRouteSettings(r),
@@ -34,7 +34,7 @@ func getAccessLoggingV2(r *parser.Resource) sam.AccessLogging {
 	if access := r.GetProperty("AccessLogSettings"); access.IsNotNil() {
 		logging = sam.AccessLogging{
 			Metadata:              access.Metadata(),
-			CloudwatchLogGroupARN: access.GetStringProperty("DestinationArn", ""),
+			CloudwatchLogGroupARN: access.GetStringProperty("DestinationArn"),
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,15 @@ func getRepositories(ctx parser.FileContext) (repositories []ecr.Repository) {`
`34`	`34`	`if imageScanningProp := r.GetProperty("ImageScanningConfiguration"); imageScanningProp.IsNotNil() {`
`35`	`35`	`repository.ImageScanning = ecr.ImageScanning{`
`36`	`36`	`Metadata: imageScanningProp.Metadata(),`
`37`		`- ScanOnPush: imageScanningProp.GetBoolProperty("ScanOnPush", false),`
	`37`	`+ ScanOnPush: imageScanningProp.GetBoolProperty("ScanOnPush"),`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`if encProp := r.GetProperty("EncryptionConfiguration"); encProp.IsNotNil() {`
`42`	`42`	`repository.Encryption = ecr.Encryption{`
`43`	`43`	`Metadata: encProp.Metadata(),`
`44`	`44`	`Type: encProp.GetStringProperty("EncryptionType", ecr.EncryptionTypeAES256),`
`45`		`- KMSKeyID: encProp.GetStringProperty("KmsKey", ""),`
	`45`	`+ KMSKeyID: encProp.GetStringProperty("KmsKey"),`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func getListeners(lbr *parser.Resource, ctx parser.FileContext) (listeners []elb`
`33`	`33`	`listener := elb.Listener{`
`34`	`34`	`Metadata: r.Metadata(),`
`35`	`35`	`Protocol: r.GetStringProperty("Protocol", "HTTP"),`
`36`		`- TLSPolicy: r.GetStringProperty("SslPolicy", ""),`
	`36`	`+ TLSPolicy: r.GetStringProperty("SslPolicy"),`
`37`	`37`	`DefaultActions: getDefaultListenerActions(r),`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func getClusters(ctx parser.FileContext) (clusters []msk.Cluster) {`
`50`	`50`	`if encAtRestProp := r.GetProperty("EncryptionInfo.EncryptionAtRest"); encAtRestProp.IsNotNil() {`
`51`	`51`	`cluster.EncryptionAtRest = msk.EncryptionAtRest{`
`52`	`52`	`Metadata: encAtRestProp.Metadata(),`
`53`		`- KMSKeyARN: encAtRestProp.GetStringProperty("DataVolumeKMSKeyId", ""),`
	`53`	`+ KMSKeyARN: encAtRestProp.GetStringProperty("DataVolumeKMSKeyId"),`
`54`	`54`	`Enabled: iacTypes.BoolDefault(true, encAtRestProp.Metadata()),`
`55`	`55`	`}`
`56`	`56`	`}`
`@@ -61,15 +61,15 @@ func getClusters(ctx parser.FileContext) (clusters []msk.Cluster) {`
`61`	`61`	`cluster.Logging.Broker.Metadata = brokerLoggingProp.Metadata()`
`62`	`62`	`if s3Prop := brokerLoggingProp.GetProperty("S3"); s3Prop.IsNotNil() {`
`63`	`63`	`cluster.Logging.Broker.S3.Metadata = s3Prop.Metadata()`
`64`		`- cluster.Logging.Broker.S3.Enabled = s3Prop.GetBoolProperty("Enabled", false)`
	`64`	`+ cluster.Logging.Broker.S3.Enabled = s3Prop.GetBoolProperty("Enabled")`
`65`	`65`	`}`
`66`	`66`	`if cwProp := brokerLoggingProp.GetProperty("CloudWatchLogs"); cwProp.IsNotNil() {`
`67`	`67`	`cluster.Logging.Broker.Cloudwatch.Metadata = cwProp.Metadata()`
`68`		`- cluster.Logging.Broker.Cloudwatch.Enabled = cwProp.GetBoolProperty("Enabled", false)`
	`68`	`+ cluster.Logging.Broker.Cloudwatch.Enabled = cwProp.GetBoolProperty("Enabled")`
`69`	`69`	`}`
`70`	`70`	`if fhProp := brokerLoggingProp.GetProperty("Firehose"); fhProp.IsNotNil() {`
`71`	`71`	`cluster.Logging.Broker.Firehose.Metadata = fhProp.Metadata()`
`72`		`- cluster.Logging.Broker.Firehose.Enabled = fhProp.GetBoolProperty("Enabled", false)`
	`72`	`+ cluster.Logging.Broker.Firehose.Enabled = fhProp.GetBoolProperty("Enabled")`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func getClusters(ctx parser.FileContext) (clusters []redshift.Cluster) {`
`26`	`26`	`Metadata: r.Metadata(),`
`27`	`27`	`Port: r.GetIntProperty("Endpoint.Port"),`
`28`	`28`	`},`
`29`		`- SubnetGroupName: r.GetStringProperty("ClusterSubnetGroupName", ""),`
	`29`	`+ SubnetGroupName: r.GetStringProperty("ClusterSubnetGroupName"),`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`clusters = append(clusters, cluster)`