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

Jump to bottom

Secure queues with server side encryption #216

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Secure queues with server side encryption #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec0b0d0
prefer imports over requires
tuoruu Mar 3, 2023
e6369a3
added server-side encryption for all queues
tuoruu Mar 3, 2023
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
41 changes: 24 additions & 17 deletions cdk/lib/amis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { App, Duration, Token, StackProps } from 'aws-cdk-lib';
import dynamodb = require("aws-cdk-lib/aws-dynamodb");
import events = require("aws-cdk-lib/aws-events");
import targets = require("aws-cdk-lib/aws-events-targets");
import lambda = require("aws-cdk-lib/aws-lambda");
import s3assets = require("aws-cdk-lib/aws-s3-assets");
import sqs = require("aws-cdk-lib/aws-sqs");
import sns = require("aws-cdk-lib/aws-sns");
import snsSubs = require("aws-cdk-lib/aws-sns-subscriptions")
import iam = require("aws-cdk-lib/aws-iam");
import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
import * as events from 'aws-cdk-lib/aws-events';
import * as targets from 'aws-cdk-lib/aws-events-targets';
import * as lambda from 'aws-cdk-lib/aws-lambda';
import * as s3assets from 'aws-cdk-lib/aws-s3-assets';
import * as sqs from 'aws-cdk-lib/aws-sqs';
import * as sns from 'aws-cdk-lib/aws-sns';
import * as snsSubs from 'aws-cdk-lib/aws-sns-subscriptions';
import * as iam from 'aws-cdk-lib/aws-iam';
import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
import { CfnEventSourceMapping } from "aws-cdk-lib/aws-lambda";
import {HeratepalveluStack} from "./heratepalvelu";
import { HeratepalveluStack } from "./heratepalvelu";



