Merge 1.0.1 to main

.gitignore

@@ -328,3 +328,5 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
+.claude/settings.local.json
+sample change.txt

CHANGELOG.md

@@ -1,13 +1,5 @@
-# v2.0.0
-* Migrate `packages.config` to `PackageReference` format
-* Upgrade packages to support Keyfactor AnyCA Gateway DCOM v24.2
-    * Upgrade `Keyfactor.AnyGateway.SDK` to `24.2.0-PRERELEASE-47446`
-* Add support for [GCP CAS Certificate Templates](https://cloud.google.com/certificate-authority-service/docs/policy-controls)
-* Enable configuration of CA Pool-based or CA-specific certificate enrollment. If the `CAId` is specified, certificates are enrolled with the CA specified by `CAId`. Otherwise, GCP CAS selects a CA in the CA Pool based on policy.
-
-# v1.1.0 
-  - Remove template references from README
-  - Small bug fixes  
+# v1.0.1
+* SaaS Containerization Fixes, added enabled flag cleaned up some log messages
 
 # v1.0.0
-* Initial Release. Support for Google GA CA Service.  Sync, Enroll, and Revocation. 
+* Initial Release.  Sync, Enroll, and Revocation. 

HydrantCAProxy/HydrantIdCAPlugin.cs

@@ -29,6 +29,7 @@ public class HydrantIdCAPlugin : IAnyCAPlugin
         private RequestManager _requestManager;
         private IAnyCAPluginConfigProvider Config { get; set; }
         private ICertificateDataReader certDataReader;
+        private HydrantIdCAPluginConfig.Config _config;
 
         public void Initialize(IAnyCAPluginConfigProvider configProvider, ICertificateDataReader certificateDataReader)
         {
@@ -37,10 +38,13 @@ public void Initialize(IAnyCAPluginConfigProvider configProvider, ICertificateDa
             {
                 certDataReader = certificateDataReader;
                 Config = configProvider;
+                var rawData = JsonConvert.SerializeObject(configProvider.CAConnectionData);
+                _config = JsonConvert.DeserializeObject<HydrantIdCAPluginConfig.Config>(rawData);
+                _logger.LogTrace($"Initialize - Enabled: {_config.Enabled}");
             }
             catch (Exception ex)
             {
-                _logger.LogError($"Failed to initialize GCP CAS CAPlugin: {ex}");
+                _logger.LogError($"Failed to initialize HydrantId CAPlugin: {ex}");
             }
         }
 
@@ -58,23 +62,39 @@ private static List<string> CheckRequiredValues(Dictionary<string, object> conne
 
         public async Task Ping()
         {
-
+            _logger.MethodEntry();
+            if (!_config.Enabled)
+            {
+                _logger.LogWarning($"The CA is currently in the Disabled state. It must be Enabled to perform operations. Skipping connectivity test...");
+                _logger.MethodExit(LogLevel.Trace);
+                return;
+            }
+            _logger.LogDebug("Pinging HydrantId to validate connection");
+            _logger.MethodExit();
         }
 
         public Task ValidateCAConnectionInfo(Dictionary<string, object> connectionInfo)
         {
             _logger.MethodEntry();
-            _logger.LogDebug($"Validating GCP CAS CA Connection properties");
+            _logger.LogDebug($"Validating HydrantId CA Connection properties");
             var rawData = JsonConvert.SerializeObject(connectionInfo);
-            HydrantIdCAPluginConfig.Config config = JsonConvert.DeserializeObject<HydrantIdCAPluginConfig.Config>(rawData);
+            _config = JsonConvert.DeserializeObject<HydrantIdCAPluginConfig.Config>(rawData);
 
-            _logger.LogTrace($"HydrantIdClientFromCAConnectionData - HydrantIdBaseUrl: {config.HydrantIdBaseUrl}");
+            _logger.LogTrace($"HydrantIdClientFromCAConnectionData - HydrantIdBaseUrl: {_config.HydrantIdBaseUrl}");
+            _logger.LogTrace($"HydrantIdClientFromCAConnectionData - Enabled: {_config.Enabled}");
+
+            if (!_config.Enabled)
+            {
+                _logger.LogWarning($"The CA is currently in the Disabled state. It must be Enabled to perform operations. Skipping config validation...");
+                _logger.MethodExit();
+                return Task.CompletedTask;
+            }
 
             List<string> missingFields = new List<string>();
 
-            if (string.IsNullOrEmpty(config.HydrantIdBaseUrl)) missingFields.Add(nameof(config.HydrantIdBaseUrl));
-            if (string.IsNullOrEmpty(config.HydrantIdAuthId)) missingFields.Add(nameof(config.HydrantIdAuthId));
-            if (string.IsNullOrEmpty(config.HydrantIdAuthKey)) missingFields.Add(nameof(config.HydrantIdAuthKey));
+            if (string.IsNullOrEmpty(_config.HydrantIdBaseUrl)) missingFields.Add(nameof(_config.HydrantIdBaseUrl));
+            if (string.IsNullOrEmpty(_config.HydrantIdAuthId)) missingFields.Add(nameof(_config.HydrantIdAuthId));
+            if (string.IsNullOrEmpty(_config.HydrantIdAuthKey)) missingFields.Add(nameof(_config.HydrantIdAuthKey));
 
             if (missingFields.Count > 0)
             {

HydrantCAProxy/HydrantIdCAPlugin.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -18,4 +18,4 @@
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
 	</ItemGroup>
-</Project>
+</Project>

HydrantCAProxy/HydrantIdCAPluginConfig.cs

@@ -28,13 +28,15 @@ public class ConfigConstants
             public static string HydrantIdAuthId = "HydrantIdAuthId";
             public static string HydrantIdAuthKey = "HydrantIdAuthKey";
             public static string DefaultPageSize = "DefaultPageSize";
+            public static string Enabled = "Enabled";
         }
 
         public class Config
         {
             public string HydrantIdBaseUrl { get; set; }
             public string HydrantIdAuthId { get; set; }
             public string HydrantIdAuthKey { get; set; }
+            public bool Enabled { get; set; }
         }
 
         public static class EnrollmentParametersConstants
@@ -68,6 +70,13 @@ public static Dictionary<string, PropertyConfigInfo> GetPluginAnnotations()
                     Hidden = true,
                     DefaultValue = "",
                     Type = "Secret"
+                },
+                [ConfigConstants.Enabled] = new PropertyConfigInfo()
+                {
+                    Comments = "Flag to Enable or Disable the CA connector.",
+                    Hidden = false,
+                    DefaultValue = true,
+                    Type = "Bool"
                 }
             };
         }