Fix iotedge version passed instead of client version (#1955) (#1959)

Azure · Nov 19, 2019 · 4b335d2 · 4b335d2
1 parent 6b27f06
commit 4b335d2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/edge-util/src/Microsoft.Azure.Devices.Edge.Util/CertificateHelper.cs b/edge-util/src/Microsoft.Azure.Devices.Edge.Util/CertificateHelper.cs
@@ -252,7 +252,7 @@ public static IEnumerable<X509Certificate2> GetCertificatesFromPem(IEnumerable<s
 
         public static async Task<IEnumerable<X509Certificate2>> GetTrustBundleFromEdgelet(Uri workloadUri, string workloadApiVersion, string workloadClientApiVersion, string moduleId, string moduleGenerationId)
         {
-            string response = await new WorkloadClient(workloadUri, workloadClientApiVersion, workloadApiVersion, moduleId, moduleGenerationId).GetTrustBundleAsync();
+            string response = await new WorkloadClient(workloadUri, workloadApiVersion, workloadClientApiVersion, moduleId, moduleGenerationId).GetTrustBundleAsync();
             return ParseTrustedBundleCerts(response);
         }
 

diff --git a/edge-util/src/Microsoft.Azure.Devices.Edge.Util/edged/HttpHsmSignatureProvider.cs b/edge-util/src/Microsoft.Azure.Devices.Edge.Util/edged/HttpHsmSignatureProvider.cs
@@ -19,7 +19,7 @@ public HttpHsmSignatureProvider(string moduleId, string generationId, string pro
             Preconditions.CheckNonWhiteSpace(moduleId, nameof(moduleId));
             Preconditions.CheckNonWhiteSpace(generationId, nameof(generationId));
 
-            this.workloadClient = new WorkloadClient(new Uri(providerUri), clientApiVersion, apiVersion, moduleId, generationId);
+            this.workloadClient = new WorkloadClient(new Uri(providerUri), apiVersion, clientApiVersion, moduleId, generationId);
         }
 
         public Task<string> SignAsync(string data)

diff --git a/edge-util/src/Microsoft.Azure.Devices.Edge.Util/edged/WorkloadClient.cs b/edge-util/src/Microsoft.Azure.Devices.Edge.Util/edged/WorkloadClient.cs
@@ -52,7 +52,7 @@ ApiVersion GetSupportedVersion(string serverSupportedApiVersion, string clientSu
 
             if (clientVersion == ApiVersion.VersionUnknown)
             {
-                throw new InvalidOperationException("Client version is not supported.");
+                throw new InvalidOperationException($"Client version {clientSupportedApiVersion} is not supported.");
             }
 
             if (serverVersion == ApiVersion.VersionUnknown)