From e0220322366c2c601f3344647d86954b54c63c28 Mon Sep 17 00:00:00 2001 From: devkeydet Date: Thu, 2 May 2024 07:47:33 -0400 Subject: [PATCH 1/3] Add "Developer" environment option to create environment --- src/tasks/create-environment/create-environment-v2/task.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tasks/create-environment/create-environment-v2/task.json b/src/tasks/create-environment/create-environment-v2/task.json index 7029405f..fcd92bc7 100644 --- a/src/tasks/create-environment/create-environment-v2/task.json +++ b/src/tasks/create-environment/create-environment-v2/task.json @@ -77,6 +77,7 @@ "Trial": "Trial", "Sandbox": "Sandbox", "Production": "Production", + "Developer": "Developer", "SubscriptionBasedTrial": "Trial (subscription-based)" } }, From b51d58f1f71b3284801707441fb26949dc2f879e Mon Sep 17 00:00:00 2001 From: devkeydet Date: Thu, 2 May 2024 08:22:06 -0400 Subject: [PATCH 2/3] Add support for assigning user to the environment --- .../create-environment/create-environment-v2/index.ts | 1 + .../create-environment/create-environment-v2/task.json | 8 ++++++++ test/unit-test/create-environment.test.ts | 1 + 3 files changed, 10 insertions(+) diff --git a/src/tasks/create-environment/create-environment-v2/index.ts b/src/tasks/create-environment/create-environment-v2/index.ts index a0463308..5a5c0148 100644 --- a/src/tasks/create-environment/create-environment-v2/index.ts +++ b/src/tasks/create-environment/create-environment-v2/index.ts @@ -30,6 +30,7 @@ export async function main(): Promise { credentials: getCredentials(), environmentName: parameterMap['DisplayName'], environmentType: parameterMap['EnvironmentSku'], + user: parameterMap['User'], region: parameterMap['LocationName'], currency: parameterMap['CurrencyName'], language: parameterMap['LanguageName'], diff --git a/src/tasks/create-environment/create-environment-v2/task.json b/src/tasks/create-environment/create-environment-v2/task.json index fcd92bc7..f3df9e97 100644 --- a/src/tasks/create-environment/create-environment-v2/task.json +++ b/src/tasks/create-environment/create-environment-v2/task.json @@ -81,6 +81,14 @@ "SubscriptionBasedTrial": "Trial (subscription-based)" } }, + { + "name": "User", + "label": "Create on behalf of user", + "type": "string", + "required": false, + "helpMarkDown": "Object ID or user principal name (UPN) of Microsoft Entra ID user to be assigned to the environment.", + "visibleRule": "EnvironmentSku = Developer" + }, { "name": "AppsTemplate", "label": "Select Dynamics365 apps", diff --git a/test/unit-test/create-environment.test.ts b/test/unit-test/create-environment.test.ts index 59630bd9..56beeec7 100644 --- a/test/unit-test/create-environment.test.ts +++ b/test/unit-test/create-environment.test.ts @@ -47,6 +47,7 @@ describe("create-environment tests", () => { credentials: credentials, environmentName: { name: 'DisplayName', required: true, defaultValue: undefined }, environmentType: { name: 'EnvironmentSku', required: true, defaultValue: 'Sandbox' }, + user: { name: 'User', required: false, defaultValue: undefined }, region: { name: 'LocationName', required: true, defaultValue: 'unitedstates' }, currency: { name: 'CurrencyName', required: true, defaultValue: 'USD' }, language: { name: 'LanguageName', required: true, defaultValue: 'English (United States)' }, From 3104e6ac80467cd27773ac5c2fb5cd0008ddb338 Mon Sep 17 00:00:00 2001 From: devkeydet Date: Thu, 2 May 2024 18:00:51 -0400 Subject: [PATCH 3/3] Update cli wrapper to version 0.1.121 --- package-lock.json | 15 ++++++++------- package.json | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index de3b2643..d84d027e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ ], "license": "MIT", "dependencies": { - "@microsoft/powerplatform-cli-wrapper": "^0.1.120", + "@microsoft/powerplatform-cli-wrapper": "^0.1.121", "azure-pipelines-task-lib": "^4.9.1", "debug": "^4.3.4", "fs-extra": "^11.1.1", @@ -587,10 +587,11 @@ } }, "node_modules/@microsoft/powerplatform-cli-wrapper": { - "version": "0.1.120", - "resolved": "https://npm.pkg.github.com/download/@microsoft/powerplatform-cli-wrapper/0.1.120/6b6620bf13e829db7d5ee24bb61e2d020ac29d54", - "integrity": "sha512-bjRYLrUB5GHtwnflArvGTSp3pw3iG/K6Iv/kBRFOdKoOu0GyCCFkiL3Qp8zg8jbuYhngxwu8L3hlwZzJGnMncg==", + "version": "0.1.121", + "resolved": "https://npm.pkg.github.com/download/@microsoft/powerplatform-cli-wrapper/0.1.121/2f2b1c03aafddbaf481c3c5a03f37d16fa6bb57a", + "integrity": "sha512-t/Qb0TKcznerlpnrC/uWKalsnw6+OJvdEsA+SrW7+ZuRgnQZV6qmmPZPNK+SGua4Ow+9u3x4RE3jB57HiGnd7g==", "inBundle": true, + "license": "MIT", "dependencies": { "fs-extra": "^11.1.1", "glob": "^10.3.10" @@ -16785,9 +16786,9 @@ "dev": true }, "@microsoft/powerplatform-cli-wrapper": { - "version": "0.1.120", - "resolved": "https://npm.pkg.github.com/download/@microsoft/powerplatform-cli-wrapper/0.1.120/6b6620bf13e829db7d5ee24bb61e2d020ac29d54", - "integrity": "sha512-bjRYLrUB5GHtwnflArvGTSp3pw3iG/K6Iv/kBRFOdKoOu0GyCCFkiL3Qp8zg8jbuYhngxwu8L3hlwZzJGnMncg==", + "version": "0.1.121", + "resolved": "https://npm.pkg.github.com/download/@microsoft/powerplatform-cli-wrapper/0.1.121/2f2b1c03aafddbaf481c3c5a03f37d16fa6bb57a", + "integrity": "sha512-t/Qb0TKcznerlpnrC/uWKalsnw6+OJvdEsA+SrW7+ZuRgnQZV6qmmPZPNK+SGua4Ow+9u3x4RE3jB57HiGnd7g==", "requires": { "fs-extra": "^11.1.1", "glob": "^10.3.10" diff --git a/package.json b/package.json index 97d24909..5cf61921 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "yargs": "^17.7.2" }, "dependencies": { - "@microsoft/powerplatform-cli-wrapper": "^0.1.120", + "@microsoft/powerplatform-cli-wrapper": "^0.1.121", "azure-pipelines-task-lib": "^4.9.1", "debug": "^4.3.4", "fs-extra": "^11.1.1",