Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
daknhh committed Oct 13, 2023
1 parent 0f5c860 commit 798c059
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 25 deletions.
13 changes: 5 additions & 8 deletions .github/workflows/test_ipSets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,22 @@ jobs:
steps:
- name: ⬇️ Checkout
uses: actions/checkout@v3
- name: 📦 Install Taskfile
- name: 📁 Install Taskfile
run: |
npm install -g @go-task/cli
# Install node.js since we need npm to install cdk
- name: Use Node.js
- name: ☊ Use Node.js
uses: actions/setup-node@v1
with:
node-version: '18.x'
# Cache node modules for subsequent runs to reduce build times
- name: Cache Node.js modules
- name: 💾 Cache Node.js modules
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
# Install cdk and typescript globally
- name: Install CDK and typescript globally
- name: 🌐 Install CDK and typescript globally
run: |
npm i -g aws-cdk typescript ts-node @types/node
npm link typescript
Expand All @@ -62,7 +59,7 @@ jobs:
aws-region: ${{ env.AWS_REGION }}
role-session-name: GitHubActionsSession
mask-aws-account-id: false
- name: Deploy Firewall to AWS
- name: 🔥 Deploy Firewall to AWS
run: |
export CDK_DEFAULT_ACCOUNT=${{ env.ACCOUNT_ID }}
export CDK_DEFAULT_REGION=${{ env.AWS_REGION }}
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/test_onlymanagedrulegroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,22 @@ jobs:
steps:
- name: ⬇️ Checkout
uses: actions/checkout@v3
- name: 📦 Install Taskfile
- name: 📁 Install Taskfile
run: |
npm install -g @go-task/cli
# Install node.js since we need npm to install cdk
- name: Use Node.js
- name: ☊ Use Node.js
uses: actions/setup-node@v1
with:
node-version: '18.x'
# Cache node modules for subsequent runs to reduce build times
- name: Cache Node.js modules
- name: 💾 Cache Node.js modules
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
# Install cdk and typescript globally
- name: Install CDK and typescript globally
- name: 🌐 Install CDK and typescript globally
run: |
npm i -g aws-cdk typescript ts-node @types/node
npm link typescript
Expand All @@ -62,7 +59,7 @@ jobs:
aws-region: ${{ env.AWS_REGION }}
role-session-name: GitHubActionsSession
mask-aws-account-id: false
- name: Deploy Firewall to AWS
- name: 🔥 Deploy Firewall to AWS
run: |
export CDK_DEFAULT_ACCOUNT=${{ env.ACCOUNT_ID }}
export CDK_DEFAULT_REGION=${{ env.AWS_REGION }}
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/test_regexPatternSets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,22 @@ jobs:
steps:
- name: ⬇️ Checkout
uses: actions/checkout@v3
- name: 📦 Install Taskfile
- name: 📁 Install Taskfile
run: |
npm install -g @go-task/cli
# Install node.js since we need npm to install cdk
- name: Use Node.js
- name: ☊ Use Node.js
uses: actions/setup-node@v1
with:
node-version: '18.x'
# Cache node modules for subsequent runs to reduce build times
- name: Cache Node.js modules
- name: 💾 Cache Node.js modules
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
# Install cdk and typescript globally
- name: Install CDK and typescript globally
- name: 🌐 Install CDK and typescript globally
run: |
npm i -g aws-cdk typescript ts-node @types/node
npm link typescript
Expand All @@ -62,7 +59,7 @@ jobs:
aws-region: ${{ env.AWS_REGION }}
role-session-name: GitHubActionsSession
mask-aws-account-id: false
- name: Deploy Firewall to AWS
- name: 🔥 Deploy Firewall to AWS
run: |
export CDK_DEFAULT_ACCOUNT=${{ env.ACCOUNT_ID }}
export CDK_DEFAULT_REGION=${{ env.AWS_REGION }}
Expand Down
2 changes: 1 addition & 1 deletion lib/firewall-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export class FirewallStack extends cdk.Stack {
managedRuleGroupVersionLambdaRole.addToPolicy(wafGetManagedRuleGroupVersion);

const managedRuleGroupVersionLambda = new NodejsFunction.NodejsFunction(this, "managedRuleGroupVersionLambdaFunction", {
entry: path.join(__dirname, "../lib/lambda/ManagedRuleGRoupVersion/index.ts"),
entry: path.join(__dirname, "../lib/lambda/ManagedRuleGroupVersion/index.ts"),
handler: "handler",
timeout: cdk.Duration.seconds(30),
architecture:lambda.Architecture.ARM_64,
Expand Down

0 comments on commit 798c059

Please sign in to comment.