@@ -27,14 +27,10 @@ def __init__(self, scope: Construct, construct_id: str, source_kinesis_stream_ar
27
27
bucket_name = "web-analytics-{region}-{suffix}" .format (
28
28
region = cdk .Aws .REGION , suffix = S3_BUCKET_SUFFIX ))
29
29
30
- FIREHOSE_STREAM_NAME = cdk .CfnParameter (self , 'FirehoseStreamName' ,
31
- type = 'String' ,
32
- description = 'kinesis data firehose name' ,
33
- default = 'PUT-S3-{}' .format ('' .join (random .sample ((string .ascii_letters ), k = 5 )))
34
- )
35
-
30
+ FIREHOSE_DEFAULT_STREAM_NAME = 'PUT-S3-{}' .format ('' .join (random .sample ((string .ascii_letters ), k = 5 )))
36
31
firehose_config = self .node .try_get_context ('firehose' )
37
32
33
+ FIREHOSE_STREAM_NAME = firehose_config .get ('stream_name' , FIREHOSE_DEFAULT_STREAM_NAME )
38
34
FIREHOSE_BUFFER_SIZE = firehose_config ['buffer_size_in_mbs' ]
39
35
FIREHOSE_BUFFER_INTERVAL = firehose_config ['buffer_interval_in_seconds' ]
40
36
FIREHOSE_LAMBDA_BUFFER_SIZE = firehose_config ['lambda_buffer_size_in_mbs' ]
@@ -87,7 +83,7 @@ def __init__(self, scope: Construct, construct_id: str, source_kinesis_stream_ar
87
83
"kinesis:GetRecords" ]
88
84
))
89
85
90
- firehose_log_group_name = f"/aws/kinesisfirehose/{ FIREHOSE_STREAM_NAME . value_as_string } "
86
+ firehose_log_group_name = f"/aws/kinesisfirehose/{ FIREHOSE_STREAM_NAME } "
91
87
firehose_role_policy_doc .add_statements (aws_iam .PolicyStatement (
92
88
effect = aws_iam .Effect .ALLOW ,
93
89
#XXX: The ARN will be formatted as follows:
@@ -112,7 +108,7 @@ def __init__(self, scope: Construct, construct_id: str, source_kinesis_stream_ar
112
108
113
109
firehose_role = aws_iam .Role (self , "KinesisFirehoseDeliveryRole" ,
114
110
role_name = "KinesisFirehoseServiceRole-{stream_name}-{region}" .format (
115
- stream_name = FIREHOSE_STREAM_NAME . value_as_string , region = cdk .Aws .REGION ),
111
+ stream_name = FIREHOSE_STREAM_NAME , region = cdk .Aws .REGION ),
116
112
assumed_by = aws_iam .ServicePrincipal ("firehose.amazonaws.com" ),
117
113
#XXX: use inline_policies to work around https://github.com/aws/aws-cdk/issues/5221
118
114
inline_policies = {
@@ -179,7 +175,7 @@ def __init__(self, scope: Construct, construct_id: str, source_kinesis_stream_ar
179
175
)
180
176
181
177
firehose_to_s3_delivery_stream = aws_kinesisfirehose .CfnDeliveryStream (self , "KinesisFirehoseToS3" ,
182
- delivery_stream_name = FIREHOSE_STREAM_NAME . value_as_string ,
178
+ delivery_stream_name = FIREHOSE_STREAM_NAME ,
183
179
delivery_stream_type = "KinesisStreamAsSource" ,
184
180
kinesis_stream_source_configuration = {
185
181
"kinesisStreamArn" : source_kinesis_stream_arn ,
0 commit comments