Merge pull request Azure#13281 from Azure/derricklee/fix-aws-connector-script

Fix AWS Connector script for CloudTrail

Author: hassanchawiche

DataConnectors/AWS-S3/ConfigCloudTrailDataConnector.ps1

@@ -246,7 +246,9 @@ $sqsArn = ((aws sqs get-queue-attributes --queue-url $sqsUrl --attribute-names Q
 Write-Log -Message $sqsArn -LogFileName $LogFileName -Severity Verbose
 
 $kmsConfirmation = Read-ValidatedHost -Prompt 'Do you want to enable KMS for CloudTrail? [y/n]' -ValidationType Confirm
-if ($kmsConfirmation -eq 'y') {
+$kmsEnabled = $kmsConfirmation -eq 'y'
+
+if ($kmsEnabled) {
 	New-KMS
 	$kmsArn = ($kmsKeyDescription | ConvertFrom-Json).KeyMetadata.Arn 
 	$kmsKeyId = ($kmsKeyDescription | ConvertFrom-Json).KeyMetadata.KeyId
@@ -291,7 +293,7 @@ Set-RetryAction({
 
 		$isCloudTrailNotExist = $lastexitcode -ne 0
 		if ($isCloudTrailNotExist) {
-			if ($kmsConfirmation -eq 'y') {
+			if ($kmsEnabled) {
 				Write-Log -Message "Executing: aws cloudtrail create-trail --name $cloudTrailName --s3-bucket-name $bucketName --kms-key-id $kmsKeyId --tags-list $(ConvertTo-Json -InputObject @($(Get-SentinelTagInJsonFormat) | ConvertFrom-Json) -Depth 99 -Compress) 2>&1" -LogFileName $LogFileName -Severity Verbose
 				$tempForOutput = aws cloudtrail create-trail --name $cloudTrailName --s3-bucket-name $bucketName --kms-key-id $kmsKeyId --tags-list $(ConvertTo-Json -InputObject @($(Get-SentinelTagInJsonFormat) | ConvertFrom-Json) -Depth 99 -Compress) 2>&1
 				Write-Log -Message $tempForOutput -LogFileName $LogFileName -Severity Verbose
@@ -309,9 +311,9 @@ Set-RetryAction({
 			$cloudTrailBucketConfirmation = Read-ValidatedHost "Trail '${cloudTrailName}' is already configured. Do you want to override the bucket destination? [y/n]"
 
 			if ($cloudTrailBucketConfirmation -eq 'y') {
-				if ($kmsConfirmation -eq 'y') {
-					Write-Log -Message "Executing: aws cloudtrail update-trail --name $cloudTrailName --s3-bucket-name $bucketName -kms-key-id $kmsKeyId | Out-Null" -LogFileName $LogFileName -Severity Verbose
-					aws cloudtrail update-trail --name $cloudTrailName --s3-bucket-name $bucketName -kms-key-id $kmsKeyId | Out-Null
+				if ($kmsEnabled) {
+					Write-Log -Message "Executing: aws cloudtrail update-trail --name $cloudTrailName --s3-bucket-name $bucketName --kms-key-id $kmsKeyId | Out-Null" -LogFileName $LogFileName -Severity Verbose
+					aws cloudtrail update-trail --name $cloudTrailName --s3-bucket-name $bucketName --kms-key-id $kmsKeyId | Out-Null
 				}
 				else {
 					Write-Log -Message "Executing: aws cloudtrail update-trail --name $cloudTrailName --s3-bucket-name $bucketName | Out-Null" -LogFileName $LogFileName -Severity Verbose