Merge branch 'master' into ssm_docs
This commit is contained in:
Alex Bainbridge
commit
ccaa33504a
178
README.md
178
README.md
@ -58,95 +58,95 @@ With the decorator wrapping the test, all the calls to s3 are automatically mock
|
||||
It gets even better! Moto isn't just for Python code and it isn't just for S3. Look at the [standalone server mode](https://github.com/spulec/moto#stand-alone-server-mode) for more information about running Moto with other languages. Here's the status of the other AWS services implemented:
|
||||
|
||||
```gherkin
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Service Name | Decorator | Development Status |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| ACM | @mock_acm | all endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| API Gateway | @mock_apigateway | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Autoscaling | @mock_autoscaling | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Cloudformation | @mock_cloudformation | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Cloudwatch | @mock_cloudwatch | basic endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| CloudwatchEvents | @mock_events | all endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Cognito Identity | @mock_cognitoidentity | basic endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Cognito Identity Provider | @mock_cognitoidp | basic endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Config | @mock_config | basic endpoints done |
|
||||
| | | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Data Pipeline | @mock_datapipeline | basic endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| DynamoDB | @mock_dynamodb | core endpoints done |
|
||||
| DynamoDB2 | @mock_dynamodb2 | all endpoints + partial indexes |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| EC2 | @mock_ec2 | core endpoints done |
|
||||
| - AMI | | core endpoints done |
|
||||
| - EBS | | core endpoints done |
|
||||
| - Instances | | all endpoints done |
|
||||
| - Security Groups | | core endpoints done |
|
||||
| - Tags | | all endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| ECR | @mock_ecr | basic endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| ECS | @mock_ecs | basic endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| ELB | @mock_elb | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| ELBv2 | @mock_elbv2 | all endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| EMR | @mock_emr | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Glacier | @mock_glacier | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| IAM | @mock_iam | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| IoT | @mock_iot | core endpoints done |
|
||||
| | @mock_iotdata | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Kinesis | @mock_kinesis | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| KMS | @mock_kms | basic endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Lambda | @mock_lambda | basic endpoints done, requires |
|
||||
| | | docker |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Logs | @mock_logs | basic endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Organizations | @mock_organizations | some core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Polly | @mock_polly | all endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| RDS | @mock_rds | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| RDS2 | @mock_rds2 | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Redshift | @mock_redshift | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| Route53 | @mock_route53 | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| S3 | @mock_s3 | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| SecretsManager | @mock_secretsmanager | basic endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| SES | @mock_ses | all endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| SNS | @mock_sns | all endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| SQS | @mock_sqs | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| SSM | @mock_ssm | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| STS | @mock_sts | core endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| SWF | @mock_swf | basic endpoints done |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
| X-Ray | @mock_xray | all endpoints done |
|
||||
|-------------------------------------------------------------------------------------|-----------------------------|
|
||||
| Service Name | Decorator | Development Status | Comment |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| ACM | @mock_acm | all endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| API Gateway | @mock_apigateway | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Autoscaling | @mock_autoscaling | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Cloudformation | @mock_cloudformation | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Cloudwatch | @mock_cloudwatch | basic endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| CloudwatchEvents | @mock_events | all endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Cognito Identity | @mock_cognitoidentity | basic endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Cognito Identity Provider | @mock_cognitoidp | basic endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Config | @mock_config | basic endpoints done | |
|
||||
| | | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Data Pipeline | @mock_datapipeline | basic endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| DynamoDB | @mock_dynamodb | core endpoints done | API 20111205. Deprecated. |
|
||||
| DynamoDB2 | @mock_dynamodb2 | all endpoints + partial indexes | API 20120810 (Latest) |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| EC2 | @mock_ec2 | core endpoints done | |
|
||||
| - AMI | | core endpoints done | |
|
||||
| - EBS | | core endpoints done | |
|
||||
| - Instances | | all endpoints done | |
|
||||
| - Security Groups | | core endpoints done | |
|
||||
| - Tags | | all endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| ECR | @mock_ecr | basic endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| ECS | @mock_ecs | basic endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| ELB | @mock_elb | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| ELBv2 | @mock_elbv2 | all endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| EMR | @mock_emr | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Glacier | @mock_glacier | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| IAM | @mock_iam | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| IoT | @mock_iot | core endpoints done | |
|
||||
| | @mock_iotdata | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Kinesis | @mock_kinesis | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| KMS | @mock_kms | basic endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Lambda | @mock_lambda | basic endpoints done, requires | |
|
||||
| | | docker | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Logs | @mock_logs | basic endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Organizations | @mock_organizations | some core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Polly | @mock_polly | all endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| RDS | @mock_rds | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| RDS2 | @mock_rds2 | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Redshift | @mock_redshift | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| Route53 | @mock_route53 | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| S3 | @mock_s3 | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| SecretsManager | @mock_secretsmanager | basic endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| SES | @mock_ses | all endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| SNS | @mock_sns | all endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| SQS | @mock_sqs | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| SSM | @mock_ssm | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| STS | @mock_sts | core endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| SWF | @mock_swf | basic endpoints done | |
|
||||
|-------------------------------------------------------------------------------------| |
|
||||
| X-Ray | @mock_xray | all endpoints done | |
|
||||
|-------------------------------------------------------------------------------------|
|
||||
```
|
||||
|
||||
|
||||
@ -351,18 +351,21 @@ class CloudFormationResponse(BaseResponse):
|
||||
return template.render(exports=exports, next_token=next_token)
|
||||
|
||||
def validate_template(self):
|
||||
cfn_lint = self.cloudformation_backend.validate_template(
|
||||
self._get_param("TemplateBody")
|
||||
)
|
||||
template_body = self._get_param("TemplateBody")
|
||||
template_url = self._get_param("TemplateURL")
|
||||
if template_url:
|
||||
template_body = self._get_stack_from_s3_url(template_url)
|
||||
|
||||
cfn_lint = self.cloudformation_backend.validate_template(template_body)
|
||||
if cfn_lint:
|
||||
raise ValidationError(cfn_lint[0].message)
|
||||
description = ""
|
||||
try:
|
||||
description = json.loads(self._get_param("TemplateBody"))["Description"]
|
||||
description = json.loads(template_body)["Description"]
|
||||
except (ValueError, KeyError):
|
||||
pass
|
||||
try:
|
||||
description = yaml.load(self._get_param("TemplateBody"))["Description"]
|
||||
description = yaml.load(template_body)["Description"]
|
||||
except (yaml.ParserError, KeyError):
|
||||
pass
|
||||
template = self.response_template(VALIDATE_STACK_RESPONSE_TEMPLATE)
|
||||
|
||||
@ -158,7 +158,7 @@ class ELBV2Response(BaseResponse):
|
||||
condition = {}
|
||||
condition["field"] = _condition["field"]
|
||||
values = sorted(
|
||||
[e for e in _condition.items() if e[0].startswith("values.member")],
|
||||
[e for e in _condition.items() if "values.member" in e[0]],
|
||||
key=lambda x: x[0],
|
||||
)
|
||||
condition["values"] = [e[1] for e in values]
|
||||
@ -356,7 +356,7 @@ class ELBV2Response(BaseResponse):
|
||||
condition = {}
|
||||
condition["field"] = _condition["field"]
|
||||
values = sorted(
|
||||
[e for e in _condition.items() if e[0].startswith("values.member")],
|
||||
[e for e in _condition.items() if "values.member" in e[0]],
|
||||
key=lambda x: x[0],
|
||||
)
|
||||
condition["values"] = [e[1] for e in values]
|
||||
|
||||
@ -96,6 +96,25 @@ def test_boto3_yaml_validate_successful():
|
||||
assert response["ResponseMetadata"]["HTTPStatusCode"] == 200
|
||||
|
||||
|
||||
@mock_cloudformation
|
||||
@mock_s3
|
||||
def test_boto3_yaml_validate_template_url_successful():
|
||||
s3 = boto3.client("s3")
|
||||
s3_conn = boto3.resource("s3", region_name="us-east-1")
|
||||
s3_conn.create_bucket(Bucket="foobar")
|
||||
|
||||
s3_conn.Object("foobar", "template-key").put(Body=yaml_template)
|
||||
key_url = s3.generate_presigned_url(
|
||||
ClientMethod="get_object", Params={"Bucket": "foobar", "Key": "template-key"}
|
||||
)
|
||||
|
||||
cf_conn = boto3.client("cloudformation", region_name="us-east-1")
|
||||
response = cf_conn.validate_template(TemplateURL=key_url)
|
||||
assert response["Description"] == "Simple CloudFormation Test Template"
|
||||
assert response["Parameters"] == []
|
||||
assert response["ResponseMetadata"]["HTTPStatusCode"] == 200
|
||||
|
||||
|
||||
@mock_cloudformation
|
||||
def test_boto3_yaml_invalid_missing_resource():
|
||||
cf_conn = boto3.client("cloudformation", region_name="us-east-1")
|
||||
|
||||
@ -994,12 +994,17 @@ def test_handle_listener_rules():
|
||||
priority = 100
|
||||
host = "xxx.example.com"
|
||||
path_pattern = "foobar"
|
||||
pathpatternconfig_pattern = "foobar2"
|
||||
created_rule = conn.create_rule(
|
||||
ListenerArn=http_listener_arn,
|
||||
Priority=priority,
|
||||
Conditions=[
|
||||
{"Field": "host-header", "Values": [host]},
|
||||
{"Field": "path-pattern", "Values": [path_pattern]},
|
||||
{
|
||||
"Field": "path-pattern",
|
||||
"PathPatternConfig": {"Values": [pathpatternconfig_pattern]},
|
||||
},
|
||||
],
|
||||
Actions=[
|
||||
{"TargetGroupArn": target_group.get("TargetGroupArn"), "Type": "forward"}
|
||||
@ -1017,6 +1022,10 @@ def test_handle_listener_rules():
|
||||
Conditions=[
|
||||
{"Field": "host-header", "Values": [host]},
|
||||
{"Field": "path-pattern", "Values": [path_pattern]},
|
||||
{
|
||||
"Field": "path-pattern",
|
||||
"PathPatternConfig": {"Values": [pathpatternconfig_pattern]},
|
||||
},
|
||||
],
|
||||
Actions=[
|
||||
{"TargetGroupArn": target_group.get("TargetGroupArn"), "Type": "forward"}
|
||||
@ -1031,6 +1040,10 @@ def test_handle_listener_rules():
|
||||
Conditions=[
|
||||
{"Field": "host-header", "Values": [host]},
|
||||
{"Field": "path-pattern", "Values": [path_pattern]},
|
||||
{
|
||||
"Field": "path-pattern",
|
||||
"PathPatternConfig": {"Values": [pathpatternconfig_pattern]},
|
||||
},
|
||||
],
|
||||
Actions=[
|
||||
{
|
||||
@ -1079,11 +1092,16 @@ def test_handle_listener_rules():
|
||||
# modify rule partially
|
||||
new_host = "new.example.com"
|
||||
new_path_pattern = "new_path"
|
||||
new_pathpatternconfig_pattern = "new_path2"
|
||||
modified_rule = conn.modify_rule(
|
||||
RuleArn=first_rule["RuleArn"],
|
||||
Conditions=[
|
||||
{"Field": "host-header", "Values": [new_host]},
|
||||
{"Field": "path-pattern", "Values": [new_path_pattern]},
|
||||
{
|
||||
"Field": "path-pattern",
|
||||
"PathPatternConfig": {"Values": [new_pathpatternconfig_pattern]},
|
||||
},
|
||||
],
|
||||
)["Rules"][0]
|
||||
|
||||
@ -1092,6 +1110,9 @@ def test_handle_listener_rules():
|
||||
modified_rule.should.equal(obtained_rule)
|
||||
obtained_rule["Conditions"][0]["Values"][0].should.equal(new_host)
|
||||
obtained_rule["Conditions"][1]["Values"][0].should.equal(new_path_pattern)
|
||||
obtained_rule["Conditions"][2]["Values"][0].should.equal(
|
||||
new_pathpatternconfig_pattern
|
||||
)
|
||||
obtained_rule["Actions"][0]["TargetGroupArn"].should.equal(
|
||||
target_group.get("TargetGroupArn")
|
||||
)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user