Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1620 from benjolitz/patch-1

Browse Source 
Allow dashes, underscores in SNS topic creates for first/last characters
This commit is contained in:
Steve Pulec 2018-05-29 21:47:26 -04:00 committed by GitHub
commit ffde404f2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/sns/models.py
View File

@ -240,7 +240,7 @@ class SNSBackend(BaseBackend):
self.sms_attributes.update(attrs) self.sms_attributes.update(attrs)
def create_topic(self, name): def create_topic(self, name):
fails_constraints = not re.match(r'^[a-zA-Z0-9](?:[A-Za-z0-9_-]{0,253}[a-zA-Z0-9])?$', name) fails_constraints = not re.match(r'^[a-zA-Z0-9_-]{1,256}$', name)
if fails_constraints: if fails_constraints:
raise InvalidParameterValue("Topic names must be made up of only uppercase and lowercase ASCII letters, numbers, underscores, and hyphens, and must be between 1 and 256 characters long.") raise InvalidParameterValue("Topic names must be made up of only uppercase and lowercase ASCII letters, numbers, underscores, and hyphens, and must be between 1 and 256 characters long.")
candidate_topic = Topic(name, self) candidate_topic = Topic(name, self)

29
tests/test_sns/test_topics_boto3.py
View File

@ -13,23 +13,24 @@ from moto.sns.models import DEFAULT_TOPIC_POLICY, DEFAULT_EFFECTIVE_DELIVERY_POL
@mock_sns @mock_sns
def test_create_and_delete_topic(): def test_create_and_delete_topic():
conn = boto3.client("sns", region_name="us-east-1") conn = boto3.client("sns", region_name="us-east-1")
conn.create_topic(Name="some-topic") for topic_name in ('some-topic', '-some-topic-', '_some-topic_', 'a' * 256):
conn.create_topic(Name=topic_name)
topics_json = conn.list_topics() topics_json = conn.list_topics()
topics = topics_json["Topics"] topics = topics_json["Topics"]
topics.should.have.length_of(1) topics.should.have.length_of(1)
topics[0]['TopicArn'].should.equal( topics[0]['TopicArn'].should.equal(
"arn:aws:sns:{0}:123456789012:some-topic" "arn:aws:sns:{0}:123456789012:{1}"
.format(conn._client_config.region_name) .format(conn._client_config.region_name, topic_name)
) )
# Delete the topic # Delete the topic
conn.delete_topic(TopicArn=topics[0]['TopicArn']) conn.delete_topic(TopicArn=topics[0]['TopicArn'])
# And there should now be 0 topics # And there should now be 0 topics
topics_json = conn.list_topics() topics_json = conn.list_topics()
topics = topics_json["Topics"] topics = topics_json["Topics"]
topics.should.have.length_of(0) topics.should.have.length_of(0)
@mock_sns @mock_sns
def test_create_topic_should_be_indempodent(): def test_create_topic_should_be_indempodent():