Replace Bintray repo with Cloudsmith (#48)

josesimoes · web-flow · commit b9ddf421010c · 2021-03-24T13:45:35.000Z
diff --git a/nanoFirmwareFlasher/CC13x26x2Firmware.cs b/nanoFirmwareFlasher/CC13x26x2Firmware.cs
@@ -9,7 +9,7 @@
 namespace nanoFramework.Tools.FirmwareFlasher
 {
     /// <summary>
-    /// Class that handles the download of STM32 firmware files from Bintray.
+    /// Class that handles the download of STM32 firmware files from Cloudsmith.
     /// </summary>
     internal class CC13x26x2Firmware : FirmwarePackage
     {
diff --git a/nanoFirmwareFlasher/CloudsmithPackageInfo.cs b/nanoFirmwareFlasher/CloudsmithPackageInfo.cs
@@ -9,9 +9,12 @@
 namespace nanoFramework.Tools.FirmwareFlasher
 {
     [Serializable]
-    internal class BintrayPackageInfo
+    internal class CloudsmithPackageInfo
     {
-        [JsonProperty("latest_version")]
-        public string LatestVersion { get; set; }
+        [JsonProperty("version")]
+        public string Version { get; set; }
+        
+        [JsonProperty("cdn_url")]
+        public string DownloadUrl { get; set; }
     }
 }
diff --git a/nanoFirmwareFlasher/Esp32Firmware.cs b/nanoFirmwareFlasher/Esp32Firmware.cs
@@ -12,7 +12,7 @@
 namespace nanoFramework.Tools.FirmwareFlasher
 {
     /// <summary>
-    /// Class that handles the download of ESP32 firmware files from Bintray.
+    /// Class that handles the download of ESP32 firmware files from Cloudsmith.
     /// </summary>
     internal class Esp32Firmware : FirmwarePackage
     {
diff --git a/nanoFirmwareFlasher/ExitCodes.cs b/nanoFirmwareFlasher/ExitCodes.cs
@@ -202,9 +202,9 @@ public enum ExitCodes : int
         E9004 = 9004,
 
         /// <summary>
-        /// Can't find the target in the Bintray repository.
+        /// Can't find the target in Cloudsmith repository.
         /// </summary>
-        [Display(Name = "Can't find the target in the Bintray repository.")]
+        [Display(Name = "Can't find the target in Cloudsmith repository.")]
         E9005 = 9005,
 
         /// <summary>
diff --git a/nanoFirmwareFlasher/FirmwarePackage.cs b/nanoFirmwareFlasher/FirmwarePackage.cs
@@ -5,27 +5,28 @@
 
 using Newtonsoft.Json;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Text.RegularExpressions;
+using System.Web;
 
 namespace nanoFramework.Tools.FirmwareFlasher
 {
     /// <summary>
-    /// Abstract base class that handles the download and extraction of firmware file from Bintray.
+    /// Abstract base class that handles the download and extraction of firmware file from Cloudsmith.
     /// </summary>
     internal abstract class FirmwarePackage : IDisposable
     {
         // HttpClient is intended to be instantiated once per application, rather than per-use.
-        static HttpClient _bintrayClient = new HttpClient();
+        static HttpClient _cloudsmithClient = new HttpClient();
 
         /// <summary>
-        /// Uri of Bintray API
+        /// Uri of Cloudsmith API
         /// </summary>
-        internal const string _bintrayApiPackages = "https://api.bintray.com/packages/nfbot";
+        internal const string _cloudsmithPackages = "https://api.cloudsmith.io/v1/packages/net-nanoframework";
 
         internal const string _refTargetsDevRepo = "nanoframework-images-dev";
         internal const string _refTargetsStableRepo = "nanoframework-images";
@@ -68,9 +69,17 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()
         {
             string fwFileName = null;
 
+            // query URL
+            // https://api.cloudsmith.io/v1/packages/net-nanoframework/REPO-NAME-HERE/?page=1&query=/PACKAGE-NAME-HERE latest
+
+            // download URL
+            // https://dl.cloudsmith.io/public/net-nanoframework/REPO-NAME-HERE/raw/names/PACKAGE-NAME-HERE/versions/VERSION-HERE/ST_STM32F429I_DISCOVERY-1.6.2-preview.9.zip
+
             // reference targets
             var repoName = _stable ? _refTargetsStableRepo : _refTargetsDevRepo;
-            string requestUri = $"{_bintrayApiPackages}/{repoName}/{_targetName}";
+            string requestUri = $"{_cloudsmithPackages}/{repoName}/?page=1&query={_targetName} latest";
+
+            string downloadUrl = string.Empty;
 
             // flag to signal if the work-flow step was successful
             bool stepSuccesful = false;
@@ -134,9 +143,12 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()
                         Console.Write($"Trying to find {_targetName} in {(_stable ? "stable" : "developement")} repository...");
                     }
 
-                    HttpResponseMessage response = await _bintrayClient.GetAsync(requestUri);
+                    HttpResponseMessage response = await _cloudsmithClient.GetAsync(requestUri);
 
-                    if (response.StatusCode == HttpStatusCode.NotFound)
+                    var responseBody = await response.Content.ReadAsStringAsync();
+
+                    // check for empty array 
+                    if (responseBody == "[]")
                     {
                         if (Verbosity >= VerbosityLevel.Normal)
                         {
@@ -145,12 +157,12 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()
                         }
 
                         // try with community targets
-                        requestUri = $"{_bintrayApiPackages}/{_communityTargetsepo}/{_targetName}";
+                        requestUri = $"{_cloudsmithPackages}/{_communityTargetsepo}/?page=1&query={_targetName} latest";
                         repoName = _communityTargetsepo;
 
-                        response = await _bintrayClient.GetAsync(requestUri);
+                        response = await _cloudsmithClient.GetAsync(requestUri);
 
-                        if (response.StatusCode == HttpStatusCode.NotFound)
+                        if (responseBody == "[]")
                         {
                             if (Verbosity >= VerbosityLevel.Normal)
                             {
@@ -167,24 +179,26 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()
                         Console.WriteLine($"OK");
                     }
 
-                    // read and parse response
-                    string responseBody = await response.Content.ReadAsStringAsync();
-                    BintrayPackageInfo packageInfo = JsonConvert.DeserializeObject<BintrayPackageInfo>(responseBody);
+                    // parse response
+                    List<CloudsmithPackageInfo> packageInfo = JsonConvert.DeserializeObject<List<CloudsmithPackageInfo>>(responseBody);
 
                     // if no specific version was requested, use latest available
                     if (string.IsNullOrEmpty(_fwVersion))
                     {
-                        _fwVersion = packageInfo.LatestVersion;
+                        _fwVersion = packageInfo.ElementAt(0).Version;
                     }
 
+                    // grab download URL
+                    downloadUrl = packageInfo.ElementAt(0).DownloadUrl;
+
                     // set exposed property
                     Version = _fwVersion;
 
                     stepSuccesful = true;
                 }
                 catch
                 {
-                    // exception with download, assuming it's something with network connection or Bintray API
+                    // exception with download, assuming it's something with network connection or Cloudsmith API
                 }
             }
 
@@ -222,9 +236,7 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()
                     try
                     {
                         // setup and perform download request
-                        requestUri = $"https://dl.bintray.com/nfbot/{repoName}/{fwFileName}";
-
-                        using (var fwFileResponse = await _bintrayClient.GetAsync(requestUri))
+                        using (var fwFileResponse = await _cloudsmithClient.GetAsync(downloadUrl))
                         {
                             if (fwFileResponse.IsSuccessStatusCode)
                             {
@@ -253,7 +265,7 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()
                     }
                     catch
                     {
-                        // exception with download, assuming it's something with network connection or Bintray API
+                        // exception with download, assuming it's something with network connection or Cloudsmith API
                     }
                 }
                 else
diff --git a/nanoFirmwareFlasher/Options.cs b/nanoFirmwareFlasher/Options.cs
@@ -120,7 +120,7 @@ public class Options
             "target",
             Required = false,
             Default = null,
-           HelpText = "Target name. This is the target name used in the GitHub and Bintray repositories.")]
+           HelpText = "Target name. This is the target name used in the GitHub and Cloudsmith repositories.")]
         public string TargetName { get; set; }
 
         [Option(
diff --git a/nanoFirmwareFlasher/Program.cs b/nanoFirmwareFlasher/Program.cs
@@ -168,7 +168,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
                 else
                 {
                     // other supported platforms will go here
-                    // in case a wacky target is entered by the user, the package name will be checked against Bintray repo
+                    // in case a wacky target is entered by the user, the package name will be checked against Cloudsmith repo
                 }
             }
 
@@ -587,7 +587,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
                     // update operation requested?
                     if (o.Update)
                     {
-                        // this to update the device with fw from Bintray
+                        // this to update the device with fw from Cloudsmith
 
                         // need to take care of flash address
                         string appFlashAddress = null;
@@ -681,7 +681,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
                     // update operation requested?
                     if (o.Update)
                     {
-                        // this to update the device with fw from Bintray
+                        // this to update the device with fw from Cloudsmith
 
                         // need to take care of flash address
                         string appFlashAddress = null;
diff --git a/nanoFirmwareFlasher/Stm32Firmware.cs b/nanoFirmwareFlasher/Stm32Firmware.cs
@@ -11,7 +11,7 @@
 namespace nanoFramework.Tools.FirmwareFlasher
 {
     /// <summary>
-    /// Class that handles the download of STM32 firmware files from Bintray.
+    /// Class that handles the download of STM32 firmware files from Cloudsmith.
     /// </summary>
     internal class Stm32Firmware : FirmwarePackage
     {
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.18.0-preview.{height}",
+  "version": "1.19.0-preview.{height}",
   "assemblyVersion": {
     "precision": "revision"
   },

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`namespace nanoFramework.Tools.FirmwareFlasher`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`		`- /// Class that handles the download of STM32 firmware files from Bintray.`
	`12`	`+ /// Class that handles the download of STM32 firmware files from Cloudsmith.`
`13`	`13`	`/// </summary>`
`14`	`14`	`internal class CC13x26x2Firmware : FirmwarePackage`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,12 @@`
`9`	`9`	`namespace nanoFramework.Tools.FirmwareFlasher`
`10`	`10`	`{`
`11`	`11`	`[Serializable]`
`12`		`- internal class BintrayPackageInfo`
	`12`	`+ internal class CloudsmithPackageInfo`
`13`	`13`	`{`
`14`		`- [JsonProperty("latest_version")]`
`15`		`- public string LatestVersion { get; set; }`
	`14`	`+ [JsonProperty("version")]`
	`15`	`+ public string Version { get; set; }`
	`16`	`+`
	`17`	`+ [JsonProperty("cdn_url")]`
	`18`	`+ public string DownloadUrl { get; set; }`
`16`	`19`	`}`
`17`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespace nanoFramework.Tools.FirmwareFlasher`
`13`	`13`	`{`
`14`	`14`	`/// <summary>`
`15`		`- /// Class that handles the download of ESP32 firmware files from Bintray.`
	`15`	`+ /// Class that handles the download of ESP32 firmware files from Cloudsmith.`
`16`	`16`	`/// </summary>`
`17`	`17`	`internal class Esp32Firmware : FirmwarePackage`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,27 +5,28 @@`
`5`	`5`
`6`	`6`	`using Newtonsoft.Json;`
`7`	`7`	`using System;`
	`8`	`+using System.Collections.Generic;`
`8`	`9`	`using System.IO;`
`9`	`10`	`using System.IO.Compression;`
`10`	`11`	`using System.Linq;`
`11`		`-using System.Net;`
`12`	`12`	`using System.Net.Http;`
`13`	`13`	`using System.Text.RegularExpressions;`
	`14`	`+using System.Web;`
`14`	`15`
`15`	`16`	`namespace nanoFramework.Tools.FirmwareFlasher`
`16`	`17`	`{`
`17`	`18`	`/// <summary>`
`18`		`- /// Abstract base class that handles the download and extraction of firmware file from Bintray.`
	`19`	`+ /// Abstract base class that handles the download and extraction of firmware file from Cloudsmith.`
`19`	`20`	`/// </summary>`
`20`	`21`	`internal abstract class FirmwarePackage : IDisposable`
`21`	`22`	`{`
`22`	`23`	`// HttpClient is intended to be instantiated once per application, rather than per-use.`
`23`		`- static HttpClient _bintrayClient = new HttpClient();`
	`24`	`+ static HttpClient _cloudsmithClient = new HttpClient();`
`24`	`25`
`25`	`26`	`/// <summary>`
`26`		`- /// Uri of Bintray API`
	`27`	`+ /// Uri of Cloudsmith API`
`27`	`28`	`/// </summary>`
`28`		`- internal const string _bintrayApiPackages = "https://api.bintray.com/packages/nfbot";`
	`29`	`+ internal const string _cloudsmithPackages = "https://api.cloudsmith.io/v1/packages/net-nanoframework";`
`29`	`30`
`30`	`31`	`internal const string _refTargetsDevRepo = "nanoframework-images-dev";`
`31`	`32`	`internal const string _refTargetsStableRepo = "nanoframework-images";`
`@@ -68,9 +69,17 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()`
`68`	`69`	`{`
`69`	`70`	`string fwFileName = null;`
`70`	`71`
	`72`	`+ // query URL`
	`73`	`+ // https://api.cloudsmith.io/v1/packages/net-nanoframework/REPO-NAME-HERE/?page=1&query=/PACKAGE-NAME-HERE latest`
	`74`	`+`
	`75`	`+ // download URL`
	`76`	`+ // https://dl.cloudsmith.io/public/net-nanoframework/REPO-NAME-HERE/raw/names/PACKAGE-NAME-HERE/versions/VERSION-HERE/ST_STM32F429I_DISCOVERY-1.6.2-preview.9.zip`
	`77`	`+`
`71`	`78`	`// reference targets`
`72`	`79`	`var repoName = _stable ? _refTargetsStableRepo : _refTargetsDevRepo;`
`73`		`- string requestUri = $"{_bintrayApiPackages}/{repoName}/{_targetName}";`
	`80`	`+ string requestUri = $"{_cloudsmithPackages}/{repoName}/?page=1&query={_targetName} latest";`
	`81`	`+`
	`82`	`+ string downloadUrl = string.Empty;`
`74`	`83`
`75`	`84`	`// flag to signal if the work-flow step was successful`
`76`	`85`	`bool stepSuccesful = false;`
`@@ -134,9 +143,12 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()`
`134`	`143`	`Console.Write($"Trying to find {_targetName} in {(_stable ? "stable" : "developement")} repository...");`
`135`	`144`	`}`
`136`	`145`
`137`		`- HttpResponseMessage response = await _bintrayClient.GetAsync(requestUri);`
	`146`	`+ HttpResponseMessage response = await _cloudsmithClient.GetAsync(requestUri);`
`138`	`147`
`139`		`- if (response.StatusCode == HttpStatusCode.NotFound)`
	`148`	`+ var responseBody = await response.Content.ReadAsStringAsync();`
	`149`	`+`
	`150`	`+ // check for empty array`
	`151`	`+ if (responseBody == "[]")`
`140`	`152`	`{`
`141`	`153`	`if (Verbosity >= VerbosityLevel.Normal)`
`142`	`154`	`{`
`@@ -145,12 +157,12 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()`
`145`	`157`	`}`
`146`	`158`
`147`	`159`	`// try with community targets`
`148`		`- requestUri = $"{_bintrayApiPackages}/{_communityTargetsepo}/{_targetName}";`
	`160`	`+ requestUri = $"{_cloudsmithPackages}/{_communityTargetsepo}/?page=1&query={_targetName} latest";`
`149`	`161`	`repoName = _communityTargetsepo;`
`150`	`162`
`151`		`- response = await _bintrayClient.GetAsync(requestUri);`
	`163`	`+ response = await _cloudsmithClient.GetAsync(requestUri);`
`152`	`164`
`153`		`- if (response.StatusCode == HttpStatusCode.NotFound)`
	`165`	`+ if (responseBody == "[]")`
`154`	`166`	`{`
`155`	`167`	`if (Verbosity >= VerbosityLevel.Normal)`
`156`	`168`	`{`
`@@ -167,24 +179,26 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()`
`167`	`179`	`Console.WriteLine($"OK");`
`168`	`180`	`}`
`169`	`181`
`170`		`- // read and parse response`
`171`		`- string responseBody = await response.Content.ReadAsStringAsync();`
`172`		`- BintrayPackageInfo packageInfo = JsonConvert.DeserializeObject<BintrayPackageInfo>(responseBody);`
	`182`	`+ // parse response`
	`183`	`+ List<CloudsmithPackageInfo> packageInfo = JsonConvert.DeserializeObject<List<CloudsmithPackageInfo>>(responseBody);`
`173`	`184`
`174`	`185`	`// if no specific version was requested, use latest available`
`175`	`186`	`if (string.IsNullOrEmpty(_fwVersion))`
`176`	`187`	`{`
`177`		`- _fwVersion = packageInfo.LatestVersion;`
	`188`	`+ _fwVersion = packageInfo.ElementAt(0).Version;`
`178`	`189`	`}`
`179`	`190`
	`191`	`+ // grab download URL`
	`192`	`+ downloadUrl = packageInfo.ElementAt(0).DownloadUrl;`
	`193`	`+`
`180`	`194`	`// set exposed property`
`181`	`195`	`Version = _fwVersion;`
`182`	`196`
`183`	`197`	`stepSuccesful = true;`
`184`	`198`	`}`
`185`	`199`	`catch`
`186`	`200`	`{`
`187`		`- // exception with download, assuming it's something with network connection or Bintray API`
	`201`	`+ // exception with download, assuming it's something with network connection or Cloudsmith API`
`188`	`202`	`}`
`189`	`203`	`}`
`190`	`204`
`@@ -222,9 +236,7 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()`
`222`	`236`	`try`
`223`	`237`	`{`
`224`	`238`	`// setup and perform download request`
`225`		`- requestUri = $"https://dl.bintray.com/nfbot/{repoName}/{fwFileName}";`
`226`		`-`
`227`		`- using (var fwFileResponse = await _bintrayClient.GetAsync(requestUri))`
	`239`	`+ using (var fwFileResponse = await _cloudsmithClient.GetAsync(downloadUrl))`
`228`	`240`	`{`
`229`	`241`	`if (fwFileResponse.IsSuccessStatusCode)`
`230`	`242`	`{`
`@@ -253,7 +265,7 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()`
`253`	`265`	`}`
`254`	`266`	`catch`
`255`	`267`	`{`
`256`		`- // exception with download, assuming it's something with network connection or Bintray API`
	`268`	`+ // exception with download, assuming it's something with network connection or Cloudsmith API`
`257`	`269`	`}`
`258`	`270`	`}`
`259`	`271`	`else`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)`
`168`	`168`	`else`
`169`	`169`	`{`
`170`	`170`	`// other supported platforms will go here`
`171`		`- // in case a wacky target is entered by the user, the package name will be checked against Bintray repo`
	`171`	`+ // in case a wacky target is entered by the user, the package name will be checked against Cloudsmith repo`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
`@@ -587,7 +587,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)`
`587`	`587`	`// update operation requested?`
`588`	`588`	`if (o.Update)`
`589`	`589`	`{`
`590`		`- // this to update the device with fw from Bintray`
	`590`	`+ // this to update the device with fw from Cloudsmith`
`591`	`591`
`592`	`592`	`// need to take care of flash address`
`593`	`593`	`string appFlashAddress = null;`
`@@ -681,7 +681,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)`
`681`	`681`	`// update operation requested?`
`682`	`682`	`if (o.Update)`
`683`	`683`	`{`
`684`		`- // this to update the device with fw from Bintray`
	`684`	`+ // this to update the device with fw from Cloudsmith`
`685`	`685`
`686`	`686`	`// need to take care of flash address`
`687`	`687`	`string appFlashAddress = null;`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`namespace nanoFramework.Tools.FirmwareFlasher`
`12`	`12`	`{`
`13`	`13`	`/// <summary>`
`14`		`- /// Class that handles the download of STM32 firmware files from Bintray.`
	`14`	`+ /// Class that handles the download of STM32 firmware files from Cloudsmith.`
`15`	`15`	`/// </summary>`
`16`	`16`	`internal class Stm32Firmware : FirmwarePackage`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "1.18.0-preview.{height}",`
	`3`	`+ "version": "1.19.0-preview.{height}",`
`4`	`4`	`"assemblyVersion": {`
`5`	`5`	`"precision": "revision"`
`6`	`6`	`},`