Merge pull request #53 from lriccardo/master

Add internal sharing download url to outputs and env

README.md

@@ -72,9 +72,21 @@ The mapping.txt file used to de-obfuscate your stack traces from crash reports
 
 ## Outputs
 
+### `releaseName`
+
+The name of the release published to Google Play, which is generated on commit by default
+
+### `internalSharingDownloadUrls`
+
+A JSON list containing the download urls for every release file uploaded using the `track` `internalsharing`
+
+### ENV VAR: `INTERNAL_SHARING_DOWNLOAD_URLS`
+
+The environment variable that is set when using the `track` `internalsharing`
+
 ### `internalSharingDownloadUrl`
 
-The download url for an app that was uploaded using the `track` `internalsharing`
+The download url for the last release file uploaded using the `track` `internalsharing`, useful when a single release file is uploaded
 
 ### ENV VAR: `INTERNAL_SHARING_DOWNLOAD_URL`
 

lib/edits.js

@@ -40,38 +40,61 @@ function uploadToPlayStore(options, releaseFiles) {
         // Check the 'track' for 'internalsharing', if so switch to a non-track api
         if (options.track === 'internalsharing') {
             core.debug("Track is Internal app sharing, switch to special upload api");
+            let downloadUrls = []
             for (const releaseFile of releaseFiles) {
                 core.debug(`Uploading ${releaseFile}`);
-                yield uploadInternalSharingRelease(options, releaseFile).catch(reason => {
-                    core.setFailed(reason);
-                    return Promise.reject(reason);
-                });
+                yield uploadInternalSharingRelease(options, releaseFile)
+                    .then(downloadUrl => {
+                        downloadUrls.push(downloadUrl)
+                    })
+                    .catch(reason => {
+                        core.setFailed(reason);
+                        return Promise.reject(reason);
+                    });
             }
+            core.setOutput("internalSharingDownloadUrls", downloadUrls);
+            core.exportVariable("INTERNAL_SHARING_DOWNLOAD_URLS", downloadUrls);
         }
         else {
             // Create a new Edit
+            core.info(`Creating a new Edit for this release`);
             const appEdit = yield androidPublisher.edits.insert({
                 auth: options.auth,
                 packageName: options.applicationId
             });
             // Validate the given track
+            core.info(`Validating track '${options.track}'`);
             yield validateSelectedTrack(appEdit.data, options).catch(reason => {
                 core.setFailed(reason);
                 return Promise.reject(reason);
             });
             // Upload artifacts to Google Play, and store their version codes
-            var versionCodes = new Array();
+            const versionCodes = new Array();
             for (const releaseFile of releaseFiles) {
-                core.debug(`Uploading ${releaseFile}`);
+                core.info(`Uploading ${releaseFile}`);
                 const versionCode = yield uploadRelease(appEdit.data, options, releaseFile).catch(reason => {
                     core.setFailed(reason);
                     return Promise.reject(reason);
                 });
                 versionCodes.push(versionCode);
             }
+            core.info(`Successfully uploaded ${versionCodes.length} artifacts`);
             // Add the uploaded artifacts to the Edit track
+            core.info(`Adding ${versionCodes.length} artifacts to release on '${options.track}' track`);
             const track = yield addReleasesToTrack(appEdit.data, options, versionCodes);
+            core.debug(`Track: ${track}`);
+            // Extract the release name for the response
+            let trackReleaseName;
+            if (track.releases && track.releases.length > 0) {
+                const trackRelease = track.releases[0];
+                trackReleaseName = trackRelease.name;
+                core.debug(`Pulled track release name from update: ${trackReleaseName}`);
+            }
+            else {
+                core.debug(`Didn't find any releases on the track`);
+            }
             // Commit the pending Edit
+            core.info(`Committing the Edit`);
             const res = yield androidPublisher.edits.commit({
                 auth: options.auth,
                 editId: appEdit.data.id,
@@ -80,7 +103,14 @@ function uploadToPlayStore(options, releaseFiles) {
             // Simple check to see whether commit was successful
             if (res.data.id != null) {
                 core.debug(`Successfully committed ${res.data.id}`);
-                core.setOutput("releaseName", getPublishedReleaseName(res.data, options));
+                const name = options.name || trackReleaseName;
+                core.info(`Successfully committed release ${name}`);
+                if (name) {
+                    core.setOutput("releaseName", name);
+                }
+                else {
+                    core.debug("Unable to set 'releaseName' output.");
+                }
                 return Promise.resolve(res.data.id);
             }
             else {
@@ -95,11 +125,15 @@ function uploadInternalSharingRelease(options, releaseFile) {
     return __awaiter(this, void 0, void 0, function* () {
         if (releaseFile.endsWith('.apk')) {
             const res = yield internalSharingUploadApk(options, releaseFile);
+            core.setOutput("internalSharingDownloadUrl", res.downloadUrl);
+            core.exportVariable("INTERNAL_SHARING_DOWNLOAD_URL", res.downloadUrl);
             console.log(`${releaseFile} uploaded to Internal Sharing, download it with ${res.downloadUrl}`);
             return Promise.resolve(res.downloadUrl);
         }
         else if (releaseFile.endsWith('.aab')) {
             const res = yield internalSharingUploadBundle(options, releaseFile);
+            core.setOutput("internalSharingDownloadUrl", res.downloadUrl);
+            core.exportVariable("INTERNAL_SHARING_DOWNLOAD_URL", res.downloadUrl);
             console.log(`${releaseFile} uploaded to Internal Sharing, download it with ${res.downloadUrl}`);
             return Promise.resolve(res.downloadUrl);
         }
@@ -250,13 +284,3 @@ function uploadBundle(appEdit, options, bundleReleaseFile) {
         return res.data;
     });
 }
-function getPublishedReleaseName(appEdit, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const track = yield androidPublisher.edits.tracks.get({
-            editId: appEdit.id,
-            track: options.track
-        });
-        const release = track.data.releases[0]; // We only ever create one release, so grab the first one
-        return release.name;
-    });
-}

lib/main.js

@@ -128,7 +128,7 @@ function run() {
                 return;
             }
             const authClient = yield auth.getClient();
-            yield edits_1.uploadToPlayStore({
+            const result = yield edits_1.uploadToPlayStore({
                 auth: authClient,
                 applicationId: packageName,
                 track: track,
@@ -138,7 +138,7 @@ function run() {
                 mappingFile: mappingFile,
                 name: releaseName
             }, validatedReleaseFiles);
-            console.log(`Finished uploading to the Play Store`);
+            console.log(`Finished uploading to the Play Store: ${result}`);
         }
         catch (error) {
             core.setFailed(error.message);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "upload-google-play",
-  "version": "1.0.6",
+  "version": "1.0.10",
   "private": true,
   "description": "Upload an Android release (.apk or .aab) to Google Play Console",
   "main": "lib/main.js",

src/edits.ts

@@ -33,41 +33,64 @@ export async function uploadToPlayStore(options: EditOptions, releaseFiles: stri
     // Check the 'track' for 'internalsharing', if so switch to a non-track api
     if (options.track === 'internalsharing') {
         core.debug("Track is Internal app sharing, switch to special upload api")
+        let downloadUrls: string[] = []
         for (const releaseFile of releaseFiles) {
             core.debug(`Uploading ${releaseFile}`);
-            await uploadInternalSharingRelease(options, releaseFile).catch(reason => {
-                core.setFailed(reason);
-                return Promise.reject(reason);
-            });
+            await uploadInternalSharingRelease(options, releaseFile)
+                .then(downloadUrl => {
+                    downloadUrls.push(downloadUrl as string)
+                })
+                .catch(reason => {
+                    core.setFailed(reason);
+                    return Promise.reject(reason);
+                });
         }
+        core.setOutput("internalSharingDownloadUrls", downloadUrls);
+        core.exportVariable("INTERNAL_SHARING_DOWNLOAD_URLS", downloadUrls);
     } else {
         // Create a new Edit
+        core.info(`Creating a new Edit for this release`)
         const appEdit = await androidPublisher.edits.insert({
             auth: options.auth,
             packageName: options.applicationId
         });
 
         // Validate the given track
+        core.info(`Validating track '${options.track}'`)
         await validateSelectedTrack(appEdit.data, options).catch(reason => {
             core.setFailed(reason);
             return Promise.reject(reason);
         });
 
         // Upload artifacts to Google Play, and store their version codes
-        var versionCodes = new Array<number>();
+        const versionCodes = new Array<number>();
         for (const releaseFile of releaseFiles) {
-            core.debug(`Uploading ${releaseFile}`);
+            core.info(`Uploading ${releaseFile}`);
             const versionCode = await uploadRelease(appEdit.data, options, releaseFile).catch(reason => {
                 core.setFailed(reason);
                 return Promise.reject(reason);
             });
             versionCodes.push(versionCode!);
         }
+        core.info(`Successfully uploaded ${versionCodes.length} artifacts`)
 
         // Add the uploaded artifacts to the Edit track
+        core.info(`Adding ${versionCodes.length} artifacts to release on '${options.track}' track`)
         const track = await addReleasesToTrack(appEdit.data, options, versionCodes);
+        core.debug(`Track: ${track}`);
+
+        // Extract the release name for the response
+        let trackReleaseName: string | undefined | null;
+        if (track.releases && track.releases.length > 0) {
+            const trackRelease = track.releases[0];
+            trackReleaseName = trackRelease.name;
+            core.debug(`Pulled track release name from update: ${trackReleaseName}`)
+        } else {
+            core.debug(`Didn't find any releases on the track`)
+        }
 
         // Commit the pending Edit
+        core.info(`Committing the Edit`)
         const res = await androidPublisher.edits.commit({
             auth: options.auth,
             editId: appEdit.data.id!,
@@ -77,7 +100,13 @@ export async function uploadToPlayStore(options: EditOptions, releaseFiles: stri
         // Simple check to see whether commit was successful
         if (res.data.id != null) {
             core.debug(`Successfully committed ${res.data.id}`);
-            core.setOutput("releaseName", getPublishedReleaseName(res.data, options))
+            const name = options.name || trackReleaseName;
+            core.info(`Successfully committed release ${name}`)
+            if (name) {
+                core.setOutput("releaseName", name);
+            } else {
+                core.debug("Unable to set 'releaseName' output.");
+            }
             return Promise.resolve(res.data.id!);
         } else {
             core.setFailed(`Error ${res.status}: ${res.statusText}`);
@@ -89,10 +118,14 @@ export async function uploadToPlayStore(options: EditOptions, releaseFiles: stri
 async function uploadInternalSharingRelease(options: EditOptions, releaseFile: string): Promise<string | undefined | null> {
     if (releaseFile.endsWith('.apk')) {
         const res = await internalSharingUploadApk(options, releaseFile)
+        core.setOutput("internalSharingDownloadUrl", res.downloadUrl);
+        core.exportVariable("INTERNAL_SHARING_DOWNLOAD_URL", res.downloadUrl);
         console.log(`${releaseFile} uploaded to Internal Sharing, download it with ${res.downloadUrl}`)
         return Promise.resolve(res.downloadUrl)
     } else if (releaseFile.endsWith('.aab')) {
         const res = await internalSharingUploadBundle(options, releaseFile)
+        core.setOutput("internalSharingDownloadUrl", res.downloadUrl);
+        core.exportVariable("INTERNAL_SHARING_DOWNLOAD_URL", res.downloadUrl);
         console.log(`${releaseFile} uploaded to Internal Sharing, download it with ${res.downloadUrl}`)
         return Promise.resolve(res.downloadUrl)
     } else {
@@ -238,13 +271,4 @@ async function uploadBundle(appEdit: AppEdit, options: EditOptions, bundleReleas
     });
 
     return res.data
-}
-
-async function getPublishedReleaseName(appEdit: AppEdit, options: EditOptions): Promise<String | null | undefined> {
-    const track = await androidPublisher.edits.tracks.get({
-        editId: appEdit.id!,
-        track: options.track
-    })
-    const release = track.data.releases![0] // We only ever create one release, so grab the first one
-    return release.name
 }

src/main.ts

@@ -106,7 +106,7 @@ async function run() {
 
         const authClient = await auth.getClient();
 
-        await uploadToPlayStore({
+        const result = await uploadToPlayStore({
             auth: authClient,
             applicationId: packageName,
             track: track,
@@ -117,7 +117,7 @@ async function run() {
             name: releaseName
         }, validatedReleaseFiles);
 
-        console.log(`Finished uploading to the Play Store`)
+        console.log(`Finished uploading to the Play Store: ${result}`)
     } catch (error) {
         core.setFailed(error.message)
     }