JBDS-4005 Use https redirects for cygwin-installer and oc origin cli

Author: dgolovin

browser/model/cdk.js

@@ -90,17 +90,8 @@ class CDKInstall extends InstallableItem {
 
     if(!fs.existsSync(path.join(this.downloadFolder, this.ocFileName))) {
       let ocWriteStream = fs.createWriteStream(this.ocDownloadedFile);
-      if(!this.ocUrl.endsWith('.zip')) {
-        request(this.ocUrl,(err,rsp,body) => {
-          var fname = body.match(/openshift-origin-client-tools-v\w(\.\w){1,2}-\w{1,3}-\w{8}-\w{7}-windows\.zip/)[0];
-          this.downloader.setWriteStream(ocWriteStream);
-          this.ocUrl=this.ocUrl.concat(fname);
-          this.downloader.download(this.ocUrl);
-        });
-      } else {
-        this.downloader.setWriteStream(ocWriteStream);
-        this.downloader.download(this.ocUrl);
-      }
+      this.downloader.setWriteStream(ocWriteStream);
+      this.downloader.download(this.ocUrl);
     } else {
       this.ocDownloadedFile = path.join(this.downloadFolder, this.ocFileName);
       this.downloader.closeHandler();

requirements.json

@@ -24,8 +24,8 @@
     "description": "The Open Source Container Application Platform",
     "bundle": "yes",
     "version": "1.2.0",
-    "url": "https://github.com/openshift/origin/releases/download/v1.2.0/openshift-origin-client-tools-v1.2.0-2e62fab-windows.zip",
-    "filename": "openshift-origin-client-tools-v1.1.6-ef1caba-windows.zip",
+    "url": "https://developers.redhat.com/redirect/to/oc-origin-cli-1.2.0.download",
+    "filename": "openshift-origin-client-tools-v1.2.0-2e62fab-windows.zip",
     "sha256sum": "3df3d7f31d5f50fa49f94312883107ebee1a0877b598eada32dce1b029f6c3f2",
     "vendor": "Red Hat, Inc."
   },
@@ -34,8 +34,8 @@
     "description": "A distribution of popular GNU and other Open Source tools running on Microsoft Windows",
     "bundle": "yes",
     "version": "2.5.2",
-    "url": "https://cygwin.com/setup-x86_64.exe",
-    "filename": "cygwin_2.5.1_0.297_5_3.exe",
+    "url": "https://developers.redhat.com/redirect/to/cygwin-installer-2.5.2.download",
+    "filename": "cygwin_2.5.2.exe",
     "sha256sum": "58f9f42f5dbd52c5e3ecd24e537603ee8897ea15176b7acdc34afcef83e5c19a",
     "vendor": "Community Project"
   },

test/check-requirements.js

@@ -17,7 +17,7 @@ function checkRequirements() {
   //to check if the url looks like it points to what it is supposed to
   fileNames['cdk.zip'] = 'cdk';
   fileNames['rhel-vagrant-virtualbox.box'] = 'rhel-cdk';
-  fileNames['oc.zip'] = 'origin-client-tools';
+  fileNames['oc.zip'] = 'oc-origin-cli';
   fileNames['cygwin.exe'] = 'cygwin';
   fileNames['jbds.jar'] = 'devstudio';
   fileNames['jdk.msi'] = 'openjdk';