Skip to content

Commit 2b8412e

Browse files
Modernizing module (#13)
* Modernizing module * Updating Redis versions * Fixing parameter group
1 parent a20bb61 commit 2b8412e

File tree

4 files changed

+59
-18
lines changed

4 files changed

+59
-18
lines changed
Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
1-
name: CI
2-
3-
on: [push, pull_request]
4-
1+
name: Lint
2+
on:
3+
push:
4+
branches: [master]
5+
pull_request:
56
jobs:
67
build:
7-
runs-on: 'ubuntu-latest'
8-
8+
runs-on: ['ubuntu-latest']
99
steps:
10-
1110
- uses: 'actions/checkout@v2'
12-
1311
- uses: 'actions/setup-python@v2'
1412
with:
1513
python-version: '3.8'
16-
1714
- name: yamlllint
1815
run: |
19-
pip install yamllint==1.26.3
16+
pip install yamllint==1.35.1
2017
yamllint module.yml && yamllint test/*.yml
21-
2218
- name: cfn-lint
2319
run: |
24-
pip install cfn-lint==0.59.1
25-
cfn-lint -t module.yml && cfn-lint -t test/*.yml
26-
20+
pip install cfn-lint==1.20.1
21+
cfn-lint -i W3002 W1011 -t module.yml && cfn-lint -i W3002 W1011 -t test/*.yml
2722
- name: license
2823
run: |
2924
grep -q "LICENSE-2.0" module.yml

.github/workflows/test.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Test
2+
on:
3+
push:
4+
branches: [master]
5+
pull_request:
6+
permissions:
7+
id-token: write
8+
contents: read
9+
concurrency:
10+
group: test
11+
cancel-in-progress: false
12+
jobs:
13+
build:
14+
runs-on: ['ubuntu-latest']
15+
steps:
16+
- uses: 'actions/checkout@v2'
17+
- uses: aws-actions/configure-aws-credentials@v4
18+
with:
19+
role-to-assume: 'arn:aws:iam::068189904525:role/github-openid-connect'
20+
aws-region: 'eu-west-1'
21+
- uses: actions/setup-node@v4
22+
with:
23+
node-version: '18.x'
24+
- name: test
25+
run: |
26+
npm ci
27+
cd test
28+
npm ci
29+
CFN_PACKAGE_BUCKET_NAME=cf-templates-1a2zmgbg9ut4o-eu-west-1 npm test
30+
cd -

module.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,13 @@ Parameters:
3737
EngineVersion:
3838
Description: 'Redis version'
3939
Type: String
40-
Default: '5.0.5'
40+
Default: '7.1'
4141
AllowedValues: # aws elasticache describe-cache-engine-versions --engine redis --query "CacheEngineVersions[].EngineVersion"
42-
- '5.0.5'
4342
- '5.0.6'
4443
- '6.0'
4544
- '6.2'
45+
- '7.0'
46+
- '7.1'
4647
CacheNodeType:
4748
Description: 'The compute and memory capacity of the nodes in the node group (shard).'
4849
Type: 'String'
@@ -97,14 +98,16 @@ Conditions:
9798
HasNotCacheParameterGroupName: !Not [!Condition HasCacheParameterGroupName]
9899
Mappings:
99100
EngineVersionMap:
100-
'5.0.5':
101-
CacheParameterGroupFamily: 'redis5.0'
102101
'5.0.6':
103102
CacheParameterGroupFamily: 'redis5.0'
104103
'6.0':
105104
CacheParameterGroupFamily: 'redis6.x'
106105
'6.2':
107106
CacheParameterGroupFamily: 'redis6.x'
107+
'7.0':
108+
CacheParameterGroupFamily: 'redis7'
109+
'7.1':
110+
CacheParameterGroupFamily: 'redis7'
108111
Resources:
109112
CacheParameterGroup:
110113
Condition: HasNotCacheParameterGroupName

package-lock.json

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)