Merge 2b5859d into a90a439

Author: dgaley

.github/workflows/keyfactor-bootstrap-workflow.yml

@@ -0,0 +1,19 @@
+name: Keyfactor Bootstrap Workflow
+
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [opened, closed, synchronize, edited, reopened]
+  push:
+  create:
+    branches:
+      - 'release-*.*'
+
+jobs:
+  call-starter-workflow:
+    uses: keyfactor/actions/.github/workflows/starter.yml@v2
+    secrets:
+      token: ${{ secrets.V2BUILDTOKEN}}
+      APPROVE_README_PUSH: ${{ secrets.V2BUILDTOKEN }}
+      gpg_key: ${{ secrets.KF_GPG_PRIVATE_KEY }}
+      gpg_pass: ${{ secrets.KF_GPG_PASSPHRASE }}

.github/workflows/keyfactor-starter-workflow.yml

@@ -174,6 +174,7 @@ public int RevokeCertificate(RevokeCertificateRequest request)
 		public List<ACMPCACertificate> GetAuditReport()
 		{
 			Logger.MethodEntry(ILogExtensions.MethodLogLevel.Trace);
+			Logger.Trace($"Creating audit report request with:\n\tCAArn: {Config.CAArn}\n\tS3 Bucket: {Config.S3Bucket}");
 			CreateCertificateAuthorityAuditReportRequest request = new CreateCertificateAuthorityAuditReportRequest()
 			{
 				CertificateAuthorityArn = Config.CAArn,
@@ -201,6 +202,7 @@ public List<ACMPCACertificate> GetAuditReport()
 		private IAmazonACMPCA GetPCAClient()
 		{
 			Logger.MethodEntry(ILogExtensions.MethodLogLevel.Trace);
+			Logger.Trace($"Creating PCA Client with region {Config.GetRegion()}");
 			IAmazonACMPCA client = new AmazonACMPCAClient(Config.AccessKey, Config.AccessSecret, Config.GetRegion());
 			Logger.MethodExit(ILogExtensions.MethodLogLevel.Trace);
 			return client;
@@ -210,11 +212,21 @@ private IAmazonS3 GetS3Client()
 		{
 			Logger.MethodEntry(ILogExtensions.MethodLogLevel.Trace);
 			string region = "";
+			Logger.Trace($"Locating region for S3 bucket: {Config.S3Bucket}");
 			using (IAmazonS3 tempClient = new AmazonS3Client(Config.AccessKey, Config.AccessSecret, Config.GetRegion()))
 			{
 				var bucketResponse = tempClient.GetBucketLocation(Config.S3Bucket);
 				region = bucketResponse.Location.Value;
 			}
+			if (string.IsNullOrEmpty(region))
+			{
+				region = "us-east-1";
+			}
+			if (string.Equals(region, "EU", StringComparison.OrdinalIgnoreCase))
+			{
+				region = "eu-west-1";
+			}
+			Logger.Trace($"Creating S3 Client with region {region}");
 			var s3Client = new AmazonS3Client(Config.AccessKey, Config.AccessSecret, RegionEndpoint.GetBySystemName(region));
 			Logger.MethodExit(ILogExtensions.MethodLogLevel.Trace);
 			return s3Client;