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

sdk-v3: Use sdk-v3 with _updateTags() #775

Merged
merged 1 commit into from
Jan 6, 2025
Merged

sdk-v3: Use sdk-v3 with _updateTags() #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ const {
DeleteEventSourceMappingCommand,
GetFunctionCommand,
ListEventSourceMappingsCommand,
ListTagsCommand,
TagResourceCommand,
UntagResourceCommand,
UpdateEventSourceMappingCommand,
UpdateFunctionCodeCommand,
UpdateFunctionConfigurationCommand
Expand Down Expand Up @@ -856,21 +859,17 @@ they may not work as expected in the Lambda environment.
}))
}

_updateTags (lambda, functionArn, tags) {
async _updateTags (lambda, functionArn, tags) {
if (!tags || Object.keys(tags).length <= 0) {
return Promise.resolve([])
} else {
return lambda.listTags({ Resource: functionArn }).promise()
.then(data => {
const keys = Object.keys(data.Tags)
return keys && keys.length > 0
? lambda.untagResource({ Resource: functionArn, TagKeys: keys }).promise()
: Promise.resolve()
})
.then(() => {
return lambda.tagResource({ Resource: functionArn, Tags: tags }).promise()
})
return []
}

const data = await lambda.send(new ListTagsCommand({ Resource: functionArn }))
const keys = Object.keys(data.Tags)
if (keys && keys.length > 0) {
await lambda.send(new UntagResourceCommand({ Resource: functionArn, TagKeys: keys }))
}
return lambda.send(new TagResourceCommand({ Resource: functionArn, Tags: tags }))
}

_updateScheduleEvents (scheduleEvents, functionArn, scheduleList) {
Expand Down Expand Up @@ -1016,7 +1015,7 @@ they may not work as expected in the Lambda environment.
eventSourceList.S3Events
),
this._updateTags(
lambda,
lambdaClient,
results.FunctionArn,
params.Tags)
])
Expand Down
10 changes: 7 additions & 3 deletions test/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ const {
DeleteEventSourceMappingCommand,
GetFunctionCommand,
ListEventSourceMappingsCommand,
ListTagsCommand,
TagResourceCommand,
UntagResourceCommand,
UpdateEventSourceMappingCommand,
UpdateFunctionCodeCommand,
UpdateFunctionConfigurationCommand
Expand Down Expand Up @@ -162,10 +165,8 @@ describe('lib/main', function () {
}

let aws = null // mock
let awsLambda = null // mock
before(() => {
aws = _mockSetting()
awsLambda = new aws.Lambda({ apiVersion: '2015-03-31' })

if (process.platform === 'win32') {
execFileSync('cmd.exe', ['/c', 'npm', 'ci'], { cwd: sourceDirectoryForTest })
Expand All @@ -180,6 +181,9 @@ describe('lib/main', function () {
mockLambdaClient.on(DeleteEventSourceMappingCommand).resolves(lambdaMockSettings.deleteEventSourceMapping)
mockLambdaClient.on(GetFunctionCommand).resolves(lambdaMockSettings.getFunction)
mockLambdaClient.on(ListEventSourceMappingsCommand).resolves(lambdaMockSettings.listEventSourceMappings)
mockLambdaClient.on(ListTagsCommand).resolves(lambdaMockSettings.listTags)
mockLambdaClient.on(TagResourceCommand).resolves(lambdaMockSettings.tagResource)
mockLambdaClient.on(UntagResourceCommand).resolves(lambdaMockSettings.untagResource)
mockLambdaClient.on(UpdateEventSourceMappingCommand).resolves(lambdaMockSettings.updateEventSourceMapping)
mockLambdaClient.on(UpdateFunctionCodeCommand).resolves(lambdaMockSettings.updateFunctionCode)
mockLambdaClient.on(UpdateFunctionConfigurationCommand).resolves(lambdaMockSettings.updateFunctionConfiguration)
Expand Down Expand Up @@ -1682,7 +1686,7 @@ describe('lib/main', function () {
describe('Lambda.prototype._updateTags()', () => {
it('simple test with mock', () => {
return lambda._updateTags(
awsLambda,
lambdaClient,
'arn:aws:lambda:eu-central-1:1234567:function:test',
{ tagKey: 'tagValue' }).then((result) => {
assert.deepEqual(
Expand Down
Loading