Merge pull request #126 from yacaovsnc/main

yacaovsnc · web-flow · commit 604e071d2190 · 2020-09-18T16:57:13.000-04:00
Add an option to specify retention period for artifacts
diff --git a/action.yml b/action.yml
@@ -17,6 +17,12 @@ inputs:
         error: Fail the action with an error message
         ignore: Do not output any warnings or errors, the action does not fail
     default: 'warn'
+  retention-days:
+    description: >
+      Duration after which artifact will expire in days. 0 means using default retention.
+
+      Minimum 1 day.
+      Maximum 90 days unless changed from the repository settings page.
 runs:
   using: 'node12'
-  main: 'dist/index.js'
+  main: 'dist/index.js'
diff --git a/dist/index.js b/dist/index.js
@@ -3767,7 +3767,7 @@ class DefaultArtifactClient {
             }
             else {
                 // Create an entry for the artifact in the file container
-                const response = yield uploadHttpClient.createArtifactInFileContainer(name);
+                const response = yield uploadHttpClient.createArtifactInFileContainer(name, options);
                 if (!response.fileContainerResourceUrl) {
                     core.debug(response.toString());
                     throw new Error('No URL provided by the Artifact Service to upload an artifact to');
@@ -4019,6 +4019,9 @@ function run() {
                 const options = {
                     continueOnError: false
                 };
+                if (inputs.retentionDays) {
+                    options.retentionDays = inputs.retentionDays;
+                }
                 const uploadResponse = yield artifactClient.uploadArtifact(inputs.artifactName, searchResult.filesToUpload, searchResult.rootDirectory, options);
                 if (uploadResponse.failedItems.length > 0) {
                     core.setFailed(`An error was encountered when uploading ${uploadResponse.artifactName}. There were ${uploadResponse.failedItems.length} items that failed to upload.`);
@@ -4108,6 +4111,10 @@ function getWorkSpaceDirectory() {
     return workspaceDirectory;
 }
 exports.getWorkSpaceDirectory = getWorkSpaceDirectory;
+function getRetentionDays() {
+    return process.env['GITHUB_RETENTION_DAYS'];
+}
+exports.getRetentionDays = getRetentionDays;
 //# sourceMappingURL=config-variables.js.map
 
 /***/ }),
@@ -6390,11 +6397,19 @@ function getInputs() {
     if (!noFileBehavior) {
         core.setFailed(`Unrecognized ${constants_1.Inputs.IfNoFilesFound} input. Provided: ${ifNoFilesFound}. Available options: ${Object.keys(constants_1.NoFileOptions)}`);
     }
-    return {
+    const inputs = {
         artifactName: name,
         searchPath: path,
         ifNoFilesFound: noFileBehavior
     };
+    const retentionDaysStr = core.getInput(constants_1.Inputs.RetentionDays);
+    if (retentionDaysStr) {
+        inputs.retentionDays = parseInt(retentionDaysStr);
+        if (isNaN(inputs.retentionDays)) {
+            core.setFailed('Invalid retention-days');
+        }
+    }
+    return inputs;
 }
 exports.getInputs = getInputs;
 
@@ -6666,12 +6681,17 @@ class UploadHttpClient {
      * @param {string} artifactName Name of the artifact being created
      * @returns The response from the Artifact Service if the file container was successfully created
      */
-    createArtifactInFileContainer(artifactName) {
+    createArtifactInFileContainer(artifactName, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const parameters = {
                 Type: 'actions_storage',
                 Name: artifactName
             };
+            // calculate retention period
+            if (options && options.retentionDays) {
+                const maxRetentionStr = config_variables_1.getRetentionDays();
+                parameters.RetentionDays = utils_1.getProperRetention(options.retentionDays, maxRetentionStr);
+            }
             const data = JSON.stringify(parameters, null, 2);
             const artifactUrl = utils_1.getArtifactUrl();
             // use the first client from the httpManager, `keep-alive` is not used so the connection will close immediately
@@ -7314,6 +7334,7 @@ var Inputs;
     Inputs["Name"] = "name";
     Inputs["Path"] = "path";
     Inputs["IfNoFilesFound"] = "if-no-files-found";
+    Inputs["RetentionDays"] = "retention-days";
 })(Inputs = exports.Inputs || (exports.Inputs = {}));
 var NoFileOptions;
 (function (NoFileOptions) {
@@ -8137,6 +8158,21 @@ function createEmptyFilesForArtifact(emptyFilesToCreate) {
     });
 }
 exports.createEmptyFilesForArtifact = createEmptyFilesForArtifact;
+function getProperRetention(retentionInput, retentionSetting) {
+    if (retentionInput < 0) {
+        throw new Error('Invalid retention, minimum value is 1.');
+    }
+    let retention = retentionInput;
+    if (retentionSetting) {
+        const maxRetention = parseInt(retentionSetting);
+        if (!isNaN(maxRetention) && maxRetention < retention) {
+            core_1.warning(`Retention days is greater than the max value allowed by the repository setting, reduce retention to ${maxRetention} days`);
+            retention = maxRetention;
+        }
+    }
+    return retention;
+}
+exports.getProperRetention = getProperRetention;
 //# sourceMappingURL=utils.js.map
 
 /***/ }),
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/actions/upload-artifact#readme",
   "devDependencies": {
-    "@actions/artifact": "^0.3.5",
+    "@actions/artifact": "^0.4.0",
     "@actions/core": "^1.2.3",
     "@actions/glob": "^0.1.0",
     "@actions/io": "^1.0.2",
diff --git a/src/constants.ts b/src/constants.ts
@@ -1,7 +1,8 @@
 export enum Inputs {
   Name = 'name',
   Path = 'path',
-  IfNoFilesFound = 'if-no-files-found'
+  IfNoFilesFound = 'if-no-files-found',
+  RetentionDays = 'retention-days'
 }
 
 export enum NoFileOptions {
diff --git a/src/input-helper.ts b/src/input-helper.ts
@@ -22,9 +22,19 @@ export function getInputs(): UploadInputs {
     )
   }
 
-  return {
+  const inputs = {
     artifactName: name,
     searchPath: path,
     ifNoFilesFound: noFileBehavior
+  } as UploadInputs
+
+  const retentionDaysStr = core.getInput(Inputs.RetentionDays)
+  if (retentionDaysStr) {
+    inputs.retentionDays = parseInt(retentionDaysStr)
+    if (isNaN(inputs.retentionDays)) {
+      core.setFailed('Invalid retention-days')
+    }
   }
+
+  return inputs
 }
diff --git a/src/upload-artifact.ts b/src/upload-artifact.ts
@@ -40,6 +40,10 @@ async function run(): Promise<void> {
       const options: UploadOptions = {
         continueOnError: false
       }
+      if (inputs.retentionDays) {
+        options.retentionDays = inputs.retentionDays
+      }
+
       const uploadResponse = await artifactClient.uploadArtifact(
         inputs.artifactName,
         searchResult.filesToUpload,
diff --git a/src/upload-inputs.ts b/src/upload-inputs.ts
@@ -15,4 +15,9 @@ export interface UploadInputs {
    * The desired behavior if no files are found with the provided search path
    */
   ifNoFilesFound: NoFileOptions
+
+  /**
+   * Duration after which artifact will expire in days
+   */
+  retentionDays: number
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`export enum Inputs {`
`2`	`2`	`Name = 'name',`
`3`	`3`	`Path = 'path',`
`4`		`- IfNoFilesFound = 'if-no-files-found'`
	`4`	`+ IfNoFilesFound = 'if-no-files-found',`
	`5`	`+ RetentionDays = 'retention-days'`
`5`	`6`	`}`
`6`	`7`
`7`	`8`	`export enum NoFileOptions {`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,19 @@ export function getInputs(): UploadInputs {`
`22`	`22`	`)`
`23`	`23`	`}`
`24`	`24`
`25`		`- return {`
	`25`	`+ const inputs = {`
`26`	`26`	`artifactName: name,`
`27`	`27`	`searchPath: path,`
`28`	`28`	`ifNoFilesFound: noFileBehavior`
	`29`	`+ } as UploadInputs`
	`30`	`+`
	`31`	`+ const retentionDaysStr = core.getInput(Inputs.RetentionDays)`
	`32`	`+ if (retentionDaysStr) {`
	`33`	`+ inputs.retentionDays = parseInt(retentionDaysStr)`
	`34`	`+ if (isNaN(inputs.retentionDays)) {`
	`35`	`+ core.setFailed('Invalid retention-days')`
	`36`	`+ }`
`29`	`37`	`}`
	`38`	`+`
	`39`	`+ return inputs`
`30`	`40`	`}`