From c5f26da21d46ce9cd5a4824ca886979ecde8e8e1 Mon Sep 17 00:00:00 2001
From: Chris Nielsen <chrisnielsen@microsoft.com>
Date: Fri, 26 Apr 2024 15:41:43 -0700
Subject: [PATCH 1/2] Fix MSDO_PACKAGES_DIRECTORY initialization in cases where
the CLI is not downloaded from the nuget server
---
src/msdo-client.ts | 13 +++++++++++++
src/msdo-installer.ts | 12 ------------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/msdo-client.ts b/src/msdo-client.ts
index 2be8ae5..23bc67a 100644
--- a/src/msdo-client.ts
+++ b/src/msdo-client.ts
@@ -24,6 +24,19 @@ async function setupEnvironment(): Promise<void> {
console.log('------------------------------------------------------------------------------');
+ // initialize the _msdo directory
+ let agentDirectory = path.resolve(path.join(process.env.GITHUB_WORKSPACE, '../../_msdo'));
+ core.debug(`agentDirectory = ${agentDirectory}`);
+ common.ensureDirectory(agentDirectory);
+
+ let agentPackagesDirectory = process.env.MSDO_PACKAGES_DIRECTORY;
+ if (!agentPackagesDirectory) {
+ agentPackagesDirectory = path.join(agentDirectory, 'packages');
+ core.debug(`agentPackagesDirectory = ${agentPackagesDirectory}`);
+ common.ensureDirectory(agentPackagesDirectory);
+ process.env.MSDO_PACKAGES_DIRECTORY = agentPackagesDirectory;
+ }
+
if (!process.env.MSDO_FILEPATH) {
let cliVersion = resolveCliVersion();
await installer.install(cliVersion);
diff --git a/src/msdo-installer.ts b/src/msdo-installer.ts
index 1cc9d63..4caf6f4 100644
--- a/src/msdo-installer.ts
+++ b/src/msdo-installer.ts
@@ -31,19 +31,7 @@ export async function install(cliVersion: string) {
let packageName = resolvePackageName();
- // initialize the _msdo directory
let agentDirectory = path.resolve(path.join(process.env.GITHUB_WORKSPACE, '../../_msdo'));
- core.debug(`agentDirectory = ${agentDirectory}`);
- common.ensureDirectory(agentDirectory);
-
- let agentPackagesDirectory = process.env.MSDO_PACKAGES_DIRECTORY;
- if (!agentPackagesDirectory) {
- agentPackagesDirectory = path.join(agentDirectory, 'packages');
- core.debug(`agentPackagesDirectory = ${agentPackagesDirectory}`);
- common.ensureDirectory(agentPackagesDirectory);
- process.env.MSDO_PACKAGES_DIRECTORY = agentPackagesDirectory;
- }
-
let agentVersionsDirectory = path.join(agentDirectory, 'versions');
core.debug(`agentVersionsDirectory = ${agentVersionsDirectory}`);
common.ensureDirectory(agentVersionsDirectory);
From 165c7fc1a5832c0cfd47dbd2a6b8650e10c5a765 Mon Sep 17 00:00:00 2001
From: Chris Nielsen <chrisnielsen@microsoft.com>
Date: Fri, 26 Apr 2024 16:05:09 -0700
Subject: [PATCH 2/2] Updating package version
---
package-lock.json | 4 ++--
package.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 1dfd003..8381777 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@microsoft/security-devops-actions-toolkit",
- "version": "1.10.0",
+ "version": "1.12.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@microsoft/security-devops-actions-toolkit",
- "version": "1.10.0",
+ "version": "1.12.0",
"license": "MIT",
"dependencies": {
"@actions/core": "1.10.0",
diff --git a/package.json b/package.json
index d60e82e..59db1c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@microsoft/security-devops-actions-toolkit",
- "version": "1.10.0",
+ "version": "1.12.0",
"description": "Microsoft Security DevOps for GitHub Actions toolkit.",
"author": "Microsoft Corporation",
"license": "MIT",