Skip to content

fix: Correct kafka property names in generated event source mapping #2549

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

Merged
merged 1 commit into from
Oct 14, 2022
Merged

fix: Correct kafka property names in generated event source mapping #2549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions samtranslator/model/eventsources/pull.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ def to_cloudformation(self, **kwargs):
if self.ConsumerGroupId:
consumer_group_id_structure = {"ConsumerGroupId": self.ConsumerGroupId}
if self.resource_type == "MSK":
lambda_eventsourcemapping.AmazonManagedKafkaConfig = consumer_group_id_structure
lambda_eventsourcemapping.AmazonManagedKafkaEventSourceConfig = consumer_group_id_structure
elif self.resource_type == "SelfManagedKafka":
lambda_eventsourcemapping.SelfManagedKafkaConfig = consumer_group_id_structure
lambda_eventsourcemapping.SelfManagedKafkaEventSourceConfig = consumer_group_id_structure
else:
raise InvalidEventException(
self.logical_id,
Expand Down
4 changes: 2 additions & 2 deletions samtranslator/model/lambda_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ class LambdaEventSourceMapping(Resource):
"FunctionResponseTypes": PropertyType(False, is_type(list)),
"SelfManagedEventSource": PropertyType(False, is_type(dict)),
"FilterCriteria": PropertyType(False, is_type(dict)),
"AmazonManagedKafkaConfig": PropertyType(False, is_type(dict)),
"SelfManagedKafkaConfig": PropertyType(False, is_type(dict)),
"AmazonManagedKafkaEventSourceConfig": PropertyType(False, is_type(dict)),
"SelfManagedKafkaEventSourceConfig": PropertyType(False, is_type(dict)),
}

runtime_attrs = {"name": lambda self: ref(self.logical_id)}
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/aws-cn/function_with_msk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"Topics": [
"MyDummyTestTopic"
],
"AmazonManagedKafkaConfig": {
"AmazonManagedKafkaEventSourceConfig": {
"ConsumerGroupId": "consumergroup1"
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/aws-cn/function_with_msk_with_intrinsics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"Topics": {
"Ref": "TopicsValue"
},
"AmazonManagedKafkaConfig": {
"AmazonManagedKafkaEventSourceConfig": {
"ConsumerGroupId": {
"Ref": "ConsumerGroupValue"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/aws-cn/function_with_self_managed_kafka.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
]
}
},
"SelfManagedKafkaConfig": {
"SelfManagedKafkaEventSourceConfig": {
"ConsumerGroupId": "consumergroup1"
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/aws-cn/self_managed_kafka_with_intrinsics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
}
}
},
"SelfManagedKafkaConfig": {
"SelfManagedKafkaEventSourceConfig": {
"ConsumerGroupId": {
"Ref": "ConsumerGroupValue"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/aws-us-gov/function_with_msk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"Topics": [
"MyDummyTestTopic"
],
"AmazonManagedKafkaConfig": {
"AmazonManagedKafkaEventSourceConfig": {
"ConsumerGroupId": "consumergroup1"
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/aws-us-gov/function_with_msk_with_intrinsics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"Topics": {
"Ref": "TopicsValue"
},
"AmazonManagedKafkaConfig": {
"AmazonManagedKafkaEventSourceConfig": {
"ConsumerGroupId": {
"Ref": "ConsumerGroupValue"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/aws-us-gov/function_with_self_managed_kafka.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
]
}
},
"SelfManagedKafkaConfig": {
"SelfManagedKafkaEventSourceConfig": {
"ConsumerGroupId": "consumergroup1"
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/aws-us-gov/self_managed_kafka_with_intrinsics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
}
}
},
"SelfManagedKafkaConfig": {
"SelfManagedKafkaEventSourceConfig": {
"ConsumerGroupId": {
"Ref": "ConsumerGroupValue"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/function_with_msk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"Topics": [
"MyDummyTestTopic"
],
"AmazonManagedKafkaConfig": {
"AmazonManagedKafkaEventSourceConfig": {
"ConsumerGroupId": "consumergroup1"
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/function_with_msk_with_intrinsics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"Topics": {
"Ref": "TopicsValue"
},
"AmazonManagedKafkaConfig": {
"AmazonManagedKafkaEventSourceConfig": {
"ConsumerGroupId": {
"Ref": "ConsumerGroupValue"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/function_with_self_managed_kafka.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
]
}
},
"SelfManagedKafkaConfig": {
"SelfManagedKafkaEventSourceConfig": {
"ConsumerGroupId": "consumergroup1"
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/self_managed_kafka_with_intrinsics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
}
}
},
"SelfManagedKafkaConfig": {
"SelfManagedKafkaEventSourceConfig": {
"ConsumerGroupId": {
"Ref": "ConsumerGroupValue"
}
Expand Down