CI: Skip upload to S3 if credentials vars not set

These env vars are credentials to authenticate to S3.
If they're unset, we can't possibly upload to S3.
So we shouldn't try to.

Also, optimize boolean logic expression (ANDing products of ANDs
is equivalent to just ANDing all the base-level components directly.)

Author: DeeDeeG

script/vsts/upload-artifacts.js

@@ -64,7 +64,12 @@ async function uploadArtifacts() {
     return;
   }
 
-  if ( (process.env.ATOM_RELEASES_S3_KEY && process.env.ATOM_RELEASES_S3_KEY !== "$(ATOM_RELEASES_S3_KEY)") && (process.env.ATOM_RELEASES_S3_SECRET && process.env.ATOM_RELEASES_S3_SECRET !== "$(ATOM_RELEASES_S3_SECRET)") ) {
+  if (
+    process.env.ATOM_RELEASES_S3_KEY &&
+    process.env.ATOM_RELEASES_S3_KEY !== '$(ATOM_RELEASES_S3_KEY)' &&
+    process.env.ATOM_RELEASES_S3_SECRET &&
+    process.env.ATOM_RELEASES_S3_SECRET !== '$(ATOM_RELEASES_S3_SECRET)'
+  ) {
     console.log(
       `Uploading ${
         assets.length
@@ -85,18 +90,12 @@ async function uploadArtifacts() {
   }
 
   if (argv.linuxRepoName) {
-    if (skipUploadingTo.indexOf('packagecloud') === -1) {
-      await uploadLinuxPackages(
-        argv.linuxRepoName,
-        process.env.PACKAGE_CLOUD_API_KEY,
-        releaseVersion,
-        assets
-      );
-    } else {
-      console.log(
-        '\nEnvironment variable "SKIP_UPLOADING_TO" contains "packagecloud", skipping Linux package upload.'
-      );
-    }
+    await uploadLinuxPackages(
+      argv.linuxRepoName,
+      process.env.PACKAGE_CLOUD_API_KEY,
+      releaseVersion,
+      assets
+    );
   } else {
     console.log(
       '\nNo Linux package repo name specified, skipping Linux package upload.'

script/vsts/upload-crash-reports.js

@@ -17,10 +17,6 @@ const argv = yargs
   )
   .wrap(yargs.terminalWidth()).argv;
 
-// Compose an array of services to skip uploading to,
-// from environment variable SKIP_UPLOADING_TO (must be a comma-separated list)
-const skipUploadingTo = process.env.SKIP_UPLOADING_TO.split(',');
-
 async function uploadCrashReports() {
   const crashesPath = argv.crashReportPath;
   const crashes = glob.sync('/*.dmp', { root: crashesPath });
@@ -44,7 +40,12 @@ async function uploadCrashReports() {
   }
 }
 
-if (skipUploadingTo.indexOf('s3') === -1) {
+if (
+  process.env.ATOM_RELEASES_S3_KEY &&
+  process.env.ATOM_RELEASES_S3_KEY !== '$(ATOM_RELEASES_S3_KEY)' &&
+  process.env.ATOM_RELEASES_S3_SECRET &&
+  process.env.ATOM_RELEASES_S3_SECRET !== '$(ATOM_RELEASES_S3_SECRET)'
+) {
   // Wrap the call the async function and catch errors from its promise because
   // Node.js doesn't yet allow use of await at the script scope
   uploadCrashReports().catch(err => {
@@ -53,6 +54,6 @@ if (skipUploadingTo.indexOf('s3') === -1) {
   });
 } else {
   console.log(
-    '\nEnvironment variable "SKIP_UPLOADING_TO" contains "s3", skipping crash report uploads to S3.'
+    '\n\nEnvironment variables "ATOM_RELEASES_S3_KEY" and/or "ATOM_RELEASES_S3_SECRET" are not set, skipping S3 upload.'
   );
 }