fix: default values for version & always use api-based simulation runs (

#83) * fix: setting default values for version * Version bump * Report api-based runs by default in the heartbeat Co-authored-by: Ivan Polomani <[email protected]>
cognitedata · Dec 18, 2023 · 6e7dd6d · 6e7dd6d
1 parent 5c06fe1
commit 6e7dd6d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/Cognite.Simulator.Tests/TestHelpers.cs b/Cognite.Simulator.Tests/TestHelpers.cs
@@ -40,7 +40,8 @@ await cdf.Alpha.Simulators.UpdateSimulatorIntegrationAsync(
                         {
                             Update = new SimulatorIntegrationUpdate
                             {
-                                Heartbeat = new Update<long>(DateTime.UtcNow.ToUnixTimeMilliseconds())
+                                Heartbeat = new Update<long>(DateTime.UtcNow.ToUnixTimeMilliseconds()),
+                                RunApiEnabled = new Update<bool>(true),
                             }
                         }
                     }

diff --git a/Cognite.Simulator.Utils/ConnectorBase.cs b/Cognite.Simulator.Utils/ConnectorBase.cs
@@ -1,4 +1,4 @@
-using Cognite.Extractor.Common;
+using Cognite.Extractor.Common;
 using Cognite.Extractor.Utils;
 using Cognite.Simulator.Extensions;
 using Microsoft.Extensions.Logging;
@@ -162,7 +162,7 @@ public virtual bool ShouldLicenseCheck()
         /// <returns></returns>
         public virtual bool ApiEnabled()
         {
-            return _config.UseSimulatorsApi;
+            return true;
         }
 
         /// <summary>
@@ -192,20 +192,23 @@ protected async Task EnsureSimulatorIntegrationsExists(CancellationToken token)
                             new SimulatorQuery (),
                             token).ConfigureAwait(false);
                         var existingSimulator = existingSimulators.Items.FirstOrDefault(s => s.ExternalId == simulatorName);
+
                         if (existingSimulator == null)
                         {
                             _logger.LogWarning("Simulator {Simulator} not found in CDF", simulatorName);
                             throw new ConnectorException($"Simulator {simulatorName} not found in CDF");
                         }
+
                         var integrationToCreate = new SimulatorIntegrationCreate
                         {
                             ExternalId = connectorName,
                             SimulatorExternalId = simulatorName,
                             DataSetId = simulator.DataSetId,
-                            ConnectorVersion = GetConnectorVersion(),
-                            SimulatorVersion = GetSimulatorVersion(simulatorName),
-                            RunApiEnabled = ApiEnabled(),
+                            ConnectorVersion = GetConnectorVersion() ?? "N/A",
+                            SimulatorVersion = GetSimulatorVersion(simulatorName) ?? "N/A",
+                            RunApiEnabled = ApiEnabled()
                         };
+
                         var res = await simulatorsApi.CreateSimulatorIntegrationAsync(new List<SimulatorIntegrationCreate> {
                             integrationToCreate
                         }, token).ConfigureAwait(false);
@@ -245,8 +248,8 @@ protected async Task UpdateIntegrationRows(
                     var integrationUpdate = init ? new SimulatorIntegrationUpdate
                     {
                         DataSetId = new Update<long> { Set = simulator.DataSetId },
-                        ConnectorVersion = new Update<string> { Set = GetConnectorVersion() },
-                        SimulatorVersion = new Update<string> { Set = GetSimulatorVersion(simulator.Name) },
+                        ConnectorVersion = new Update<string> { Set = GetConnectorVersion() ?? "N/A" },
+                        SimulatorVersion = new Update<string> { Set = GetSimulatorVersion(simulator.Name) ?? "N/A" },
                         RunApiEnabled = new Update<bool> { Set = ApiEnabled() },
                         ConnectorStatus = new Update<string> { Set = "IDLE" },
                         ConnectorStatusUpdatedTime = new Update<long> { Set = DateTime.UtcNow.ToUnixTimeMilliseconds() },

diff --git a/version b/version
@@ -1 +1 @@
-1.0.0-alpha-017
+1.0.0-alpha-018