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

RDS - Dont return empty DBClusterIdentifier (#5119)

Browse Source
This commit is contained in:
Bert Blommers 2022-05-11 09:15:28 +00:00 committed by GitHub
parent 08d705aa99
commit 3e31e49c83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/rds/models.py
View File

@ -506,7 +506,7 @@ class Database(CloudFormationModel):
</VpcSecurityGroupMembership> </VpcSecurityGroupMembership>
{% endfor %} {% endfor %}
</VpcSecurityGroups> </VpcSecurityGroups>
<DBClusterIdentifier>{{ database.db_cluster_identifier }}</DBClusterIdentifier> {% if database.db_cluster_identifier %}<DBClusterIdentifier>{{ database.db_cluster_identifier }}</DBClusterIdentifier>{% endif %}
<DBInstanceIdentifier>{{ database.db_instance_identifier }}</DBInstanceIdentifier> <DBInstanceIdentifier>{{ database.db_instance_identifier }}</DBInstanceIdentifier>
<DbiResourceId>{{ database.dbi_resource_id }}</DbiResourceId> <DbiResourceId>{{ database.dbi_resource_id }}</DbiResourceId>
<InstanceCreateTime>{{ database.instance_create_time }}</InstanceCreateTime> <InstanceCreateTime>{{ database.instance_create_time }}</InstanceCreateTime>
@ -758,7 +758,7 @@ class Database(CloudFormationModel):
"BackupRetentionPeriod": "{{ database.backup_retention_period }}", "BackupRetentionPeriod": "{{ database.backup_retention_period }}",
"CharacterSetName": {%- if database.character_set_name -%}{{ database.character_set_name }}{%- else %} null{%- endif -%}, "CharacterSetName": {%- if database.character_set_name -%}{{ database.character_set_name }}{%- else %} null{%- endif -%},
"DBInstanceClass": "{{ database.db_instance_class }}", "DBInstanceClass": "{{ database.db_instance_class }}",
"DBClusterIdentifier": "{{ database.db_cluster_identifier }}", {%- if database.db_cluster_identifier -%}"DBClusterIdentifier": "{{ database.db_cluster_identifier }}",{%- endif -%}
"DBInstanceIdentifier": "{{ database.db_instance_identifier }}", "DBInstanceIdentifier": "{{ database.db_instance_identifier }}",
"DBInstanceStatus": "{{ database.status }}", "DBInstanceStatus": "{{ database.status }}",
"DBName": {%- if database.db_name -%}"{{ database.db_name }}"{%- else %} null{%- endif -%}, "DBName": {%- if database.db_name -%}"{{ database.db_name }}"{%- else %} null{%- endif -%},

17
tests/test_rds/test_server.py
View File

@ -1,3 +1,4 @@
import json
import moto.server as server import moto.server as server
import sure # noqa # pylint: disable=unused-import import sure # noqa # pylint: disable=unused-import
@ -9,3 +10,19 @@ def test_list_databases():
res = test_client.get("/?Action=DescribeDBInstances") res = test_client.get("/?Action=DescribeDBInstances")
res.data.decode("utf-8").should.contain("<DescribeDBInstancesResult>") res.data.decode("utf-8").should.contain("<DescribeDBInstancesResult>")
def test_create_db_instance():
backend = server.create_backend_app("rds")
test_client = backend.test_client()
body = {
"DBInstanceIdentifier": "hi",
"DBInstanceClass": "db.m4.large",
"Engine": "aurora",
"StorageType": "standard",
"Port": 3306,
}
res = test_client.post("/?Action=CreateDBInstance", data=json.dumps(body))
res.data.decode("utf-8").shouldnt.contain("<DBClusterIdentifier>")