Minor fixes and improvements to aws.ec2.instance (#6670)

- Don't fail when the keypair has been deleted
- Deprecate vpcArn
- Add launchedAt and deprecate launchTime

Signed-off-by: Tim Smith <tsmith84@gmail.com>

Author: tas50

providers/aws/resources/aws.lr

@@ -4332,8 +4332,10 @@ private aws.ec2.instance @defaults("instanceId region state instanceType archite
   iamInstanceProfile() aws.iam.instanceProfile
   // Image that was used for the instance
   image() aws.ec2.image
-  // Launch time of the instance
+  // Deprecated: use `launchedAt` instead
   launchTime time
+  // Launch time of the instance
+  launchedAt time
   // Private IP address for the instance
   privateIp string
   // Private DNS name for the instance
@@ -4342,7 +4344,7 @@ private aws.ec2.instance @defaults("instanceId region state instanceType archite
   keypair() aws.ec2.keypair
   // Time when the last state transition occurred
   stateTransitionTime time
-  // ARN of the VPC associated with the instance
+  // Deprecated: use `vpc` instead
   vpcArn string
   // Hypervisor type of the instance: ovm or xen
   hypervisor string

providers/aws/resources/aws.lr.go

@@ -541,6 +541,7 @@ aws.ec2.instance.instanceStatus 9.0.0
 aws.ec2.instance.instanceType 9.0.0
 aws.ec2.instance.keypair 9.0.0
 aws.ec2.instance.launchTime 9.0.0
+aws.ec2.instance.launchedAt 11.12.3
 aws.ec2.instance.networkInterfaces 11.1.0
 aws.ec2.instance.patchState 9.0.0
 aws.ec2.instance.platformDetails 9.0.0

providers/aws/resources/aws.lr.versions

@@ -694,6 +694,11 @@ func initAwsEc2Keypair(runtime *plugin.Runtime, args map[string]*llx.RawData) (m
 		if errors.As(err, &ae) {
 			if ae.ErrorCode() == "InvalidKeyPair.NotFound" {
 				log.Warn().Msgf("key %s does not exist in %s region", n, r)
+				args["fingerprint"] = llx.StringData("")
+				args["type"] = llx.StringData("")
+				args["tags"] = llx.MapData(map[string]any{}, types.String)
+				args["arn"] = llx.StringData("")
+				args["createdAt"] = llx.NilData
 				return args, nil, nil
 			}
 		}
@@ -713,6 +718,11 @@ func initAwsEc2Keypair(runtime *plugin.Runtime, args map[string]*llx.RawData) (m
 
 		return args, nil, nil
 	}
+	args["fingerprint"] = llx.StringData("")
+	args["type"] = llx.StringData("")
+	args["tags"] = llx.MapData(map[string]any{}, types.String)
+	args["arn"] = llx.StringData("")
+	args["createdAt"] = llx.NilData
 	return args, nil, nil
 }
 
@@ -1084,6 +1094,7 @@ func (a *mqlAwsEc2) gatherInstanceInfo(instances []ec2types.Instance, regionVal
 			"instanceLifecycle":  llx.StringData(string(instance.InstanceLifecycle)),
 			"instanceType":       llx.StringData(string(instance.InstanceType)),
 			"launchTime":         llx.TimeDataPtr(instance.LaunchTime),
+			"launchedAt":         llx.TimeDataPtr(instance.LaunchTime),
 			"platformDetails":    llx.StringDataPtr(instance.PlatformDetails),
 			"privateDnsName":     llx.StringDataPtr(instance.PrivateDnsName),
 			"privateIp":          llx.StringDataPtr(instance.PrivateIpAddress),