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 #11481

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

docs: Update package.nls.json #11481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
683aa18
docs: Update package.nls.json
supkasar Apr 25, 2024
bb6723c
fix: fix unit tests
yiqing-zhao 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
26 changes: 13 additions & 13 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,24 +629,24 @@
"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.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": "Created Microsoft Entra app 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": "Generated client secret for Microsoft Entra app 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",
"driver.aadApp.log.successUpdateAadAppManifest": "Applied manifest %s to Microsoft Entra app with object id %s",
"botRegistration.ProgressBar.creatingBotAadApp": "Creating bot Microsoft Entra app...",
"botRegistration.log.startCreateBotAadApp": "Creating bot Microsoft Entra app.",
"botRegistration.log.successCreateBotAadApp": "Bot Microsoft Entra app created successfully.",
Expand All @@ -655,8 +655,8 @@
"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
18 changes: 9 additions & 9 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,10 +159,10 @@ 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 app with object id ${expectedObjectId}`
);
expect(result.summaries).includes(
`Generated client secret for Microsoft Entra application with object id ${expectedObjectId}`
`Generated client secret for Microsoft Entra app with object id ${expectedObjectId}`
);
});

Expand Down Expand Up @@ -270,10 +270,10 @@ 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 app with object id ${expectedObjectId}`
);
expect(result.summaries).includes(
`Generated client secret for Microsoft Entra application with object id ${expectedObjectId}`
`Generated client secret for Microsoft Entra app with object id ${expectedObjectId}`
);
});

Expand All @@ -297,7 +297,7 @@ describe("aadAppCreate", async () => {
expect(result.result._unsafeUnwrap().size).to.equal(1); // 1 new env and 2 existing env
expect(result.summaries.length).to.equal(1);
expect(result.summaries).includes(
`Generated client secret for Microsoft Entra application with object id existing value`
`Generated client secret for Microsoft Entra app with object id existing value`
);
});

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 app with object id ${expectedObjectId}`
);
});

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,10 +691,10 @@ 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 app with object id ${expectedObjectId}`
);
expect(result.summaries).includes(
`Generated client secret for Microsoft Entra application with object id ${expectedObjectId}`
`Generated client secret for Microsoft Entra app with object id ${expectedObjectId}`
);
});

Expand Down
4 changes: 2 additions & 2 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 @@ -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 ${args.manifestPath} to Microsoft Entra app with object id ${expectedObjectId}`
);
});
it("should success with valid manifest on cli", async () => {
Expand Down