Expand Down Expand Up @@ -128,7 +128,8 @@ export class HeratepalveluAMISStack extends HeratepalveluStack {

const herateDeadLetterQueue = new sqs.Queue(this, "HerateDeadLetterQueue", {
retentionPeriod: Duration.days(14),
visibilityTimeout: (Duration.seconds(60))
visibilityTimeout: Duration.seconds(60),
encryption: sqs.QueueEncryption.SQS_MANAGED
});

const ehoksHerateQueue = new sqs.Queue(this, "HerateQueue", {
Expand All @@ -138,12 +139,14 @@ export class HeratepalveluAMISStack extends HeratepalveluStack {
maxReceiveCount: 5
},
visibilityTimeout: Duration.seconds(60),
retentionPeriod: Duration.days(14)
retentionPeriod: Duration.days(14),
encryption: sqs.QueueEncryption.SQS_MANAGED
});

const ONRhenkilomodifyDLQ = new sqs.Queue(this, "ONRhenkilomodifyDLQ", {
retentionPeriod: Duration.days(14),
visibilityTimeout: (Duration.seconds(60))
visibilityTimeout: Duration.seconds(60),
encryption: sqs.QueueEncryption.SQS_MANAGED
});

const ONRhenkilomodifyQueue = new sqs.Queue(this, "ONRhenkilomodifyQueue", {
Expand All @@ -153,7 +156,8 @@ export class HeratepalveluAMISStack extends HeratepalveluStack {
maxReceiveCount: 5
},
visibilityTimeout: Duration.seconds(60),
retentionPeriod: Duration.days(14)
retentionPeriod: Duration.days(14),
encryption: sqs.QueueEncryption.SQS_MANAGED
});

const ONRhenkilomodifyTopic = sns.Topic.fromTopicArn(this, "ONRhenkilomodifyTopic",
Expand All @@ -162,7 +166,8 @@ export class HeratepalveluAMISStack extends HeratepalveluStack {
ONRhenkilomodifyTopic.addSubscription(new snsSubs.SqsSubscription(ONRhenkilomodifyQueue));

const ehoksAmisResendDLQueue = new sqs.Queue(this, "AmisResendDLQueue", {
retentionPeriod: Duration.days(14)
retentionPeriod: Duration.days(14),
encryption: sqs.QueueEncryption.SQS_MANAGED
});

const ehoksAmisResendQueue = new sqs.Queue(this, "AmisResendQueue", {
Expand All @@ -172,7 +177,8 @@ export class HeratepalveluAMISStack extends HeratepalveluStack {
maxReceiveCount: 5
},
visibilityTimeout: Duration.seconds(60),
retentionPeriod: Duration.days(14)
retentionPeriod: Duration.days(14),
encryption: sqs.QueueEncryption.SQS_MANAGED
});

const deleteTunnusDLQueue = new sqs.Queue(this, "AmisDeleteTunnusDLQueue", {
Expand All @@ -186,7 +192,8 @@ export class HeratepalveluAMISStack extends HeratepalveluStack {
maxReceiveCount: 5
},
visibilityTimeout: Duration.seconds(60),
retentionPeriod: Duration.days(14)
retentionPeriod: Duration.days(14),
encryption: sqs.QueueEncryption.SQS_MANAGED
});

const ehoksHerateAsset = new s3assets.Asset(
Expand Down
2 changes: 1 addition & 1 deletion cdk/lib/heratepalvelu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Stack, App, StackProps, Tags } from 'aws-cdk-lib';
import ssm = require("aws-cdk-lib/aws-ssm");
import * as ssm from 'aws-cdk-lib/aws-ssm';

export type EnvVars = {
virkailija_url: string
Expand Down
20 changes: 11 additions & 9 deletions cdk/lib/tep.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { App, Duration, Token, StackProps } from 'aws-cdk-lib';
import dynamodb = require("aws-cdk-lib/aws-dynamodb");
import events = require("aws-cdk-lib/aws-events");
import targets = require("aws-cdk-lib/aws-events-targets");
import lambda = require("aws-cdk-lib/aws-lambda");
import s3assets = require("aws-cdk-lib/aws-s3-assets");
import sqs = require("aws-cdk-lib/aws-sqs");
import iam = require("aws-cdk-lib/aws-iam");
import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
import * as events from 'aws-cdk-lib/aws-events';
import * as targets from 'aws-cdk-lib/aws-events-targets';
import * as lambda from 'aws-cdk-lib/aws-lambda';
import * as s3assets from 'aws-cdk-lib/aws-s3-assets';
import * as sqs from 'aws-cdk-lib/aws-sqs';
import * as iam from 'aws-cdk-lib/aws-iam';
import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
import { HeratepalveluStack } from "./heratepalvelu";
import { CfnEventSourceMapping } from "aws-cdk-lib/aws-lambda";
Expand Down Expand Up @@ -205,7 +205,8 @@ export class HeratepalveluTEPStack extends HeratepalveluStack {

const herateDeadLetterQueue = new sqs.Queue(this, "HerateDLQ", {
retentionPeriod: Duration.days(14),
visibilityTimeout: (Duration.seconds(60))
visibilityTimeout: Duration.seconds(60),
encryption: sqs.QueueEncryption.SQS_MANAGED
});

const herateQueue = new sqs.Queue(this, "HerateQueue", {
Expand All @@ -215,7 +216,8 @@ export class HeratepalveluTEPStack extends HeratepalveluStack {
maxReceiveCount: 5
},
visibilityTimeout: Duration.seconds(60),
retentionPeriod: Duration.days(14)
retentionPeriod: Duration.days(14),
encryption: sqs.QueueEncryption.SQS_MANAGED
});

// S3
Expand Down
16 changes: 9 additions & 7 deletions cdk/lib/teprah.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { App, Duration, Token, StackProps } from 'aws-cdk-lib';
import dynamodb = require("aws-cdk-lib/aws-dynamodb");
import lambda = require("aws-cdk-lib/aws-lambda");
import s3assets = require("aws-cdk-lib/aws-s3-assets");
import sqs = require("aws-cdk-lib/aws-sqs");
import iam = require("aws-cdk-lib/aws-iam");
import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
import * as lambda from 'aws-cdk-lib/aws-lambda';
import * as s3assets from 'aws-cdk-lib/aws-s3-assets';
import * as sqs from 'aws-cdk-lib/aws-sqs';
import * as iam from 'aws-cdk-lib/aws-iam';
import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
import { HeratepalveluStack } from "./heratepalvelu";

Expand All @@ -22,7 +22,8 @@ export class HeratepalveluTEPRAHOITUSStack extends HeratepalveluStack {

const tepRahoitusDLQ = new sqs.Queue(this, "RahoitusLaskentaDLQ", {
retentionPeriod: Duration.days(14),
visibilityTimeout: (Duration.seconds(60))
visibilityTimeout: Duration.seconds(60),
encryption: sqs.QueueEncryption.SQS_MANAGED
});

const tepRahoitusQueue = new sqs.Queue(this, "RahoitusLaskentaQueue", {
Expand All @@ -32,7 +33,8 @@ export class HeratepalveluTEPRAHOITUSStack extends HeratepalveluStack {
maxReceiveCount: 5
},
visibilityTimeout: Duration.seconds(90),
retentionPeriod: Duration.days(14)
retentionPeriod: Duration.days(14),
encryption: sqs.QueueEncryption.SQS_MANAGED
});


Expand Down
8 changes: 4 additions & 4 deletions cdk/lib/tpk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { App, Duration, Token, StackProps } from 'aws-cdk-lib';
import dynamodb = require("aws-cdk-lib/aws-dynamodb");
import lambda = require("aws-cdk-lib/aws-lambda");
import s3assets = require("aws-cdk-lib/aws-s3-assets");
import iam = require("aws-cdk-lib/aws-iam");
import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
import * as lambda from 'aws-cdk-lib/aws-lambda';
import * as s3assets from 'aws-cdk-lib/aws-s3-assets';
import * as iam from 'aws-cdk-lib/aws-iam';
import { HeratepalveluStack } from "./heratepalvelu";

export class HeratepalveluTPKStack extends HeratepalveluStack {
Expand Down