From 6a7186e53235b358d801f60ddcb9c44fe534c609 Mon Sep 17 00:00:00 2001 From: Andreas Wittig Date: Tue, 17 Dec 2024 09:59:25 +0100 Subject: [PATCH 1/6] Fixing EC2 + MySQL example --- examples/ec2-mysql/example.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/ec2-mysql/example.yml b/examples/ec2-mysql/example.yml index f3d4c40..c1972e4 100644 --- a/examples/ec2-mysql/example.yml +++ b/examples/ec2-mysql/example.yml @@ -45,6 +45,7 @@ Resources: VpcModule: !GetAtt 'Vpc.Outputs.StackName' ClientSgModule: !GetAtt 'ClientSg.Outputs.StackName' AlertingModule: !GetAtt 'Alerting.Outputs.StackName' + EngineVersion: '8.4.3' DBMasterUserPassword: insecure DBBackupRetentionPeriod: '0' # speed up the example (do not set to 0 in production!) DBMultiAZ: 'false' # speed up the example (do not set to false in production!) From 57817c09359492544ba448a03066a2bb2912c9b8 Mon Sep 17 00:00:00 2001 From: Andreas Wittig Date: Tue, 17 Dec 2024 11:56:49 +0100 Subject: [PATCH 2/6] Fixing Postgres module --- examples/ec2-postgres/package-lock.json | 15 ++++++++------- examples/ec2-postgres/package.json | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/examples/ec2-postgres/package-lock.json b/examples/ec2-postgres/package-lock.json index 1ee8079..15d0fde 100644 --- a/examples/ec2-postgres/package-lock.json +++ b/examples/ec2-postgres/package-lock.json @@ -12,7 +12,7 @@ "@cfn-modules/alerting": "1.2.2", "@cfn-modules/client-sg": "1.0.0", "@cfn-modules/ec2-instance-amazon-linux": "2.4.0", - "@cfn-modules/rds-postgres": "2.3.1", + "@cfn-modules/rds-postgres": "2.4.0", "@cfn-modules/vpc": "2.3.0" } }, @@ -32,12 +32,13 @@ "integrity": "sha512-goPxpZ+viDjj7JfQ0ssktRZbOvQFsW7ZjIuu9Xu0BVp1gxL4I8LW1P1mJfdKPp1QxnTUB44l+ciI3lVm8MhRrw==" }, "node_modules/@cfn-modules/rds-postgres": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@cfn-modules/rds-postgres/-/rds-postgres-2.3.1.tgz", - "integrity": "sha512-RIqmI0qxXFc0tqRotZo4e8p+OQ43RRUX4yc0ya083mQPZ7OIuk+3xEcE6GK76yb5652iotFSLT/fdDqgn5mJ9A==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@cfn-modules/rds-postgres/-/rds-postgres-2.4.0.tgz", + "integrity": "sha512-QKHVhjegtdUkWnQpEHKzF/krF78jMaxyTtgFbktly5d5llWdxCljHcsZW6+85+ZpE6Z9YoujHxIY3KkKZIP4uA==", "bundleDependencies": [ "@cfn-modules/rds-instance" ], + "license": "Apache-2.0", "dependencies": { "@cfn-modules/rds-instance": "^1.5.0" } @@ -97,9 +98,9 @@ "integrity": "sha512-goPxpZ+viDjj7JfQ0ssktRZbOvQFsW7ZjIuu9Xu0BVp1gxL4I8LW1P1mJfdKPp1QxnTUB44l+ciI3lVm8MhRrw==" }, "@cfn-modules/rds-postgres": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@cfn-modules/rds-postgres/-/rds-postgres-2.3.1.tgz", - "integrity": "sha512-RIqmI0qxXFc0tqRotZo4e8p+OQ43RRUX4yc0ya083mQPZ7OIuk+3xEcE6GK76yb5652iotFSLT/fdDqgn5mJ9A==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@cfn-modules/rds-postgres/-/rds-postgres-2.4.0.tgz", + "integrity": "sha512-QKHVhjegtdUkWnQpEHKzF/krF78jMaxyTtgFbktly5d5llWdxCljHcsZW6+85+ZpE6Z9YoujHxIY3KkKZIP4uA==", "requires": { "@cfn-modules/rds-instance": "^1.5.0" } diff --git a/examples/ec2-postgres/package.json b/examples/ec2-postgres/package.json index 9fba51a..0cd345f 100644 --- a/examples/ec2-postgres/package.json +++ b/examples/ec2-postgres/package.json @@ -8,7 +8,7 @@ "dependencies": { "@cfn-modules/alerting": "1.2.2", "@cfn-modules/vpc": "2.3.0", - "@cfn-modules/rds-postgres": "2.3.1", + "@cfn-modules/rds-postgres": "2.4.0", "@cfn-modules/client-sg": "1.0.0", "@cfn-modules/ec2-instance-amazon-linux": "2.4.0" } From 91100329080e3e2c69efa3e7f43abb2b5ee95d95 Mon Sep 17 00:00:00 2001 From: Andreas Wittig Date: Wed, 18 Dec 2024 10:49:34 +0100 Subject: [PATCH 3/6] Fix --- examples/ec2-postgres/package-lock.json | 18 +++++++++--------- examples/ec2-postgres/package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/ec2-postgres/package-lock.json b/examples/ec2-postgres/package-lock.json index 15d0fde..2d77736 100644 --- a/examples/ec2-postgres/package-lock.json +++ b/examples/ec2-postgres/package-lock.json @@ -12,7 +12,7 @@ "@cfn-modules/alerting": "1.2.2", "@cfn-modules/client-sg": "1.0.0", "@cfn-modules/ec2-instance-amazon-linux": "2.4.0", - "@cfn-modules/rds-postgres": "2.4.0", + "@cfn-modules/rds-postgres": "2.4.2", "@cfn-modules/vpc": "2.3.0" } }, @@ -32,15 +32,15 @@ "integrity": "sha512-goPxpZ+viDjj7JfQ0ssktRZbOvQFsW7ZjIuu9Xu0BVp1gxL4I8LW1P1mJfdKPp1QxnTUB44l+ciI3lVm8MhRrw==" }, "node_modules/@cfn-modules/rds-postgres": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@cfn-modules/rds-postgres/-/rds-postgres-2.4.0.tgz", - "integrity": "sha512-QKHVhjegtdUkWnQpEHKzF/krF78jMaxyTtgFbktly5d5llWdxCljHcsZW6+85+ZpE6Z9YoujHxIY3KkKZIP4uA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@cfn-modules/rds-postgres/-/rds-postgres-2.4.2.tgz", + "integrity": "sha512-8oZm/UjDf5tRre4CnbwovXh8Y/+mKfqbEANUSAqaCbjvQHJNLKax+JAdww2c8WV8RlRMKbZDrpCtMG0Eu5RX9Q==", "bundleDependencies": [ "@cfn-modules/rds-instance" ], "license": "Apache-2.0", "dependencies": { - "@cfn-modules/rds-instance": "^1.5.0" + "@cfn-modules/rds-instance": "1.5.0" } }, "node_modules/@cfn-modules/vpc": { @@ -98,11 +98,11 @@ "integrity": "sha512-goPxpZ+viDjj7JfQ0ssktRZbOvQFsW7ZjIuu9Xu0BVp1gxL4I8LW1P1mJfdKPp1QxnTUB44l+ciI3lVm8MhRrw==" }, "@cfn-modules/rds-postgres": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@cfn-modules/rds-postgres/-/rds-postgres-2.4.0.tgz", - "integrity": "sha512-QKHVhjegtdUkWnQpEHKzF/krF78jMaxyTtgFbktly5d5llWdxCljHcsZW6+85+ZpE6Z9YoujHxIY3KkKZIP4uA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@cfn-modules/rds-postgres/-/rds-postgres-2.4.2.tgz", + "integrity": "sha512-8oZm/UjDf5tRre4CnbwovXh8Y/+mKfqbEANUSAqaCbjvQHJNLKax+JAdww2c8WV8RlRMKbZDrpCtMG0Eu5RX9Q==", "requires": { - "@cfn-modules/rds-instance": "^1.5.0" + "@cfn-modules/rds-instance": "1.5.0" } }, "@cfn-modules/vpc": { diff --git a/examples/ec2-postgres/package.json b/examples/ec2-postgres/package.json index 0cd345f..ba5fef2 100644 --- a/examples/ec2-postgres/package.json +++ b/examples/ec2-postgres/package.json @@ -8,7 +8,7 @@ "dependencies": { "@cfn-modules/alerting": "1.2.2", "@cfn-modules/vpc": "2.3.0", - "@cfn-modules/rds-postgres": "2.4.0", + "@cfn-modules/rds-postgres": "2.4.2", "@cfn-modules/client-sg": "1.0.0", "@cfn-modules/ec2-instance-amazon-linux": "2.4.0" } From 4f62c0261b9e8ffa2487a97e0d05c06c8e3fc6bb Mon Sep 17 00:00:00 2001 From: Andreas Wittig Date: Wed, 18 Dec 2024 12:54:42 +0100 Subject: [PATCH 4/6] Final fix --- examples/ec2-postgres/package-lock.json | 29 +++++++++++++++++-------- examples/ec2-postgres/package.json | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/examples/ec2-postgres/package-lock.json b/examples/ec2-postgres/package-lock.json index 2d77736..df1479b 100644 --- a/examples/ec2-postgres/package-lock.json +++ b/examples/ec2-postgres/package-lock.json @@ -12,7 +12,7 @@ "@cfn-modules/alerting": "1.2.2", "@cfn-modules/client-sg": "1.0.0", "@cfn-modules/ec2-instance-amazon-linux": "2.4.0", - "@cfn-modules/rds-postgres": "2.4.2", + "@cfn-modules/rds-postgres": "2.4.6", "@cfn-modules/vpc": "2.3.0" } }, @@ -32,17 +32,22 @@ "integrity": "sha512-goPxpZ+viDjj7JfQ0ssktRZbOvQFsW7ZjIuu9Xu0BVp1gxL4I8LW1P1mJfdKPp1QxnTUB44l+ciI3lVm8MhRrw==" }, "node_modules/@cfn-modules/rds-postgres": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@cfn-modules/rds-postgres/-/rds-postgres-2.4.2.tgz", - "integrity": "sha512-8oZm/UjDf5tRre4CnbwovXh8Y/+mKfqbEANUSAqaCbjvQHJNLKax+JAdww2c8WV8RlRMKbZDrpCtMG0Eu5RX9Q==", + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/@cfn-modules/rds-postgres/-/rds-postgres-2.4.6.tgz", + "integrity": "sha512-187UkVIsNYhxl9uHwW0dz2t/Q1XOWy4JByyt4a8UVMbP6mH8Ta5CP8MaPk6u89oQzvKb8tSGzR0u5EH4cG+KpA==", "bundleDependencies": [ "@cfn-modules/rds-instance" ], "license": "Apache-2.0", "dependencies": { - "@cfn-modules/rds-instance": "1.5.0" + "@cfn-modules/rds-instance": "^1.5.0" } }, + "node_modules/@cfn-modules/rds-postgres/node_modules/@cfn-modules/rds-instance": { + "version": "1.5.0", + "inBundle": true, + "license": "Apache-2.0" + }, "node_modules/@cfn-modules/vpc": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@cfn-modules/vpc/-/vpc-2.3.0.tgz", @@ -98,11 +103,17 @@ "integrity": "sha512-goPxpZ+viDjj7JfQ0ssktRZbOvQFsW7ZjIuu9Xu0BVp1gxL4I8LW1P1mJfdKPp1QxnTUB44l+ciI3lVm8MhRrw==" }, "@cfn-modules/rds-postgres": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@cfn-modules/rds-postgres/-/rds-postgres-2.4.2.tgz", - "integrity": "sha512-8oZm/UjDf5tRre4CnbwovXh8Y/+mKfqbEANUSAqaCbjvQHJNLKax+JAdww2c8WV8RlRMKbZDrpCtMG0Eu5RX9Q==", + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/@cfn-modules/rds-postgres/-/rds-postgres-2.4.6.tgz", + "integrity": "sha512-187UkVIsNYhxl9uHwW0dz2t/Q1XOWy4JByyt4a8UVMbP6mH8Ta5CP8MaPk6u89oQzvKb8tSGzR0u5EH4cG+KpA==", "requires": { - "@cfn-modules/rds-instance": "1.5.0" + "@cfn-modules/rds-instance": "^1.5.0" + }, + "dependencies": { + "@cfn-modules/rds-instance": { + "version": "1.5.0", + "bundled": true + } } }, "@cfn-modules/vpc": { diff --git a/examples/ec2-postgres/package.json b/examples/ec2-postgres/package.json index ba5fef2..06fd788 100644 --- a/examples/ec2-postgres/package.json +++ b/examples/ec2-postgres/package.json @@ -8,7 +8,7 @@ "dependencies": { "@cfn-modules/alerting": "1.2.2", "@cfn-modules/vpc": "2.3.0", - "@cfn-modules/rds-postgres": "2.4.2", + "@cfn-modules/rds-postgres": "2.4.6", "@cfn-modules/client-sg": "1.0.0", "@cfn-modules/ec2-instance-amazon-linux": "2.4.0" } From 9b07c35ea79539153572d03fdf6e29c6f2ac9e27 Mon Sep 17 00:00:00 2001 From: Andreas Wittig Date: Thu, 19 Dec 2024 09:03:59 +0100 Subject: [PATCH 5/6] Fixing RDS Postgres test --- examples/ec2-postgres/example.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ec2-postgres/example.yml b/examples/ec2-postgres/example.yml index e9c1186..dffdb61 100644 --- a/examples/ec2-postgres/example.yml +++ b/examples/ec2-postgres/example.yml @@ -49,7 +49,7 @@ Resources: DBMasterUserPassword: insecure DBBackupRetentionPeriod: '0' # speed up the example (do not set to 0 in production!) DBMultiAZ: 'false' # speed up the example (do not set to false in production!) - EngineVersion: '14.2' + EngineVersion: '17.2' TemplateURL: './node_modules/@cfn-modules/rds-postgres/module.yml' Instance: Type: 'AWS::CloudFormation::Stack' From d75d6bacc79ae6f275701eddfb64096c2df72400 Mon Sep 17 00:00:00 2001 From: Andreas Wittig Date: Thu, 19 Dec 2024 10:38:29 +0100 Subject: [PATCH 6/6] Fix --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6b1c6a1..6f0e1e8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,6 +18,7 @@ jobs: with: role-to-assume: 'arn:aws:iam::068189904525:role/github-openid-connect' aws-region: 'eu-west-1' + role-duration-seconds: 7200 - uses: actions/setup-node@v4 with: node-version: '18.x'