diff --git a/.github/workflows/ci-pull-request.yml b/.github/workflows/ci-pull-request.yml index 1509b9c..4e4a4ee 100644 --- a/.github/workflows/ci-pull-request.yml +++ b/.github/workflows/ci-pull-request.yml @@ -18,18 +18,18 @@ jobs: shell: nix develop --command bash {0} steps: - name: Checkout code - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@ef8a148080ab6020fd15196c2084a2eea5ff2d25 # v22 + uses: DeterminateSystems/nix-installer-action@3138316df39ed29be04236d7ffc686fa525866aa # v23 - name: Enable Nix cache - uses: DeterminateSystems/magic-nix-cache-action@908b263ff629f4cc17666315b7fd3ec127c6244d # v14 + uses: DeterminateSystems/magic-nix-cache-action@84c0677f58dcedf3b91f8223ce36a9ea5b3c84b7 # v15 with: use-flakehub: false - name: Login to Azure DevOps - uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0 + uses: azure/login@a641126d1b8aa4d1fa005f4f92df94a3a4c4c906 # v3.1.0 with: client-id: ${{ secrets.AZURE_APPLICATION_CLIENT_ID }} tenant-id: ${{ secrets.AZURE_TENANT_ID }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7787f80..5ba6b09 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,15 +23,15 @@ jobs: shell: nix develop --command bash {0} steps: - name: Checkout code - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: fetch-depth: 0 # Need history to compare versions - name: Install Nix - uses: DeterminateSystems/nix-installer-action@ef8a148080ab6020fd15196c2084a2eea5ff2d25 # v22 + uses: DeterminateSystems/nix-installer-action@3138316df39ed29be04236d7ffc686fa525866aa # v23 - name: Enable Nix cache - uses: DeterminateSystems/magic-nix-cache-action@908b263ff629f4cc17666315b7fd3ec127c6244d # v14 + uses: DeterminateSystems/magic-nix-cache-action@84c0677f58dcedf3b91f8223ce36a9ea5b3c84b7 # v15 with: use-flakehub: false @@ -54,7 +54,7 @@ jobs: - name: Login to Azure DevOps if: steps.check_version.outputs.changed == 'true' - uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0 + uses: azure/login@a641126d1b8aa4d1fa005f4f92df94a3a4c4c906 # v3.1.0 with: client-id: ${{ secrets.AZURE_APPLICATION_CLIENT_ID }} tenant-id: ${{ secrets.AZURE_TENANT_ID }} diff --git a/.github/workflows/sync-versions.yml b/.github/workflows/sync-versions.yml index bf518c0..e0524ce 100644 --- a/.github/workflows/sync-versions.yml +++ b/.github/workflows/sync-versions.yml @@ -14,17 +14,17 @@ jobs: shell: nix develop --command bash {0} steps: - name: Checkout code - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: ref: ${{ github.head_ref }} token: ${{ secrets.GITHUB_TOKEN }} fetch-depth: 0 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@ef8a148080ab6020fd15196c2084a2eea5ff2d25 # v22 + uses: DeterminateSystems/nix-installer-action@3138316df39ed29be04236d7ffc686fa525866aa # v23 - name: Enable Nix cache - uses: DeterminateSystems/magic-nix-cache-action@908b263ff629f4cc17666315b7fd3ec127c6244d # v14 + uses: DeterminateSystems/magic-nix-cache-action@84c0677f58dcedf3b91f8223ce36a9ea5b3c84b7 # v15 with: use-flakehub: false diff --git a/flake.lock b/flake.lock index 32dc9c3..2676e34 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1781607440, - "narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=", + "lastModified": 1791161550, + "narHash": "sha256-hUcT0jKmSHN5XgRW3sSEIIlqsVClkVfToluYtOd56ok=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", + "rev": "8c6b39505383e6d5dcb431f00cb3597b71f8045c", "type": "github" }, "original": { diff --git a/nix/tfx-cli.nix b/nix/tfx-cli.nix index e57abf9..dc5f3d4 100644 --- a/nix/tfx-cli.nix +++ b/nix/tfx-cli.nix @@ -7,16 +7,16 @@ }: buildNpmPackage rec { pname = "tfx-cli"; - version = "0.23.3"; + version = "0.24.2"; src = fetchFromGitHub { owner = "Microsoft"; repo = "tfs-cli"; - rev = "3c12ccb53f3fd700224d0db4490ebc0613df0b7e"; - hash = "sha256-gnADqxXmaweeaDzV3BTwVzHGjm7qZ4/QNWpx60iJLJ8="; + rev = "69cc3ea887ccb08fccc2b37ffeacc1bdb8dddb7c"; + hash = "sha256-GXi/PNSzX3RRisX7rEXahu3sVldhee9IYMmaqx0JF+s="; }; - npmDepsHash = "sha256-wZS8UZNmiuk68NKe8FJzHgqtY9Fs7oZEZALtuB6HRS0="; + npmDepsHash = "sha256-sOraxuomTy6M+ws5I7TOYzdzTpAx+nUFcRT+tg0dfAk="; # `npm run build` is `tsc -p .`; postbuild copies the bin entrypoint. npmBuildScript = "build"; diff --git a/package-lock.json b/package-lock.json index ae8a06f..585039f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,9 +4,8 @@ "requires": true, "packages": { "": { - "name": "sysdig-azure-devops-task", "dependencies": { - "azure-pipelines-task-lib": "^5.2.11", + "azure-pipelines-task-lib": "^5.281.0", "vss-web-extension-sdk": "^5.141.0" } }, @@ -91,14 +90,6 @@ "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz", "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==" }, - "node_modules/adm-zip": { - "version": "0.5.10", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz", - "integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==", - "engines": { - "node": ">=6.0" - } - }, "node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", @@ -111,18 +102,16 @@ } }, "node_modules/azure-pipelines-task-lib": { - "version": "5.2.11", - "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-5.2.11.tgz", - "integrity": "sha512-VaVvVaPe0ysvxGE10QysbEHuxL480kVDQvKjGd2gtO1eRY4/SkQKfAZrP6lLUAAgYMGk6eifl0I3kaRPzWQZ8g==", + "version": "5.281.0", + "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-5.281.0.tgz", + "integrity": "sha512-sGlLjpNpKTpCvlrlN84SKVikDqJnD+8AVWxsvUk5T5vsX4n8aX5S2BWqqAg3zjVZp+z/5A0zcjOPkpacbqOTEg==", "license": "MIT", "dependencies": { - "adm-zip": "^0.5.10", "minimatch": "^3.1.5", "nodejs-file-downloader": "^4.11.1", "q": "^1.5.1", "semver": "^5.7.2", - "shelljs": "^0.10.0", - "uuid": "^3.0.1" + "shelljs": "^0.10.0" } }, "node_modules/balanced-match": { @@ -132,9 +121,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.21", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz", + "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==", "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -646,15 +635,6 @@ "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", "integrity": "sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==" }, - "node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "bin": { - "uuid": "bin/uuid" - } - }, "node_modules/vss-web-extension-sdk": { "version": "5.141.0", "resolved": "https://registry.npmjs.org/vss-web-extension-sdk/-/vss-web-extension-sdk-5.141.0.tgz", diff --git a/package.json b/package.json index eac7158..4ca02d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,9 @@ { "dependencies": { - "azure-pipelines-task-lib": "^5.2.11", + "azure-pipelines-task-lib": "^5.281.0", "vss-web-extension-sdk": "^5.141.0" + }, + "overrides": { + "brace-expansion": "^1.1.21" } } diff --git a/sysdig-cli-scan-task/package-lock.json b/sysdig-cli-scan-task/package-lock.json index 359d7c9..a83696e 100644 --- a/sysdig-cli-scan-task/package-lock.json +++ b/sysdig-cli-scan-task/package-lock.json @@ -1,16 +1,16 @@ { "name": "sysdig-cli-scan-task", - "version": "1.0.4", + "version": "1.0.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "sysdig-cli-scan-task", - "version": "1.0.4", + "version": "1.0.5", "license": "ISC", "dependencies": { "@types/http-proxy-agent": "^4.0.1", - "azure-pipelines-task-lib": "^5.2.11", + "azure-pipelines-task-lib": "^5.281.0", "https-proxy-agent": "^7.0.4" }, "devDependencies": { @@ -79,15 +79,6 @@ "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==", "dev": true }, - "node_modules/adm-zip": { - "version": "0.5.16", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.16.tgz", - "integrity": "sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==", - "license": "MIT", - "engines": { - "node": ">=12.0" - } - }, "node_modules/agent-base": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", @@ -100,18 +91,16 @@ } }, "node_modules/azure-pipelines-task-lib": { - "version": "5.2.11", - "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-5.2.11.tgz", - "integrity": "sha512-VaVvVaPe0ysvxGE10QysbEHuxL480kVDQvKjGd2gtO1eRY4/SkQKfAZrP6lLUAAgYMGk6eifl0I3kaRPzWQZ8g==", + "version": "5.281.0", + "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-5.281.0.tgz", + "integrity": "sha512-sGlLjpNpKTpCvlrlN84SKVikDqJnD+8AVWxsvUk5T5vsX4n8aX5S2BWqqAg3zjVZp+z/5A0zcjOPkpacbqOTEg==", "license": "MIT", "dependencies": { - "adm-zip": "^0.5.10", "minimatch": "^3.1.5", "nodejs-file-downloader": "^4.11.1", "q": "^1.5.1", "semver": "^5.7.2", - "shelljs": "^0.10.0", - "uuid": "^3.0.1" + "shelljs": "^0.10.0" } }, "node_modules/balanced-match": { @@ -121,9 +110,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.21", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz", + "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==", "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -700,15 +689,6 @@ "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==", "license": "(WTFPL OR MIT)" }, - "node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "bin": { - "uuid": "bin/uuid" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -772,11 +752,6 @@ "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==", "dev": true }, - "adm-zip": { - "version": "0.5.16", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.16.tgz", - "integrity": "sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==" - }, "agent-base": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", @@ -786,17 +761,15 @@ } }, "azure-pipelines-task-lib": { - "version": "5.2.11", - "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-5.2.11.tgz", - "integrity": "sha512-VaVvVaPe0ysvxGE10QysbEHuxL480kVDQvKjGd2gtO1eRY4/SkQKfAZrP6lLUAAgYMGk6eifl0I3kaRPzWQZ8g==", + "version": "5.281.0", + "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-5.281.0.tgz", + "integrity": "sha512-sGlLjpNpKTpCvlrlN84SKVikDqJnD+8AVWxsvUk5T5vsX4n8aX5S2BWqqAg3zjVZp+z/5A0zcjOPkpacbqOTEg==", "requires": { - "adm-zip": "^0.5.10", "minimatch": "^3.1.5", "nodejs-file-downloader": "^4.11.1", "q": "^1.5.1", "semver": "^5.7.2", - "shelljs": "^0.10.0", - "uuid": "^3.0.1" + "shelljs": "^0.10.0" } }, "balanced-match": { @@ -805,9 +778,9 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.21", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz", + "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==", "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -999,7 +972,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "^1.1.21" } }, "ms": { @@ -1164,11 +1137,6 @@ "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz", "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==" }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/sysdig-cli-scan-task/package.json b/sysdig-cli-scan-task/package.json index 0d3daea..28a19fa 100644 --- a/sysdig-cli-scan-task/package.json +++ b/sysdig-cli-scan-task/package.json @@ -1,6 +1,6 @@ { "name": "sysdig-cli-scan-task", - "version": "1.0.4", + "version": "1.0.5", "description": "Sysdig Secure Scan Task", "main": "index.js", "scripts": { @@ -20,12 +20,15 @@ "homepage": "https://github.com/sysdiglabs/sysdig-azure-devops-task.git#readme", "dependencies": { "@types/http-proxy-agent": "^4.0.1", - "azure-pipelines-task-lib": "^5.2.11", + "azure-pipelines-task-lib": "^5.281.0", "https-proxy-agent": "^7.0.4" }, "devDependencies": { "@types/node": "^20.0.0", "@types/q": "^1.5.5", "typescript": "^5.0.0" + }, + "overrides": { + "brace-expansion": "^1.1.21" } } diff --git a/sysdig-cli-scan-task/task.json b/sysdig-cli-scan-task/task.json index 10c10ee..6c7a5c0 100644 --- a/sysdig-cli-scan-task/task.json +++ b/sysdig-cli-scan-task/task.json @@ -10,7 +10,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 4 + "Patch": 5 }, "minimumAgentVersion": "3.232.1", "groups": [ diff --git a/vss-extension.json b/vss-extension.json index 7f6f2fa..6d66df3 100644 --- a/vss-extension.json +++ b/vss-extension.json @@ -2,7 +2,7 @@ "manifestVersion": 1, "id": "sysdig-cli-scan-task", "name": "Sysdig CLI scanner", - "version": "1.0.4", + "version": "1.0.5", "publisher": "SysdigDevOps", "description": "Scan images with Sysdig Secure as part of your development pipeline.", "public": true,