Skip to content

Commit

Permalink
Merge pull request #35 from aws-solutions/release/v1.8.6
Browse files Browse the repository at this point in the history
Updated to version v1.8.6
  • Loading branch information
aijunpeng committed Dec 21, 2023
2 parents 32e3782 + 62e718c commit 0c9c692
Show file tree
Hide file tree
Showing 59 changed files with 13,996 additions and 14,775 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -12,6 +12,7 @@ package-lock.json
node_modules
**/__pycache__/*
*.venv-test/
*.venv
*_yaml/

# CDK asset staging directory
Expand All @@ -35,4 +36,4 @@ internal/source/tools/setenv.sh
/.idea

#SonarQube
.scannerwork/
.scannerwork/
8 changes: 8 additions & 0 deletions CHANGELOG.md
Expand Up @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.8.6] - 2023-12-21

### Changed

- Upgraded lambdas from node 16 to node 20
- Upgraded lambdas from python 3.10 to python 3.11
- Upgraded aws sdk from v2 to v3

## [1.8.5] - 2023-10-26

### Changed
Expand Down
2 changes: 0 additions & 2 deletions NOTICE.txt
Expand Up @@ -85,12 +85,10 @@ docutils under the Massachusetts Institute of Technology (MIT) license
pyasn1 under the BSD License (BSD-2-Clause)
rsa under the Apache License Version 2.0
@aws-cdk/aws-glue-alpha under the Apache License Version 2.0
@aws-cdk/aws-synthetics-alpha under the Apache License Version 2.0
@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3 under the Apache License Version 2.0
@aws-solutions-constructs/aws-eventbridge-lambda under the Apache License Version 2.0
@aws-solutions-constructs/aws-kinesisfirehose-s3 under the Apache License Version 2.0
@aws-solutions-constructs/core under the Apache License Version 2.0
@aws-cdk/aws-synthetics-alpha under the Apache License Version 2.0
aws-cdk-lib under the Apache License Version 2.0
constructs under the Apache License Version 2.0

6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -62,8 +62,8 @@ For a detailed solution implementation guide, refer to Solution Landing Page [De
## Prerequisites for Customization

- [AWS Command Line Interface](https://aws.amazon.com/cli/)
- Python 3.9
- NodeJS 16
- Python 3.11
- NodeJS 20

<a name="build"></a>

Expand Down Expand Up @@ -269,7 +269,7 @@ DevOps Monitoring Dashboard on AWS solution consists of:

# Collection of operational metrics

This solution collects anonymous operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/aws-devops-monitoring-dashboard/collection-of-operational-metrics.html).
This solution collects anonymoized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/aws-devops-monitoring-dashboard/collection-of-operational-metrics.html).

<a name="license"></a>

Expand Down
2 changes: 1 addition & 1 deletion deployment/cdk-solution-helper/README.md
Expand Up @@ -27,7 +27,7 @@ Before:
"S3Key": "5efbeaf6fad70c6f155399d9bb43debfa8efd4a4c9b5e055a103fe7b12754e76.zip"
},
"Handler": "index.handler",
"Runtime": "nodejs16.x"
"Runtime": "nodejs20.x"
},
...
}
Expand Down
12 changes: 12 additions & 0 deletions solution-manifest.yaml
@@ -0,0 +1,12 @@
---
id: SO0143 # Solution Id
name: devops-monitoring-dashboard-on-aws # trademarked name
version: v1.8.6 # current version of the solution. Used to verify template headers
cloudformation_templates: # This list should match with AWS CloudFormation templates section of IG
- template: aws-devops-monitoring-dashboard.template
main_template: true
- template: sharing-account-stack.template
- template: pipeline-alarm.template
- template: canary-alarm.template
build_environment:
build_image: 'aws/codebuild/standard:7.0' # Options include: 'aws/codebuild/standard:5.0','aws/codebuild/standard:6.0','aws/codebuild/standard:7.0','aws/codebuild/amazonlinux2-x86_64-standard:4.0','aws/codebuild/amazonlinux2-x86_64-standard:5.0'
6 changes: 3 additions & 3 deletions source/bin/aws_devops_monitoring_dashboard.ts
Expand Up @@ -19,7 +19,7 @@ const SOLUTION_NAME = process.env['SOLUTION_NAME'] || 'undefined';
const DIST_VERSION = process.env['DIST_VERSION'] || '%%VERSION%%';
const DIST_OUTPUT_BUCKET = process.env['DIST_OUTPUT_BUCKET'] || '%%BUCKET%%';
const DIST_SOLUTION_NAME = process.env['DIST_SOLUTION_NAME'] || '%%SOLUTION%%';
const LAMBDA_RUNTIME_NODEJS = lambda.Runtime.NODEJS_16_X;
const LAMBDA_RUNTIME_NODEJS = lambda.Runtime.NODEJS_20_X;
const TEMPLATE_FORMAT_VERSION = '2010-09-09';

const app = new cdk.App();
Expand Down Expand Up @@ -48,7 +48,7 @@ const devopsDashboardStack = new DevOpsDashboardStack(app, 'aws-devops-monitorin
solutionName: SOLUTION_NAME,
solutionDistBucket: DIST_OUTPUT_BUCKET,
solutionDistName: DIST_SOLUTION_NAME,
lambdaRuntimeNode: LAMBDA_RUNTIME_NODEJS
lambdaRuntimeNode: LAMBDA_RUNTIME_NODEJS,
});

/* Stack for creating codepipeline alarm */
Expand All @@ -72,7 +72,7 @@ const sharingAccountStack = new SharingAccountStack(app, 'sharing-account-stack'
solutionName: SOLUTION_NAME,
solutionDistBucket: DIST_OUTPUT_BUCKET,
solutionDistName: DIST_SOLUTION_NAME,
lambdaRuntimeNode: LAMBDA_RUNTIME_NODEJS
lambdaRuntimeNode: LAMBDA_RUNTIME_NODEJS,
});

const appRegister = new AppRegister({
Expand Down
6 changes: 3 additions & 3 deletions source/lambda/event_parser/lib/secrets_manager.js
Expand Up @@ -4,12 +4,12 @@
'use strict';

const LOGGER = new (require('./logger'))();
const AWS = require('aws-sdk');
const { SecretsManager } = require('@aws-sdk/client-secrets-manager');

const options = {
customUserAgent: process.env.userAgentExtra
};
const secretsManager = new AWS.SecretsManager(options);
const secretsManager = new SecretsManager(options);

const secretMap = new Map();

Expand All @@ -29,7 +29,7 @@ const getSecret = async secretId => {
let secret;

try {
const response = await secretsManager.getSecretValue(params).promise();
const response = await secretsManager.getSecretValue(params);
secret = response.SecretString;
secretMap.set(secretId, secret);
} catch (error) {
Expand Down

0 comments on commit 0c9c692

Please sign in to comment.