From 167aff3b8abbb490d8c2e2a89f2d06f303590703 Mon Sep 17 00:00:00 2001 From: Marc Schweigert Date: Sun, 28 Apr 2024 13:47:04 -0400 Subject: [PATCH] added support for security-group-id (#541) * added support for security-group-id * switched to public nuget feed --- create-environment/action.yml | 4 ++++ gulpfile.mjs | 4 ++-- package-lock.json | 15 +++++++-------- package.json | 2 +- src/actions/create-environment/index.ts | 1 + src/test/createEnvironment.test.ts | 1 + 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/create-environment/action.yml b/create-environment/action.yml index 81a323e9..74e0b00b 100644 --- a/create-environment/action.yml +++ b/create-environment/action.yml @@ -64,6 +64,10 @@ inputs: description: 'The ID of the Microsoft Teams team to create the Power Apps environment in.' required: false + security-group-id: + description: 'Microsoft Entra ID Security Group ID to use when creating the environment.' + required: false + outputs: environment-url: description: 'URL of the freshly created environment' diff --git a/gulpfile.mjs b/gulpfile.mjs index 09570e09..e100ebe1 100644 --- a/gulpfile.mjs +++ b/gulpfile.mjs @@ -228,12 +228,12 @@ async function nugetInstallPortalPackages() { } async function nugetInstallLinux() { - await nugetInstall('CAP_ISVExp_Tools_Stable', PacInfo.LegacyLinuxPackage, PacInfo.PacPackageVersion, path.resolve(outdir, 'pac_linux')); + await nugetInstall('nuget.org', PacInfo.LegacyLinuxPackage, PacInfo.PacPackageVersion, path.resolve(outdir, 'pac_linux')); await setExecuteFlag(path.resolve(outdir, 'pac_linux', 'tools', 'pac')); } async function nugetInstallWindows() { - await nugetInstall('CAP_ISVExp_Tools_Stable', PacInfo.PacPackageName, PacInfo.PacPackageVersion, path.resolve(outdir, 'pac')); + await nugetInstall('nuget.org', PacInfo.PacPackageName, PacInfo.PacPackageVersion, path.resolve(outdir, 'pac')); } async function restore() { diff --git a/package-lock.json b/package-lock.json index f2e6c522..10e15a97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@actions/core": "^1.10.1", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.118", + "@microsoft/powerplatform-cli-wrapper": "^0.1.120", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", @@ -833,10 +833,9 @@ } }, "node_modules/@microsoft/powerplatform-cli-wrapper": { - "version": "0.1.118", - "resolved": "https://npm.pkg.github.com/download/@microsoft/powerplatform-cli-wrapper/0.1.118/3b2c514efb9c0a9a13248da1e3b07dbbdb77edc1", - "integrity": "sha512-FV/uRS5/1nAENHvdlssT/SyQF8LzsVrjjXklbZla5L+fHEtFk0ObLW7SUcsYRSU/SY5lm+tzlEemq6cWBwStZA==", - "license": "MIT", + "version": "0.1.120", + "resolved": "https://npm.pkg.github.com/download/@microsoft/powerplatform-cli-wrapper/0.1.120/6b6620bf13e829db7d5ee24bb61e2d020ac29d54", + "integrity": "sha512-bjRYLrUB5GHtwnflArvGTSp3pw3iG/K6Iv/kBRFOdKoOu0GyCCFkiL3Qp8zg8jbuYhngxwu8L3hlwZzJGnMncg==", "dependencies": { "fs-extra": "^11.1.1", "glob": "^10.3.10" @@ -11027,9 +11026,9 @@ } }, "@microsoft/powerplatform-cli-wrapper": { - "version": "0.1.118", - "resolved": "https://npm.pkg.github.com/download/@microsoft/powerplatform-cli-wrapper/0.1.118/3b2c514efb9c0a9a13248da1e3b07dbbdb77edc1", - "integrity": "sha512-FV/uRS5/1nAENHvdlssT/SyQF8LzsVrjjXklbZla5L+fHEtFk0ObLW7SUcsYRSU/SY5lm+tzlEemq6cWBwStZA==", + "version": "0.1.120", + "resolved": "https://npm.pkg.github.com/download/@microsoft/powerplatform-cli-wrapper/0.1.120/6b6620bf13e829db7d5ee24bb61e2d020ac29d54", + "integrity": "sha512-bjRYLrUB5GHtwnflArvGTSp3pw3iG/K6Iv/kBRFOdKoOu0GyCCFkiL3Qp8zg8jbuYhngxwu8L3hlwZzJGnMncg==", "requires": { "fs-extra": "^11.1.1", "glob": "^10.3.10" diff --git a/package.json b/package.json index cf6f3aec..62688eae 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@actions/core": "^1.10.1", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.118", + "@microsoft/powerplatform-cli-wrapper": "^0.1.120", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/src/actions/create-environment/index.ts b/src/actions/create-environment/index.ts index 92da0853..63006de2 100644 --- a/src/actions/create-environment/index.ts +++ b/src/actions/create-environment/index.ts @@ -32,6 +32,7 @@ export async function main(): Promise { templates: parameterMap['templates'], domainName: parameterMap['domain'], teamId: parameterMap['team-id'], + securityGroupId: parameterMap['security-group-id'], logToConsole: false, }, runnerParameters, new ActionsHost()); diff --git a/src/test/createEnvironment.test.ts b/src/test/createEnvironment.test.ts index 171ea04a..37f99934 100644 --- a/src/test/createEnvironment.test.ts +++ b/src/test/createEnvironment.test.ts @@ -48,6 +48,7 @@ describe("create-environment tests", () => { templates: { name: 'templates', required: false, defaultValue: undefined }, domainName: { name: 'domain', required: false, defaultValue: undefined }, teamId: {name:'team-id', required: false, defaultValue: undefined}, + securityGroupId: {name:'security-group-id', required: false, defaultValue: undefined}, logToConsole: false, }, runnerParameters, new ActionsHost()); });