Skip to content

Commit 322ddac

Browse files
justinmk3justinmk3
authored
fix(ui): avoid noise words in messages #2879 
1 parent 299f189 commit 322ddac

30 files changed

+91
-89
lines changed

‎src/ecr/commands/createRepository.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ export async function createRepository(
3535
try {
3636
const repository = await node.createRepository(repositoryName)
3737

38-
getLogger().info('Successfully created repository %O', repository)
38+
getLogger().info('created repository: %O', repository)
3939
window.showInformationMessage(
40-
localize('AWS.ecr.createRepository.success', 'Created repository {0}', repositoryName)
40+
localize('AWS.ecr.createRepository.success', 'Created repository: {0}', repositoryName)
4141
)
4242
telemetry.ecr_createRepository.emit({ result: 'Succeeded' })
4343
} catch (e) {
4444
getLogger().error(`Failed to create repository ${repositoryName}: %O`, e)
4545
showViewLogsMessage(
46-
localize('AWS.ecr.createRepository.failure', 'Failed to create repository {0}', repositoryName),
46+
localize('AWS.ecr.createRepository.failure', 'Failed to create repository: {0}', repositoryName),
4747
window
4848
)
4949
telemetry.ecr_createRepository.emit({ result: 'Failed' })

‎src/ecr/commands/deleteRepository.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ export async function deleteRepository(
3131
try {
3232
await node.deleteRepository()
3333

34-
getLogger().info(`Successfully deleted repository ${repositoryName}`)
34+
getLogger().info(`deleted repository: ${repositoryName}`)
3535

3636
window.showInformationMessage(
37-
localize('AWS.ecr.deleteRepository.success', 'Deleted repository {0}', repositoryName)
37+
localize('AWS.ecr.deleteRepository.success', 'Deleted repository: {0}', repositoryName)
3838
)
3939
telemetry.ecr_deleteRepository.emit({ result: 'Succeeded' })
4040
} catch (e) {
4141
getLogger().error(`Failed to delete repository ${repositoryName}: %O`, e)
4242
showViewLogsMessage(
43-
localize('AWS.ecr.deleteRepository.failure', 'Failed to delete repository {0}', repositoryName),
43+
localize('AWS.ecr.deleteRepository.failure', 'Failed to delete repository: {0}', repositoryName),
4444
window
4545
)
4646
telemetry.ecr_deleteRepository.emit({ result: 'Failed' })

‎src/iot/commands/deleteCert.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ export async function deleteCertCommand(
106106
try {
107107
await node.iot.deleteCertificate({ certificateId: node.certificate.id, forceDelete: forceDelete })
108108

109-
getLogger().info(`Successfully deleted Certificate ${node.certificate.id}`)
109+
getLogger().info(`deleted certificate: ${node.certificate.id}`)
110110
window.showInformationMessage(
111-
localize('AWS.iot.deleteCert.success', 'Deleted Certificate {0}', node.certificate.id)
111+
localize('AWS.iot.deleteCert.success', 'Deleted certificate: {0}', node.certificate.id)
112112
)
113113
} catch (e) {
114114
getLogger().error(`Failed to delete Certificate ${node.certificate.id}: %O`, e)
115115
showViewLogsMessage(
116-
localize('AWS.iot.deleteCert.error', 'Failed to delete Certificate {0}', node.certificate.id),
116+
localize('AWS.iot.deleteCert.error', 'Failed to delete certificate: {0}', node.certificate.id),
117117
window
118118
)
119119
}

‎src/iot/commands/deletePolicy.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ export async function deletePolicyCommand(
7070
}
7171
await node.iot.deletePolicy({ policyName })
7272

73-
getLogger().info(`Successfully deleted Policy ${policyName}`)
74-
window.showInformationMessage(localize('AWS.iot.deletePolicy.success', 'Deleted Policy {0}', node.policy.name))
73+
getLogger().info(`deleted Policy: ${policyName}`)
74+
window.showInformationMessage(localize('AWS.iot.deletePolicy.success', 'Deleted Policy: {0}', node.policy.name))
7575
} catch (e) {
76-
getLogger().error(`Failed to delete Policy ${policyName}: %O`, e)
76+
getLogger().error(`Failed to delete Policy: ${policyName}: %O`, e)
7777
showViewLogsMessage(
78-
localize('AWS.iot.deletePolicy.error', 'Failed to delete Policy {0}', node.policy.name),
78+
localize('AWS.iot.deletePolicy.error', 'Failed to delete Policy: {0}', node.policy.name),
7979
window
8080
)
8181
}

‎src/iot/commands/deletePolicyVersion.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export async function deletePolicyVersionCommand(
5050
try {
5151
await node.iot.deletePolicyVersion({ policyName, policyVersionId })
5252

53-
getLogger().info(`Successfully deleted Policy Version ${policyVersionId}`)
53+
getLogger().info(`deleted Policy Version: ${policyVersionId}`)
5454
window.showInformationMessage(
5555
localize(
5656
'AWS.iot.deletePolicyVersion.success',
@@ -60,7 +60,7 @@ export async function deletePolicyVersionCommand(
6060
)
6161
)
6262
} catch (e) {
63-
getLogger().error(`Failed to delete Policy Version ${policyVersionId}: %O`, e)
63+
getLogger().error(`Failed to delete Policy Version: ${policyVersionId}: %O`, e)
6464
showViewLogsMessage(
6565
localize(
6666
'AWS.iot.deletePolicyVersion.error',

‎src/iot/commands/deleteThing.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ export async function deleteThingCommand(
5757
}
5858
await node.iot.deleteThing({ thingName })
5959

60-
getLogger().info(`Successfully deleted Thing ${thingName}`)
61-
window.showInformationMessage(localize('AWS.iot.deleteThing.success', 'Deleted Thing {0}', thingName))
60+
getLogger().info(`deleted Thing: ${thingName}`)
61+
window.showInformationMessage(localize('AWS.iot.deleteThing.success', 'Deleted Thing: {0}', thingName))
6262
} catch (e) {
63-
getLogger().error(`Failed to delete Thing ${thingName}: %O`, e)
64-
showViewLogsMessage(localize('AWS.iot.deleteThing.error', 'Failed to delete Thing {0}', thingName), window)
63+
getLogger().error(`Failed to delete Thing: ${thingName}: %O`, e)
64+
showViewLogsMessage(localize('AWS.iot.deleteThing.error', 'Failed to delete Thing: {0}', thingName), window)
6565
}
6666

6767
//Refresh the Things Folder node

‎src/iot/commands/detachCert.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ export async function detachThingCertCommand(
4646
return
4747
}
4848

49-
getLogger().info(`Detaching certificate ${certId}`)
49+
getLogger().info(`Detaching certificate: ${certId}`)
5050
try {
5151
await node.iot.detachThingPrincipal({ thingName, principal: certArn })
5252

53-
getLogger().info(`Successfully detached certificate from Thing ${thingName}`)
54-
window.showInformationMessage(localize('AWS.iot.detachCert.success', 'Detached {0}', certId))
53+
getLogger().info(`detached certificate from Thing: ${thingName}`)
54+
window.showInformationMessage(localize('AWS.iot.detachCert.success', 'Detached: {0}', certId))
5555
} catch (e) {
56-
getLogger().error(`Failed to detach certificate ${certId}: %O`, e)
57-
showViewLogsMessage(localize('AWS.iot.detachCert.error', 'Failed to detach {0}', certId), window)
56+
getLogger().error(`Failed to detach certificate: ${certId}: %O`, e)
57+
showViewLogsMessage(localize('AWS.iot.detachCert.error', 'Failed to detach: {0}', certId), window)
5858
}
5959

6060
//Refresh the parent Thing node

‎src/iot/commands/detachPolicy.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ export async function detachPolicyCommand(
4848
return
4949
}
5050

51-
getLogger().info(`Detaching certificate ${certId}`)
51+
getLogger().info(`Detaching certificate: ${certId}`)
5252
try {
5353
await node.iot.detachPolicy({ policyName, target: certArn })
5454

55-
getLogger().info(`Successfully detached policy ${policyName}`)
56-
window.showInformationMessage(localize('AWS.iot.detachPolicy.success', 'Detached {0}', policyName))
55+
getLogger().info(`detached policy: ${policyName}`)
56+
window.showInformationMessage(localize('AWS.iot.detachPolicy.success', 'Detached: {0}', policyName))
5757
} catch (e) {
58-
getLogger().error(`Failed to detach certificate ${certId}: %O`, e)
59-
showViewLogsMessage(localize('AWS.iot.detachPolicy.error', 'Failed to detach {0}', policyName), window)
58+
getLogger().error(`Failed to detach certificate: ${certId}: %O`, e)
59+
showViewLogsMessage(localize('AWS.iot.detachPolicy.error', 'Failed to detach: {0}', policyName), window)
6060
}
6161

6262
/* Refresh both things and certificates nodes so the status is updated in

‎src/iot/commands/updateCert.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ export async function deactivateCertificateCommand(
5555
try {
5656
await node.iot.updateCertificate({ certificateId: certId, newStatus: STATUS_INACTIVE })
5757

58-
getLogger().info(`Successfully deactivated certificate ${certId}`)
58+
getLogger().info(`deactivated certificate: ${certId}`)
5959
window.showInformationMessage(
60-
localize('AWS.iot.deactivateCert.success', 'Deactivated {0}', node.certificate.id)
60+
localize('AWS.iot.deactivateCert.success', 'Deactivated: {0}', node.certificate.id)
6161
)
6262
} catch (e) {
6363
getLogger().error(`Failed to deactivate certificate ${certId}: %O`, e)
6464
showViewLogsMessage(
65-
localize('AWS.iot.deactivateCert.error', 'Failed to deactivate {0}', node.certificate.id),
65+
localize('AWS.iot.deactivateCert.error', 'Failed to deactivate: {0}', node.certificate.id),
6666
window
6767
)
6868
}
@@ -111,12 +111,12 @@ export async function activateCertificateCommand(
111111
try {
112112
await node.iot.updateCertificate({ certificateId: certId, newStatus: STATUS_ACTIVE })
113113

114-
getLogger().info(`Successfully activated certificate ${certId}`)
115-
window.showInformationMessage(localize('AWS.iot.activateCert.success', 'Activated {0}', node.certificate.id))
114+
getLogger().info(`activated certificate: ${certId}`)
115+
window.showInformationMessage(localize('AWS.iot.activateCert.success', 'Activated: {0}', node.certificate.id))
116116
} catch (e) {
117117
getLogger().error(`Failed to activate certificate ${certId}: %O`, e)
118118
showViewLogsMessage(
119-
localize('AWS.iot.activateCert.error', 'Failed to activate {0}', node.certificate.id),
119+
localize('AWS.iot.activateCert.error', 'Failed to activate: {0}', node.certificate.id),
120120
window
121121
)
122122
}
@@ -157,15 +157,15 @@ export async function revokeCertificateCommand(
157157
return
158158
}
159159

160-
getLogger().info(`Revoking certificate ${certId}`)
160+
getLogger().info(`Revoking certificate: ${certId}`)
161161
try {
162162
await node.iot.updateCertificate({ certificateId: certId, newStatus: STATUS_REVOKED })
163163

164-
getLogger().info(`Successfully revoked certificate ${certId}`)
165-
window.showInformationMessage(localize('AWS.iot.revokeCert.success', 'Revoked {0}', node.certificate.id))
164+
getLogger().info(`revoked certificate: ${certId}`)
165+
window.showInformationMessage(localize('AWS.iot.revokeCert.success', 'Revoked: {0}', node.certificate.id))
166166
} catch (e) {
167167
getLogger().error(`Failed to revoke certificate ${certId}: %O`, e)
168-
showViewLogsMessage(localize('AWS.iot.revokeCert.error', 'Failed to revoke {0}', node.certificate.id), window)
168+
showViewLogsMessage(localize('AWS.iot.revokeCert.error', 'Failed to revoke: {0}', node.certificate.id), window)
169169
}
170170

171171
/* Refresh both things and certificates nodes so the status is updated in

‎src/lambda/commands/deploySamApplication.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ async function deploy(params: {
282282
getLogger('channel').info(
283283
localize(
284284
'AWS.samcli.deploy.workflow.success',
285-
'Successfully deployed SAM Application to CloudFormation Stack: {0}',
285+
'Deployed SAM Application to CloudFormation Stack: {0}',
286286
params.deployParameters.destinationStackName
287287
)
288288
)

0 commit comments

Comments
 (0)