Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs: Update package.nls.json #11479

Open
wants to merge 9 commits into
base: dev
Choose a base branch
from
Open

docs: Update package.nls.json #11479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9251727
docs: Update package.nls.json
supkasar Apr 25, 2024
a5b0388
Update update.test.ts
supkasar Apr 25, 2024
2f8db5e
Update package.nls.json
supkasar Apr 25, 2024
e63dff6
Update create.test.ts
supkasar Apr 25, 2024
2521b25
Update update.test.ts
supkasar Apr 25, 2024
93107b4
Update update.test.ts
supkasar Apr 26, 2024
921521b
Update package.nls.json
supkasar Apr 26, 2024
ecdfbd2
Update create.test.ts
supkasar Apr 26, 2024
5acb3c2
Update update.test.ts
supkasar Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 17 additions & 17 deletions packages/fx-core/resource/package.nls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,34 +629,34 @@
"driver.aadApp.description.create": "Create a Microsoft Entra app to authenticate users",
"driver.aadApp.description.update": "Apply Microsoft Entra app manifest to an existing app",
"driver.aadApp.error.missingEnv": "Environment variable %s is not set.",
"driver.aadApp.error.generateSecretFailed": "Cannot generate client secret.",
"driver.aadApp.error.generateSecretFailed": "Unable to generate client secret.",
"driver.aadApp.error.invalidFieldInManifest": "Field %s is missing or invalid in Microsoft Entra app manifest.",
"driver.aadApp.error.appNameTooLong": "The name for this Microsoft Entra app is too long. The maximum length is 120.",
"driver.aadApp.error.appNameTooLong": "The Microsoft Entra app name is too long. Maximum character length is 120.",
"driver.aadApp.error.credentialInvalidLifetimeAsPerAppPolicy": "The client secret lifetime is too long for your tenant. Use a shorter value with the clientSecretExpireDays parameter.",
"driver.aadApp.error.credentialTypeNotAllowedAsPerAppPolicy": "Your tenant doesn't allow creating a client secret for Microsoft Entra app. Create and configure the app manually.",
"driver.aadApp.progressBar.createAadAppTitle": "Creating Microsoft Entra application...",
"driver.aadApp.progressBar.updateAadAppTitle": "Updating Microsoft Entra application...",
"driver.aadApp.log.startExecuteDriver": "Executing action %s",
"driver.aadApp.progressBar.createAadAppTitle": "Creating Microsoft Entra app...",
"driver.aadApp.progressBar.updateAadAppTitle": "Updating Microsoft Entra app...",
"driver.aadApp.log.startExecuteDriver": "Executing action %s...",
"driver.aadApp.log.successExecuteDriver": "Action %s executed successfully",
"driver.aadApp.log.failExecuteDriver": "Unable to execute action %s. Error message: %s",
"driver.aadApp.log.startCreateAadApp": "Environment variable %s does not exist, creating a new Microsoft Entra app...",
"driver.aadApp.log.successCreateAadApp": "Created Microsoft Entra application with object id %s",
"driver.aadApp.log.skipCreateAadApp": "Environment variable %s already exist, skipping new Microsoft Entra app creation step.",
"driver.aadApp.log.startGenerateClientSecret": "Environment variable %s does not exist, generating client secret for Microsoft Entra app...",
"driver.aadApp.log.successGenerateClientSecret": "Generated client secret for Microsoft Entra application with object id %s",
"driver.aadApp.log.skipGenerateClientSecret": "Environment variable %s already exist, skipping Microsoft Entra app client secret generation step.",
"driver.aadApp.log.startCreateAadApp": "Environment variable %s doesn't exist, creating a new Microsoft Entra app...",
"driver.aadApp.log.successCreateAadApp": "Microsoft Entra app created with object id %s",
"driver.aadApp.log.skipCreateAadApp": "Environment variable %s already exists, skipping new Microsoft Entra app creation step.",
"driver.aadApp.log.startGenerateClientSecret": "Environment variable %s doesn't exist, generating client secret for Microsoft Entra app...",
"driver.aadApp.log.successGenerateClientSecret": "Client secret for Microsoft Entra app generated with object id %s",
"driver.aadApp.log.skipGenerateClientSecret": "Environment variable %s already exists, skipping Microsoft Entra app client secret generation step.",
"driver.aadApp.log.outputAadAppManifest": "Build Microsoft Entra app manifest completed, and app manifest content is written to %s",
"driver.aadApp.log.successUpdateAadAppManifest": "Applied manifest %s to Microsoft Entra application with object id %s",
"botRegistration.ProgressBar.creatingBotAadApp": "Creating bot Microsoft Entra app...",
"botRegistration.log.startCreateBotAadApp": "Creating bot Microsoft Entra app.",
"driver.aadApp.log.successUpdateAadAppManifest": "Applied manifest %s to Microsoft Entra app with object id %s",
"botRegistration.ProgressBar.creatingBotAadApp": "Bot Microsoft Entra app creation is in progress...",
"botRegistration.log.startCreateBotAadApp": "Bot Microsoft Entra app is in progress...",
"botRegistration.log.successCreateBotAadApp": "Bot Microsoft Entra app created successfully.",
"botRegistration.log.skipCreateBotAadApp": "Bot Microsoft Entra app creation skipped.",
"driver.botAadApp.create.description": "create a new or reuse an existing bot Microsoft Entra app.",
"driver.botAadApp.log.startExecuteDriver": "Executing action %s",
"driver.botAadApp.log.startExecuteDriver": "Executing action %s...",
"driver.botAadApp.log.successExecuteDriver": "Action %s executed successfully",
"driver.botAadApp.log.failExecuteDriver": "Unable to execute action %s. Error message: %s",
"driver.botAadApp.log.successCreateBotAad": "Created Microsoft Entra application with client id %s.",
"driver.botAadApp.log.useExistingBotAad": "Used existing Microsoft Entra application with client id %s.",
"driver.botAadApp.log.successCreateBotAad": "Created Microsoft Entra app with client id %s.",
"driver.botAadApp.log.useExistingBotAad": "Used existing Microsoft Entra app with client id %s.",
"driver.botAadApp.error.unexpectedEmptyBotPassword": "Bot password is empty. Add it in env file or clear bot id to have bot id/password pair regenerated. action: %s.",
"driver.arm.description.deploy": "Deploy the given ARM templates to Azure.",
"driver.arm.deploy.progressBar.message": "Deploying the ARM templates to Azure...",
Expand Down
10 changes: 5 additions & 5 deletions packages/fx-core/tests/component/driver/aad/create.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ describe("aadAppCreate", async () => {
expect(result.result._unsafeUnwrap().size).to.equal(6);
expect(result.summaries.length).to.equal(2);
expect(result.summaries).includes(
`Created Microsoft Entra application with object id ${expectedObjectId}`
`Created Microsoft Entra application with object id 00000000-0000-0000-0000-000000000000`
);
expect(result.summaries).includes(
`Generated client secret for Microsoft Entra application with object id ${expectedObjectId}`
Expand Down Expand Up @@ -270,7 +270,7 @@ describe("aadAppCreate", async () => {
expect(result.result._unsafeUnwrap().size).to.equal(6);
expect(result.summaries.length).to.equal(2);
expect(result.summaries).includes(
`Created Microsoft Entra application with object id ${expectedObjectId}`
`Created Microsoft Entra application with object id 00000000-0000-0000-0000-000000000000`
);
expect(result.summaries).includes(
`Generated client secret for Microsoft Entra application with object id ${expectedObjectId}`
Expand Down Expand Up @@ -355,7 +355,7 @@ describe("aadAppCreate", async () => {
expect(result.result._unsafeUnwrap().size).to.equal(5);
expect(result.summaries.length).to.equal(1);
expect(result.summaries).includes(
`Created Microsoft Entra application with object id ${expectedObjectId}`
`Created Microsoft Entra application with object id 00000000-0000-0000-0000-000000000000`
);
});

Expand All @@ -375,7 +375,7 @@ describe("aadAppCreate", async () => {
.is.instanceOf(MissingEnvUserError)
.and.has.property(
"message",
"Cannot generate client secret. Environment variable AAD_APP_OBJECT_ID is not set."
"Unable to generate client secret. Environment variable AAD_APP_OBJECT_ID is not set."
);
});

Expand Down Expand Up @@ -691,7 +691,7 @@ describe("aadAppCreate", async () => {
expect(result.result._unsafeUnwrap().size).to.equal(6);
expect(result.summaries.length).to.equal(2);
expect(result.summaries).includes(
`Created Microsoft Entra application with object id ${expectedObjectId}`
`Created Microsoft Entra application with object id 00000000-0000-0000-0000-000000000000`
);
expect(result.summaries).includes(
`Generated client secret for Microsoft Entra application with object id ${expectedObjectId}`
Expand Down
6 changes: 3 additions & 3 deletions packages/fx-core/tests/component/driver/aad/update.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ describe("aadAppUpdate", async () => {
const informationSpy = sinon.spy(mockedDriverContext.logProvider, "info");
const result = await updateAadAppDriver.execute(args, mockedDriverContext);
chai.assert.isTrue(informationSpy.called);
chai.assert.equal(informationSpy.getCall(0).args[0], "Executing action aadApp/update");
chai.assert.equal(informationSpy.getCall(0).args[0], "Executing action aadApp/update...");
const manifestOutputFilePath = path.join(
mockedDriverContext.projectPath,
outputRoot,
Expand All @@ -166,7 +166,7 @@ describe("aadAppUpdate", async () => {
);
chai.assert.equal(
informationSpy.getCall(2).args[0],
`Applied manifest ${manifestPath} to Microsoft Entra application with object id 00000000-0000-0000-0000-000000000000`
`Applied manifest ${manifestPath} to Microsoft Entra app with object id 00000000-0000-0000-0000-000000000000`
);
chai.assert.equal(
informationSpy.getCall(3).args[0],
Expand All @@ -192,7 +192,7 @@ describe("aadAppUpdate", async () => {
expect(result.summaries.length).to.equal(1);
console.log(result.summaries[0]);
expect(result.summaries).includes(
`Applied manifest ${args.manifestPath} to Microsoft Entra application with object id ${expectedObjectId}`
`Applied manifest tests/component/driver/aad/testAssets/manifest.json to Microsoft Entra application with object id 00000000-0000-0000-0000-000000000000`
);
});
it("should success with valid manifest on cli", async () => {
Expand Down