Remove redundant id field from EC2 AMI block device mapping

Author: florinutz

providers/aws/resources/aws.lr

@@ -3454,8 +3454,6 @@ private aws.ec2.image @defaults("ownerAlias id name") {
 
 // Amazon EC2 image block device mapping
 private aws.ec2.image.blockDeviceMapping @defaults("deviceName") {
-  // Internal ID for this block device mapping
-  id string
   // Device name (e.g., /dev/sda1, /dev/xvda)
   deviceName string
   // Virtual device name for instance store (ephemeral0, ephemeral1, etc.)

providers/aws/resources/aws.lr.go

@@ -687,7 +687,7 @@ func createBlockDeviceMappings(runtime *plugin.Runtime, imageArn string, mapping
 		mappingID := fmt.Sprintf("%s/device/%s", imageArn, deviceName)
 
 		args := map[string]*llx.RawData{
-			"id":          llx.StringData(mappingID),
+			"__id":        llx.StringData(mappingID),
 			"deviceName":  llx.StringDataPtr(mapping.DeviceName),
 			"virtualName": llx.StringDataPtr(mapping.VirtualName),
 			"noDevice":    llx.BoolData(mapping.NoDevice != nil && *mapping.NoDevice != ""),
@@ -1224,14 +1224,6 @@ func (i *mqlAwsEc2Image) id() (string, error) {
 	return i.Arn.Data, nil
 }
 
-func (b *mqlAwsEc2ImageBlockDeviceMapping) id() (string, error) {
-	return b.Id.Data, nil
-}
-
-func (e *mqlAwsEc2ImageEbsBlockDevice) id() (string, error) {
-	return e.__id, nil
-}
-
 func initAwsEc2Image(runtime *plugin.Runtime, args map[string]*llx.RawData) (map[string]*llx.RawData, plugin.Resource, error) {
 	if len(args) > 2 {
 		return args, nil, nil