Techdebt: Replace sure with regular asserts in APIGateway tests (#6366)
This commit is contained in:
Bert Blommers
GitHub
parent
b180f0a015
commit
5e89ceee69
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,5 @@
|
||||
import boto3
|
||||
import json
|
||||
import sure # noqa # pylint: disable=unused-import
|
||||
|
||||
from moto import mock_lambda, mock_cloudformation, mock_apigateway, mock_iam, mock_logs
|
||||
|
||||
@ -340,24 +339,24 @@ def test_simple_apigateway_with_lambda_proxy():
|
||||
#
|
||||
# Verify Rest API was created
|
||||
api = apigw.get_rest_apis()["items"][0]
|
||||
api["id"].should.equal(api_id)
|
||||
api["name"].should.equal("dev-timeseries-service")
|
||||
assert api["id"] == api_id
|
||||
assert api["name"] == "dev-timeseries-service"
|
||||
#
|
||||
# Verify Gateway Resource was created
|
||||
paths = apigw.get_resources(restApiId=api_id)["items"]
|
||||
root_path = [p for p in paths if p["path"] == "/"][0]
|
||||
hello_path = [p for p in paths if p["path"] == "/hello"][0]
|
||||
hello_path["parentId"].should.equal(root_path["id"])
|
||||
assert hello_path["parentId"] == root_path["id"]
|
||||
#
|
||||
# Verify Gateway Method was created
|
||||
m = apigw.get_method(
|
||||
restApiId=api_id, resourceId=hello_path["id"], httpMethod="GET"
|
||||
)
|
||||
m["httpMethod"].should.equal("GET")
|
||||
assert m["httpMethod"] == "GET"
|
||||
#
|
||||
# Verify a Gateway Deployment was created
|
||||
d = apigw.get_deployments(restApiId=api_id)["items"]
|
||||
d.should.have.length_of(1)
|
||||
assert len(d) == 1
|
||||
#
|
||||
# Verify Lambda function was created
|
||||
awslambda.get_function(FunctionName=fn_name) # Will throw 404 if it doesn't exist
|
||||
@ -365,9 +364,13 @@ def test_simple_apigateway_with_lambda_proxy():
|
||||
# Verify Lambda Permission was created
|
||||
policy = json.loads(awslambda.get_policy(FunctionName=fn_name)["Policy"])
|
||||
statement = policy["Statement"][0]
|
||||
statement["FunctionName"].should.contain(fn_name)
|
||||
statement["Condition"]["ArnLike"]["AWS:SourceArn"].should.equal(
|
||||
f"arn:aws:execute-api:us-east-1:123456789012:{api_id}/*/*"
|
||||
assert (
|
||||
statement["FunctionName"]
|
||||
== f"arn:aws:lambda:us-east-1:123456789012:function:{fn_name}"
|
||||
)
|
||||
assert (
|
||||
statement["Condition"]["ArnLike"]["AWS:SourceArn"]
|
||||
== f"arn:aws:execute-api:us-east-1:123456789012:{api_id}/*/*"
|
||||
)
|
||||
|
||||
|
||||
@ -380,4 +383,4 @@ def test_apigateway_with_unknown_description():
|
||||
cf.create_stack(StackName="teststack", TemplateBody=template_with_missing_sub)
|
||||
|
||||
api = apigw.get_rest_apis()["items"][0]
|
||||
api.should.have.key("description").equals("${UnknownResource}")
|
||||
assert api["description"] == "${UnknownResource}"
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
import boto3
|
||||
import sure # noqa # pylint: disable=unused-import
|
||||
from botocore.exceptions import ClientError
|
||||
|
||||
from moto import mock_apigateway
|
||||
@ -17,9 +16,10 @@ def test_create_deployment_requires_REST_methods():
|
||||
|
||||
with pytest.raises(ClientError) as ex:
|
||||
client.create_deployment(restApiId=api_id, stageName=stage_name)["id"]
|
||||
ex.value.response["Error"]["Code"].should.equal("BadRequestException")
|
||||
ex.value.response["Error"]["Message"].should.equal(
|
||||
"The REST API doesn't contain any methods"
|
||||
assert ex.value.response["Error"]["Code"] == "BadRequestException"
|
||||
assert (
|
||||
ex.value.response["Error"]["Message"]
|
||||
== "The REST API doesn't contain any methods"
|
||||
)
|
||||
|
||||
|
||||
@ -38,10 +38,8 @@ def test_create_deployment_requires_REST_method_integrations():
|
||||
|
||||
with pytest.raises(ClientError) as ex:
|
||||
client.create_deployment(restApiId=api_id, stageName=stage_name)["id"]
|
||||
ex.value.response["Error"]["Code"].should.equal("NotFoundException")
|
||||
ex.value.response["Error"]["Message"].should.equal(
|
||||
"No integration defined for method"
|
||||
)
|
||||
assert ex.value.response["Error"]["Code"] == "NotFoundException"
|
||||
assert ex.value.response["Error"]["Message"] == "No integration defined for method"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -53,7 +51,7 @@ def test_create_simple_deployment_with_get_method():
|
||||
create_method_integration(client, api_id)
|
||||
|
||||
deployment = client.create_deployment(restApiId=api_id, stageName=stage_name)
|
||||
deployment.should.have.key("id")
|
||||
assert "id" in deployment
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -65,7 +63,7 @@ def test_create_simple_deployment_with_post_method():
|
||||
create_method_integration(client, api_id, httpMethod="POST")
|
||||
|
||||
deployment = client.create_deployment(restApiId=api_id, stageName=stage_name)
|
||||
deployment.should.have.key("id")
|
||||
assert "id" in deployment
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -80,10 +78,8 @@ def test_create_deployment_minimal():
|
||||
deployment_id = response["id"]
|
||||
|
||||
response = client.get_deployment(restApiId=api_id, deploymentId=deployment_id)
|
||||
response.should.have.key("id").equals(deployment_id)
|
||||
response.should.have.key("ResponseMetadata").should.have.key(
|
||||
"HTTPStatusCode"
|
||||
).equals(200)
|
||||
assert response["id"] == deployment_id
|
||||
assert response["ResponseMetadata"]["HTTPStatusCode"] == 200
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -97,13 +93,13 @@ def test_create_deployment_with_empty_stage():
|
||||
deployment_id = response["id"]
|
||||
|
||||
response = client.get_deployment(restApiId=api_id, deploymentId=deployment_id)
|
||||
response.should.have.key("id")
|
||||
response.should.have.key("createdDate")
|
||||
response.shouldnt.have.key("stageName")
|
||||
assert "id" in response
|
||||
assert "createdDate" in response
|
||||
assert "stageName" not in response
|
||||
|
||||
# This should not create an empty stage
|
||||
stages = client.get_stages(restApiId=api_id)["item"]
|
||||
stages.should.equal([])
|
||||
assert stages == []
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -118,10 +114,10 @@ def test_get_deployments():
|
||||
deployment_id = response["id"]
|
||||
|
||||
response = client.get_deployments(restApiId=api_id)
|
||||
response.should.have.key("items").length_of(1)
|
||||
assert len(response["items"]) == 1
|
||||
|
||||
response["items"][0].pop("createdDate")
|
||||
response["items"].should.equal([{"id": deployment_id}])
|
||||
assert response["items"] == [{"id": deployment_id}]
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -143,8 +139,8 @@ def test_create_multiple_deployments():
|
||||
|
||||
response = client.get_deployments(restApiId=api_id)
|
||||
|
||||
response["items"][0]["id"].should.match(rf"{deployment_id2}|{deployment_id}")
|
||||
response["items"][1]["id"].should.match(rf"{deployment_id2}|{deployment_id}")
|
||||
assert response["items"][0]["id"] in [deployment_id, deployment_id2]
|
||||
assert response["items"][1]["id"] in [deployment_id, deployment_id2]
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -162,38 +158,39 @@ def test_delete_deployment__requires_stage_to_be_deleted():
|
||||
with pytest.raises(ClientError) as exc:
|
||||
client.delete_deployment(restApiId=api_id, deploymentId=deployment_id)
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("BadRequestException")
|
||||
err["Message"].should.equal(
|
||||
"Active stages pointing to this deployment must be moved or deleted"
|
||||
assert err["Code"] == "BadRequestException"
|
||||
assert (
|
||||
err["Message"]
|
||||
== "Active stages pointing to this deployment must be moved or deleted"
|
||||
)
|
||||
|
||||
# Deployment still exists
|
||||
deployments = client.get_deployments(restApiId=api_id)["items"]
|
||||
deployments.should.have.length_of(1)
|
||||
assert len(deployments) == 1
|
||||
|
||||
# Stage still exists
|
||||
stages = client.get_stages(restApiId=api_id)["item"]
|
||||
stages.should.have.length_of(1)
|
||||
assert len(stages) == 1
|
||||
|
||||
# Delete stage first
|
||||
resp = client.delete_stage(restApiId=api_id, stageName=stage_name)
|
||||
resp["ResponseMetadata"].should.have.key("HTTPStatusCode").equals(202)
|
||||
assert resp["ResponseMetadata"]["HTTPStatusCode"] == 202
|
||||
|
||||
# Deployment still exists
|
||||
deployments = client.get_deployments(restApiId=api_id)["items"]
|
||||
deployments.should.have.length_of(1)
|
||||
assert len(deployments) == 1
|
||||
|
||||
# Now delete deployment
|
||||
resp = client.delete_deployment(restApiId=api_id, deploymentId=deployment_id)
|
||||
resp["ResponseMetadata"].should.have.key("HTTPStatusCode").equals(202)
|
||||
assert resp["ResponseMetadata"]["HTTPStatusCode"] == 202
|
||||
|
||||
# Deployment is gone
|
||||
deployments = client.get_deployments(restApiId=api_id)["items"]
|
||||
deployments.should.have.length_of(0)
|
||||
assert len(deployments) == 0
|
||||
|
||||
# Stage is gone
|
||||
stages = client.get_stages(restApiId=api_id)["item"]
|
||||
stages.should.have.length_of(0)
|
||||
assert len(stages) == 0
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -206,5 +203,5 @@ def test_delete_unknown_deployment():
|
||||
with pytest.raises(ClientError) as exc:
|
||||
client.delete_deployment(restApiId=api_id, deploymentId="unknown")
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("NotFoundException")
|
||||
err["Message"].should.equal("Invalid Deployment identifier specified")
|
||||
assert err["Code"] == "NotFoundException"
|
||||
assert err["Message"] == "Invalid Deployment identifier specified"
|
||||
|
||||
@ -31,16 +31,16 @@ def test_import_rest_api__api_is_created():
|
||||
client.create_stage(restApiId=api_id, stageName="stg", deploymentId=deployment_id)
|
||||
|
||||
resp = client.get_export(restApiId=api_id, stageName="stg", exportType="swagger")
|
||||
resp.should.have.key("contentType").equals("application/octet-stream")
|
||||
resp.should.have.key("contentDisposition").match('attachment; filename="swagger')
|
||||
assert resp["contentType"] == "application/octet-stream"
|
||||
assert 'attachment; filename="swagger' in resp["contentDisposition"]
|
||||
|
||||
body = json.loads(resp["body"].read().decode("utf-8"))
|
||||
|
||||
body["info"].should.have.key("title").equals("Swagger Petstore - OpenAPI 3.0")
|
||||
body["paths"].should.have.length_of(15)
|
||||
assert body["info"]["title"] == "Swagger Petstore - OpenAPI 3.0"
|
||||
assert len(body["paths"]) == 15
|
||||
|
||||
body["paths"]["/pet/{petId}"].should.have.length_of(3)
|
||||
set(body["paths"]["/pet/{petId}"].keys()).should.equal({"DELETE", "GET", "POST"})
|
||||
assert len(body["paths"]["/pet/{petId}"]) == 3
|
||||
assert set(body["paths"]["/pet/{petId}"].keys()) == {"DELETE", "GET", "POST"}
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -50,8 +50,8 @@ def test_export_api__unknown_api():
|
||||
with pytest.raises(ClientError) as exc:
|
||||
client.get_export(restApiId="unknown", stageName="l", exportType="a")
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("NotFoundException")
|
||||
err["Message"].should.equal("Invalid stage identifier specified")
|
||||
assert err["Code"] == "NotFoundException"
|
||||
assert err["Message"] == "Invalid stage identifier specified"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -77,5 +77,5 @@ def test_export_api__unknown_export_type():
|
||||
with pytest.raises(ClientError) as exc:
|
||||
client.get_export(restApiId=api_id, stageName="dep", exportType="a")
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("BadRequestException")
|
||||
err["Message"].should.equal("No API exporter for type 'a'")
|
||||
assert err["Code"] == "BadRequestException"
|
||||
assert err["Message"] == "No API exporter for type 'a'"
|
||||
|
||||
@ -12,8 +12,8 @@ def test_put_gateway_response_minimal():
|
||||
|
||||
resp = client.put_gateway_response(restApiId=api_id, responseType="DEFAULT_4XX")
|
||||
|
||||
resp.should.have.key("responseType").equals("DEFAULT_4XX")
|
||||
resp.should.have.key("defaultResponse").equals(False)
|
||||
assert resp["responseType"] == "DEFAULT_4XX"
|
||||
assert resp["defaultResponse"] is False
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -31,15 +31,15 @@ def test_put_gateway_response():
|
||||
},
|
||||
)
|
||||
|
||||
resp.should.have.key("responseType").equals("DEFAULT_4XX")
|
||||
resp.should.have.key("defaultResponse").equals(False)
|
||||
resp.should.have.key("statusCode").equals("401")
|
||||
resp.should.have.key("responseParameters").equals(
|
||||
{"gatewayresponse.header.Authorization": "'Basic'"}
|
||||
)
|
||||
resp.should.have.key("responseTemplates").equals(
|
||||
{"application/xml": "#set($inputRoot = $input.path('$'))\n{ }"}
|
||||
)
|
||||
assert resp["responseType"] == "DEFAULT_4XX"
|
||||
assert resp["defaultResponse"] is False
|
||||
assert resp["statusCode"] == "401"
|
||||
assert resp["responseParameters"] == {
|
||||
"gatewayresponse.header.Authorization": "'Basic'"
|
||||
}
|
||||
assert resp["responseTemplates"] == {
|
||||
"application/xml": "#set($inputRoot = $input.path('$'))\n{ }"
|
||||
}
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -51,8 +51,8 @@ def test_get_gateway_response_minimal():
|
||||
|
||||
resp = client.get_gateway_response(restApiId=api_id, responseType="DEFAULT_4XX")
|
||||
|
||||
resp.should.have.key("responseType").equals("DEFAULT_4XX")
|
||||
resp.should.have.key("defaultResponse").equals(False)
|
||||
assert resp["responseType"] == "DEFAULT_4XX"
|
||||
assert resp["defaultResponse"] is False
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -72,15 +72,15 @@ def test_get_gateway_response():
|
||||
|
||||
resp = client.get_gateway_response(restApiId=api_id, responseType="DEFAULT_4XX")
|
||||
|
||||
resp.should.have.key("responseType").equals("DEFAULT_4XX")
|
||||
resp.should.have.key("defaultResponse").equals(False)
|
||||
resp.should.have.key("statusCode").equals("401")
|
||||
resp.should.have.key("responseParameters").equals(
|
||||
{"gatewayresponse.header.Authorization": "'Basic'"}
|
||||
)
|
||||
resp.should.have.key("responseTemplates").equals(
|
||||
{"application/xml": "#set($inputRoot = $input.path('$'))\n{ }"}
|
||||
)
|
||||
assert resp["responseType"] == "DEFAULT_4XX"
|
||||
assert resp["defaultResponse"] is False
|
||||
assert resp["statusCode"] == "401"
|
||||
assert resp["responseParameters"] == {
|
||||
"gatewayresponse.header.Authorization": "'Basic'"
|
||||
}
|
||||
assert resp["responseTemplates"] == {
|
||||
"application/xml": "#set($inputRoot = $input.path('$'))\n{ }"
|
||||
}
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -91,7 +91,7 @@ def test_get_gateway_response_unknown():
|
||||
with pytest.raises(ClientError) as exc:
|
||||
client.get_gateway_response(restApiId=api_id, responseType="DEFAULT_4XX")
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("NotFoundException")
|
||||
assert err["Code"] == "NotFoundException"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -100,7 +100,7 @@ def test_get_gateway_responses_empty():
|
||||
api_id = client.create_rest_api(name="my_api", description="d")["id"]
|
||||
resp = client.get_gateway_responses(restApiId=api_id)
|
||||
|
||||
resp.should.have.key("items").equals([])
|
||||
assert resp["items"] == []
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -113,14 +113,14 @@ def test_get_gateway_responses():
|
||||
)
|
||||
|
||||
resp = client.get_gateway_responses(restApiId=api_id)
|
||||
resp.should.have.key("items").length_of(2)
|
||||
assert len(resp["items"]) == 2
|
||||
|
||||
resp["items"].should.contain(
|
||||
{"responseType": "DEFAULT_4XX", "defaultResponse": False}
|
||||
)
|
||||
resp["items"].should.contain(
|
||||
{"responseType": "DEFAULT_5XX", "defaultResponse": False, "statusCode": "503"}
|
||||
)
|
||||
assert {"responseType": "DEFAULT_4XX", "defaultResponse": False} in resp["items"]
|
||||
assert {
|
||||
"responseType": "DEFAULT_5XX",
|
||||
"defaultResponse": False,
|
||||
"statusCode": "503",
|
||||
} in resp["items"]
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -133,12 +133,10 @@ def test_delete_gateway_response():
|
||||
)
|
||||
|
||||
resp = client.get_gateway_responses(restApiId=api_id)
|
||||
resp.should.have.key("items").length_of(2)
|
||||
assert len(resp["items"]) == 2
|
||||
|
||||
resp = client.delete_gateway_response(restApiId=api_id, responseType="DEFAULT_5XX")
|
||||
client.delete_gateway_response(restApiId=api_id, responseType="DEFAULT_5XX")
|
||||
|
||||
resp = client.get_gateway_responses(restApiId=api_id)
|
||||
resp.should.have.key("items").length_of(1)
|
||||
resp["items"].should.contain(
|
||||
{"responseType": "DEFAULT_4XX", "defaultResponse": False}
|
||||
)
|
||||
assert len(resp["items"]) == 1
|
||||
assert {"responseType": "DEFAULT_4XX", "defaultResponse": False} in resp["items"]
|
||||
|
||||
@ -16,17 +16,13 @@ def test_import_rest_api__api_is_created():
|
||||
with open(path + "/resources/test_api.json", "rb") as api_json:
|
||||
response = client.import_rest_api(body=api_json.read())
|
||||
|
||||
response.should.have.key("id")
|
||||
response.should.have.key("name").which.should.equal("doc")
|
||||
response.should.have.key("description").which.should.equal(
|
||||
"description from JSON file"
|
||||
)
|
||||
assert "id" in response
|
||||
assert response["name"] == "doc"
|
||||
assert response["description"] == "description from JSON file"
|
||||
|
||||
response = client.get_rest_api(restApiId=response["id"])
|
||||
response.should.have.key("name").which.should.equal("doc")
|
||||
response.should.have.key("description").which.should.equal(
|
||||
"description from JSON file"
|
||||
)
|
||||
assert response["name"] == "doc"
|
||||
assert response["description"] == "description from JSON file"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -38,14 +34,14 @@ def test_import_rest_api__nested_api():
|
||||
response = client.import_rest_api(body=api_json.read())
|
||||
|
||||
resources = client.get_resources(restApiId=response["id"])["items"]
|
||||
resources.should.have.length_of(5)
|
||||
assert len(resources) == 5
|
||||
|
||||
paths = [res["path"] for res in resources]
|
||||
paths.should.contain("/")
|
||||
paths.should.contain("/test")
|
||||
paths.should.contain("/test/some")
|
||||
paths.should.contain("/test/some/deep")
|
||||
paths.should.contain("/test/some/deep/path")
|
||||
assert "/" in paths
|
||||
assert "/test" in paths
|
||||
assert "/test/some" in paths
|
||||
assert "/test/some/deep" in paths
|
||||
assert "/test/some/deep/path" in paths
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -60,12 +56,13 @@ def test_import_rest_api__invalid_api_creates_nothing():
|
||||
with pytest.raises(ClientError) as exc:
|
||||
client.import_rest_api(body=api_json.read(), failOnWarnings=True)
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("BadRequestException")
|
||||
err["Message"].should.equal(
|
||||
"Failed to parse the uploaded OpenAPI document due to: 'paths' is a required property"
|
||||
assert err["Code"] == "BadRequestException"
|
||||
assert (
|
||||
err["Message"]
|
||||
== "Failed to parse the uploaded OpenAPI document due to: 'paths' is a required property"
|
||||
)
|
||||
|
||||
client.get_rest_apis().should.have.key("items").length_of(0)
|
||||
assert len(client.get_rest_apis()["items"]) == 0
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -82,7 +79,7 @@ def test_import_rest_api__methods_are_created():
|
||||
|
||||
# We have a GET-method
|
||||
resp = client.get_method(restApiId=api_id, resourceId=root_id, httpMethod="GET")
|
||||
resp["methodResponses"].should.equal({"200": {"statusCode": "200"}})
|
||||
assert resp["methodResponses"] == {"200": {"statusCode": "200"}}
|
||||
|
||||
# We have a POST on /test
|
||||
test_path_id = [res for res in resources["items"] if res["path"] == "/test"][0][
|
||||
@ -91,4 +88,4 @@ def test_import_rest_api__methods_are_created():
|
||||
resp = client.get_method(
|
||||
restApiId=api_id, resourceId=test_path_id, httpMethod="POST"
|
||||
)
|
||||
resp["methodResponses"].should.equal({"201": {"statusCode": "201"}})
|
||||
assert resp["methodResponses"] == {"201": {"statusCode": "201"}}
|
||||
|
||||
@ -51,7 +51,7 @@ def test_http_integration():
|
||||
f"https://{api_id}.execute-api.{region_name}.amazonaws.com/{stage_name}"
|
||||
)
|
||||
|
||||
requests.get(deploy_url).content.should.equal(b"a fake response")
|
||||
assert requests.get(deploy_url).content == b"a fake response"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -75,8 +75,8 @@ def test_aws_integration_dynamodb():
|
||||
f"https://{api_id}.execute-api.us-west-2.amazonaws.com/{stage_name}",
|
||||
json={"TableName": table_name, "Item": {"name": {"S": "the-key"}}},
|
||||
)
|
||||
res.status_code.should.equal(200)
|
||||
res.content.should.equal(b"{}")
|
||||
assert res.status_code == 200
|
||||
assert res.content == b"{}"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -100,20 +100,20 @@ def test_aws_integration_dynamodb_multiple_stages():
|
||||
f"https://{api_id}.execute-api.us-west-2.amazonaws.com/dev",
|
||||
json={"TableName": table_name, "Item": {"name": {"S": "the-key"}}},
|
||||
)
|
||||
res.status_code.should.equal(200)
|
||||
assert res.status_code == 200
|
||||
|
||||
res = requests.put(
|
||||
f"https://{api_id}.execute-api.us-west-2.amazonaws.com/staging",
|
||||
json={"TableName": table_name, "Item": {"name": {"S": "the-key"}}},
|
||||
)
|
||||
res.status_code.should.equal(200)
|
||||
assert res.status_code == 200
|
||||
|
||||
# We haven't pushed to prod yet
|
||||
res = requests.put(
|
||||
f"https://{api_id}.execute-api.us-west-2.amazonaws.com/prod",
|
||||
json={"TableName": table_name, "Item": {"name": {"S": "the-key"}}},
|
||||
)
|
||||
res.status_code.should.equal(400)
|
||||
assert res.status_code == 400
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -153,17 +153,17 @@ def test_aws_integration_dynamodb_multiple_resources():
|
||||
"Item": {"name": {"S": "the-key"}, "attr2": {"S": "sth"}},
|
||||
},
|
||||
)
|
||||
res.status_code.should.equal(200)
|
||||
assert res.status_code == 200
|
||||
|
||||
# Get item from child resource
|
||||
res = requests.get(
|
||||
f"https://{api_id}.execute-api.us-west-2.amazonaws.com/dev/item",
|
||||
json={"TableName": table_name, "Key": {"name": {"S": "the-key"}}},
|
||||
)
|
||||
res.status_code.should.equal(200)
|
||||
json.loads(res.content).should.equal(
|
||||
{"Item": {"name": {"S": "the-key"}, "attr2": {"S": "sth"}}}
|
||||
)
|
||||
assert res.status_code == 200
|
||||
assert json.loads(res.content) == {
|
||||
"Item": {"name": {"S": "the-key"}, "attr2": {"S": "sth"}}
|
||||
}
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -180,7 +180,7 @@ def test_aws_integration_sagemaker():
|
||||
response = client.get_integration(
|
||||
restApiId=api_id, resourceId=resource_id, httpMethod="PUT"
|
||||
)
|
||||
response.should.have.key("uri").equals(integration_action)
|
||||
assert response["uri"] == integration_action
|
||||
|
||||
|
||||
def create_table(dynamodb, table_name):
|
||||
|
||||
@ -24,9 +24,9 @@ def test_put_rest_api__api_details_are_persisted():
|
||||
body=api_json.read(),
|
||||
)
|
||||
|
||||
response.should.have.key("id").which.should.equal(api_id)
|
||||
response.should.have.key("name").which.should.equal("my_api")
|
||||
response.should.have.key("description").which.should.equal("this is my api")
|
||||
assert response["id"] == api_id
|
||||
assert response["name"] == "my_api"
|
||||
assert response["description"] == "this is my api"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -45,7 +45,7 @@ def test_put_rest_api__methods_are_created():
|
||||
|
||||
# We have a GET-method
|
||||
resp = client.get_method(restApiId=api_id, resourceId=root_id, httpMethod="GET")
|
||||
resp["methodResponses"].should.equal({"200": {"statusCode": "200"}})
|
||||
assert resp["methodResponses"] == {"200": {"statusCode": "200"}}
|
||||
|
||||
# We have a POST on /test
|
||||
test_path_id = [res for res in resources["items"] if res["path"] == "/test"][0][
|
||||
@ -54,7 +54,7 @@ def test_put_rest_api__methods_are_created():
|
||||
resp = client.get_method(
|
||||
restApiId=api_id, resourceId=test_path_id, httpMethod="POST"
|
||||
)
|
||||
resp["methodResponses"].should.equal({"201": {"statusCode": "201"}})
|
||||
assert resp["methodResponses"] == {"201": {"statusCode": "201"}}
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -79,7 +79,7 @@ def test_put_rest_api__existing_methods_are_overwritten():
|
||||
response = client.get_method(
|
||||
restApiId=api_id, resourceId=root_id, httpMethod="POST"
|
||||
)
|
||||
response.should.have.key("httpMethod").equals("POST")
|
||||
assert response["httpMethod"] == "POST"
|
||||
|
||||
path = os.path.dirname(os.path.abspath(__file__))
|
||||
with open(path + "/resources/test_api.json", "rb") as api_json:
|
||||
@ -96,13 +96,13 @@ def test_put_rest_api__existing_methods_are_overwritten():
|
||||
resource for resource in resources["items"] if resource["path"] == "/"
|
||||
][0]["id"]
|
||||
|
||||
new_root_id.shouldnt.equal(root_id)
|
||||
assert new_root_id != root_id
|
||||
|
||||
# Our POST-method should be gone
|
||||
with pytest.raises(ClientError) as exc:
|
||||
client.get_method(restApiId=api_id, resourceId=new_root_id, httpMethod="POST")
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("NotFoundException")
|
||||
assert err["Code"] == "NotFoundException"
|
||||
|
||||
# We just have a GET-method, as defined in the JSON
|
||||
client.get_method(restApiId=api_id, resourceId=new_root_id, httpMethod="GET")
|
||||
@ -139,7 +139,7 @@ def test_put_rest_api__existing_methods_still_exist():
|
||||
response = client.get_method(
|
||||
restApiId=api_id, resourceId=root_id, httpMethod="POST"
|
||||
)
|
||||
response.should.have.key("httpMethod").equals("POST")
|
||||
assert response["httpMethod"] == "POST"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -159,9 +159,10 @@ def test_put_rest_api__fail_on_invalid_spec():
|
||||
restApiId=api_id, failOnWarnings=True, body=api_json.read()
|
||||
)
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("BadRequestException")
|
||||
err["Message"].should.equal(
|
||||
"Failed to parse the uploaded OpenAPI document due to: 'paths' is a required property"
|
||||
assert err["Code"] == "BadRequestException"
|
||||
assert (
|
||||
err["Message"]
|
||||
== "Failed to parse the uploaded OpenAPI document due to: 'paths' is a required property"
|
||||
)
|
||||
|
||||
|
||||
@ -179,8 +180,8 @@ def test_put_rest_api__fail_on_invalid_version():
|
||||
restApiId=api_id, failOnWarnings=True, body=api_json.read()
|
||||
)
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("BadRequestException")
|
||||
err["Message"].should.equal("Only OpenAPI 3.x.x are currently supported")
|
||||
assert err["Code"] == "BadRequestException"
|
||||
assert err["Message"] == "Only OpenAPI 3.x.x are currently supported"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -195,9 +196,10 @@ def test_put_rest_api__fail_on_invalid_mode():
|
||||
with pytest.raises(ClientError) as exc:
|
||||
client.put_rest_api(restApiId=api_id, mode="unknown", body=api_json.read())
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("BadRequestException")
|
||||
err["Message"].should.equal(
|
||||
'Enumeration value of OpenAPI import mode must be "overwrite" or "merge"'
|
||||
assert err["Code"] == "BadRequestException"
|
||||
assert (
|
||||
err["Message"]
|
||||
== 'Enumeration value of OpenAPI import mode must be "overwrite" or "merge"'
|
||||
)
|
||||
|
||||
|
||||
@ -217,6 +219,6 @@ def test_put_rest_api__as_yaml():
|
||||
body=api_yaml.read(),
|
||||
)
|
||||
|
||||
response.should.have.key("id").which.should.equal(api_id)
|
||||
response.should.have.key("name").which.should.equal("my_api")
|
||||
response.should.have.key("description").which.should.equal("this is my api")
|
||||
assert response["id"] == api_id
|
||||
assert response["name"] == "my_api"
|
||||
assert response["description"] == "this is my api"
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
import boto3
|
||||
import pytest
|
||||
import sure # noqa # pylint: disable=unused-import
|
||||
|
||||
from botocore.exceptions import ClientError
|
||||
from moto import mock_apigateway
|
||||
@ -24,20 +23,18 @@ def test_create_stage_minimal():
|
||||
restApiId=api_id, stageName=new_stage_name, deploymentId=deployment_id
|
||||
)
|
||||
|
||||
response.should.have.key("stageName").equals(new_stage_name)
|
||||
response.should.have.key("deploymentId").equals(deployment_id)
|
||||
response.should.have.key("methodSettings").equals({})
|
||||
response.should.have.key("variables").equals({})
|
||||
response.should.have.key("ResponseMetadata").should.have.key(
|
||||
"HTTPStatusCode"
|
||||
).equals(201)
|
||||
response.should.have.key("description").equals("")
|
||||
response.shouldnt.have.key("cacheClusterStatus")
|
||||
response.should.have.key("cacheClusterEnabled").equals(False)
|
||||
assert response["stageName"] == new_stage_name
|
||||
assert response["deploymentId"] == deployment_id
|
||||
assert response["methodSettings"] == {}
|
||||
assert response["variables"] == {}
|
||||
assert response["ResponseMetadata"]["HTTPStatusCode"] == 201
|
||||
assert response["description"] == ""
|
||||
assert "cacheClusterStatus" not in response
|
||||
assert response["cacheClusterEnabled"] is False
|
||||
|
||||
stage = client.get_stage(restApiId=api_id, stageName=new_stage_name)
|
||||
stage["stageName"].should.equal(new_stage_name)
|
||||
stage["deploymentId"].should.equal(deployment_id)
|
||||
assert stage["stageName"] == new_stage_name
|
||||
assert stage["deploymentId"] == deployment_id
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -59,21 +56,19 @@ def test_create_stage_with_env_vars():
|
||||
variables={"env": "dev"},
|
||||
)
|
||||
|
||||
response.should.have.key("stageName").equals(new_stage_name_with_vars)
|
||||
response.should.have.key("deploymentId").equals(deployment_id)
|
||||
response.should.have.key("methodSettings").equals({})
|
||||
response.should.have.key("variables").equals({"env": "dev"})
|
||||
response.should.have.key("ResponseMetadata").should.have.key(
|
||||
"HTTPStatusCode"
|
||||
).equals(201)
|
||||
response.should.have.key("description").equals("")
|
||||
response.shouldnt.have.key("cacheClusterStatus")
|
||||
response.should.have.key("cacheClusterEnabled").equals(False)
|
||||
assert response["stageName"] == new_stage_name_with_vars
|
||||
assert response["deploymentId"] == deployment_id
|
||||
assert response["methodSettings"] == {}
|
||||
assert response["variables"] == {"env": "dev"}
|
||||
assert response["ResponseMetadata"]["HTTPStatusCode"] == 201
|
||||
assert response["description"] == ""
|
||||
assert "cacheClusterStatus" not in response
|
||||
assert response["cacheClusterEnabled"] is False
|
||||
|
||||
stage = client.get_stage(restApiId=api_id, stageName=new_stage_name_with_vars)
|
||||
stage["stageName"].should.equal(new_stage_name_with_vars)
|
||||
stage["deploymentId"].should.equal(deployment_id)
|
||||
stage["variables"].should.have.key("env").which.should.match("dev")
|
||||
assert stage["stageName"] == new_stage_name_with_vars
|
||||
assert stage["deploymentId"] == deployment_id
|
||||
assert stage["variables"]["env"] == "dev"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -97,21 +92,19 @@ def test_create_stage_with_vars_and_cache():
|
||||
description="hello moto",
|
||||
)
|
||||
|
||||
response.should.have.key("stageName").equals(new_stage_name)
|
||||
response.should.have.key("deploymentId").equals(deployment_id)
|
||||
response.should.have.key("methodSettings").equals({})
|
||||
response.should.have.key("variables").equals({"env": "dev"})
|
||||
response.should.have.key("ResponseMetadata").should.have.key(
|
||||
"HTTPStatusCode"
|
||||
).equals(201)
|
||||
response.should.have.key("description").equals("hello moto")
|
||||
response.should.have.key("cacheClusterStatus").equals("AVAILABLE")
|
||||
response.should.have.key("cacheClusterEnabled").equals(True)
|
||||
response.should.have.key("cacheClusterSize").equals("0.5")
|
||||
assert response["stageName"] == new_stage_name
|
||||
assert response["deploymentId"] == deployment_id
|
||||
assert response["methodSettings"] == {}
|
||||
assert response["variables"] == {"env": "dev"}
|
||||
assert response["ResponseMetadata"]["HTTPStatusCode"] == 201
|
||||
assert response["description"] == "hello moto"
|
||||
assert response["cacheClusterStatus"] == "AVAILABLE"
|
||||
assert response["cacheClusterEnabled"] is True
|
||||
assert response["cacheClusterSize"] == "0.5"
|
||||
|
||||
stage = client.get_stage(restApiId=api_id, stageName=new_stage_name)
|
||||
|
||||
stage["cacheClusterSize"].should.equal("0.5")
|
||||
assert stage["cacheClusterSize"] == "0.5"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -137,24 +130,22 @@ def test_create_stage_with_cache_settings():
|
||||
description="hello moto",
|
||||
)
|
||||
|
||||
response.should.have.key("stageName").equals(new_stage_name)
|
||||
response.should.have.key("deploymentId").equals(deployment_id)
|
||||
response.should.have.key("methodSettings").equals({})
|
||||
response.should.have.key("variables").equals({"env": "dev"})
|
||||
response.should.have.key("ResponseMetadata").should.have.key(
|
||||
"HTTPStatusCode"
|
||||
).equals(201)
|
||||
response.should.have.key("description").equals("hello moto")
|
||||
response.should.have.key("cacheClusterStatus").equals("AVAILABLE")
|
||||
response.should.have.key("cacheClusterEnabled").equals(True)
|
||||
response.should.have.key("cacheClusterSize").equals("1.6")
|
||||
response.should.have.key("tracingEnabled").equals(True)
|
||||
assert response["stageName"] == new_stage_name
|
||||
assert response["deploymentId"] == deployment_id
|
||||
assert response["methodSettings"] == {}
|
||||
assert response["variables"] == {"env": "dev"}
|
||||
assert response["ResponseMetadata"]["HTTPStatusCode"] == 201
|
||||
assert response["description"] == "hello moto"
|
||||
assert response["cacheClusterStatus"] == "AVAILABLE"
|
||||
assert response["cacheClusterEnabled"] is True
|
||||
assert response["cacheClusterSize"] == "1.6"
|
||||
assert response["tracingEnabled"] is True
|
||||
|
||||
stage = client.get_stage(restApiId=api_id, stageName=new_stage_name)
|
||||
stage["stageName"].should.equal(new_stage_name)
|
||||
stage["deploymentId"].should.equal(deployment_id)
|
||||
stage["variables"].should.have.key("env").which.should.match("dev")
|
||||
stage["cacheClusterSize"].should.equal("1.6")
|
||||
assert stage["stageName"] == new_stage_name
|
||||
assert stage["deploymentId"] == deployment_id
|
||||
assert stage["variables"]["env"] == "dev"
|
||||
assert stage["cacheClusterSize"] == "1.6"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -171,8 +162,8 @@ def test_recreate_stage_from_deployment():
|
||||
restApiId=api_id, stageName=stage_name, deploymentId=depl_id1
|
||||
)
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("ConflictException")
|
||||
err["Message"].should.equal("Stage already exists")
|
||||
assert err["Code"] == "ConflictException"
|
||||
assert err["Message"] == "Stage already exists"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -194,8 +185,8 @@ def test_create_stage_twice():
|
||||
restApiId=api_id, stageName=new_stage_name, deploymentId=depl_id1
|
||||
)
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("ConflictException")
|
||||
err["Message"].should.equal("Stage already exists")
|
||||
assert err["Code"] == "ConflictException"
|
||||
assert err["Message"] == "Stage already exists"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -222,20 +213,20 @@ def test_delete_stage():
|
||||
)
|
||||
stages = client.get_stages(restApiId=api_id)["item"]
|
||||
stage_names = [stage["stageName"] for stage in stages]
|
||||
stage_names.should.have.length_of(3)
|
||||
stage_names.should.contain(stage_name)
|
||||
stage_names.should.contain(new_stage_name)
|
||||
stage_names.should.contain(new_stage_name_with_vars)
|
||||
assert len(stage_names) == 3
|
||||
assert stage_name in stage_names
|
||||
assert new_stage_name in stage_names
|
||||
assert new_stage_name_with_vars in stage_names
|
||||
|
||||
# delete stage
|
||||
response = client.delete_stage(restApiId=api_id, stageName=new_stage_name_with_vars)
|
||||
response["ResponseMetadata"]["HTTPStatusCode"].should.equal(202)
|
||||
assert response["ResponseMetadata"]["HTTPStatusCode"] == 202
|
||||
|
||||
# verify other stage still exists
|
||||
stages = client.get_stages(restApiId=api_id)["item"]
|
||||
stage_names = [stage["stageName"] for stage in stages]
|
||||
stage_names.should.have.length_of(2)
|
||||
stage_names.shouldnt.contain(new_stage_name_with_vars)
|
||||
assert len(stage_names) == 2
|
||||
assert new_stage_name_with_vars not in stage_names
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -249,26 +240,26 @@ def test_delete_stage_created_by_deployment():
|
||||
|
||||
# Sanity check that the deployment exists
|
||||
depls = client.get_deployments(restApiId=api_id)["items"]
|
||||
depls.should.have.length_of(1)
|
||||
set(depls[0].keys()).should.equal({"id", "createdDate"})
|
||||
assert len(depls) == 1
|
||||
assert set(depls[0].keys()) == {"id", "createdDate"}
|
||||
|
||||
# Sanity check that the stage exists
|
||||
stage = client.get_stages(restApiId=api_id)["item"][0]
|
||||
stage.should.have.key("deploymentId").equals(depl_id1)
|
||||
stage.should.have.key("stageName").equals(stage_name)
|
||||
assert stage["deploymentId"] == depl_id1
|
||||
assert stage["stageName"] == stage_name
|
||||
|
||||
# delete stage
|
||||
response = client.delete_stage(restApiId=api_id, stageName=stage_name)
|
||||
response["ResponseMetadata"]["HTTPStatusCode"].should.equal(202)
|
||||
assert response["ResponseMetadata"]["HTTPStatusCode"] == 202
|
||||
|
||||
# verify no stage exists
|
||||
stages = client.get_stages(restApiId=api_id)
|
||||
stages.should.have.key("item").equals([])
|
||||
assert stages["item"] == []
|
||||
|
||||
# verify deployment still exists, unchanged
|
||||
depls = client.get_deployments(restApiId=api_id)["items"]
|
||||
depls.should.have.length_of(1)
|
||||
set(depls[0].keys()).should.equal({"id", "createdDate"})
|
||||
assert len(depls) == 1
|
||||
assert set(depls[0].keys()) == {"id", "createdDate"}
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -279,8 +270,8 @@ def test_delete_stage_unknown_stage():
|
||||
with pytest.raises(ClientError) as exc:
|
||||
client.delete_stage(restApiId=api_id, stageName="unknown")
|
||||
err = exc.value.response["Error"]
|
||||
err["Message"].should.equal("Invalid stage identifier specified")
|
||||
err["Code"].should.equal("NotFoundException")
|
||||
assert err["Message"] == "Invalid stage identifier specified"
|
||||
assert err["Code"] == "NotFoundException"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -298,11 +289,9 @@ def test_update_stage_configuration():
|
||||
|
||||
response = client.get_deployment(restApiId=api_id, deploymentId=deployment_id)
|
||||
|
||||
response.should.have.key("id").equals(deployment_id)
|
||||
response.should.have.key("ResponseMetadata").should.have.key(
|
||||
"HTTPStatusCode"
|
||||
).equals(200)
|
||||
response.should.have.key("description").equals("1.0.1")
|
||||
assert response["id"] == deployment_id
|
||||
assert response["ResponseMetadata"]["HTTPStatusCode"] == 200
|
||||
assert response["description"] == "1.0.1"
|
||||
|
||||
response = client.create_deployment(
|
||||
restApiId=api_id, stageName=stage_name, description="1.0.2"
|
||||
@ -310,10 +299,10 @@ def test_update_stage_configuration():
|
||||
deployment_id2 = response["id"]
|
||||
|
||||
stage = client.get_stage(restApiId=api_id, stageName=stage_name)
|
||||
stage["stageName"].should.equal(stage_name)
|
||||
stage["deploymentId"].should.equal(deployment_id2)
|
||||
stage.shouldnt.have.key("cacheClusterSize")
|
||||
stage.shouldnt.have.key("cacheClusterStatus")
|
||||
assert stage["stageName"] == stage_name
|
||||
assert stage["deploymentId"] == deployment_id2
|
||||
assert "cacheClusterSize" not in stage
|
||||
assert "cacheClusterStatus" not in stage
|
||||
|
||||
client.update_stage(
|
||||
restApiId=api_id,
|
||||
@ -325,8 +314,8 @@ def test_update_stage_configuration():
|
||||
|
||||
stage = client.get_stage(restApiId=api_id, stageName=stage_name)
|
||||
|
||||
stage.should.have.key("cacheClusterSize").which.should.equal("0.5")
|
||||
stage.should.have.key("cacheClusterStatus").equals("AVAILABLE")
|
||||
assert stage["cacheClusterSize"] == "0.5"
|
||||
assert stage["cacheClusterStatus"] == "AVAILABLE"
|
||||
|
||||
client.update_stage(
|
||||
restApiId=api_id,
|
||||
@ -338,7 +327,7 @@ def test_update_stage_configuration():
|
||||
|
||||
stage = client.get_stage(restApiId=api_id, stageName=stage_name)
|
||||
|
||||
stage.should.have.key("cacheClusterSize").which.should.equal("1.6")
|
||||
assert stage["cacheClusterSize"] == "1.6"
|
||||
|
||||
client.update_stage(
|
||||
restApiId=api_id,
|
||||
@ -368,16 +357,14 @@ def test_update_stage_configuration():
|
||||
|
||||
stage = client.get_stage(restApiId=api_id, stageName=stage_name)
|
||||
|
||||
stage["description"].should.match("stage description update")
|
||||
stage["cacheClusterSize"].should.equal("1.6")
|
||||
stage["variables"]["environment"].should.match("dev")
|
||||
stage["variables"].should_not.have.key("region")
|
||||
stage["cacheClusterEnabled"].should.equal(True)
|
||||
stage["deploymentId"].should.match(deployment_id)
|
||||
stage["methodSettings"].should.have.key("*/*")
|
||||
stage["methodSettings"]["*/*"].should.have.key(
|
||||
"cacheDataEncrypted"
|
||||
).which.should.be.true
|
||||
assert stage["description"] == "stage description update"
|
||||
assert stage["cacheClusterSize"] == "1.6"
|
||||
assert stage["variables"]["environment"] == "dev"
|
||||
assert "region" not in stage["variables"]
|
||||
assert stage["cacheClusterEnabled"] is True
|
||||
assert stage["deploymentId"] == deployment_id
|
||||
assert "*/*" in stage["methodSettings"]
|
||||
assert stage["methodSettings"]["*/*"]["cacheDataEncrypted"] is True
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -410,12 +397,10 @@ def test_update_stage_add_access_log_settings():
|
||||
)
|
||||
|
||||
stage = client.get_stage(restApiId=api_id, stageName=stage_name)
|
||||
stage.should.have.key("accessLogSettings").equals(
|
||||
{
|
||||
"format": "$context.identity.sourceIp msg",
|
||||
"destinationArn": "arn:aws:logs:us-east-1:123456789012:log-group:foo-bar-x0hyv",
|
||||
}
|
||||
)
|
||||
assert stage["accessLogSettings"] == {
|
||||
"format": "$context.identity.sourceIp msg",
|
||||
"destinationArn": "arn:aws:logs:us-east-1:123456789012:log-group:foo-bar-x0hyv",
|
||||
}
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -436,7 +421,7 @@ def test_update_stage_tracing_disabled():
|
||||
)
|
||||
|
||||
stage = client.get_stage(restApiId=api_id, stageName=stage_name)
|
||||
stage.should.have.key("tracingEnabled").equals(False)
|
||||
assert stage["tracingEnabled"] is False
|
||||
|
||||
client.update_stage(
|
||||
restApiId=api_id,
|
||||
@ -445,7 +430,7 @@ def test_update_stage_tracing_disabled():
|
||||
)
|
||||
|
||||
stage = client.get_stage(restApiId=api_id, stageName=stage_name)
|
||||
stage.should.have.key("tracingEnabled").equals(True)
|
||||
assert stage["tracingEnabled"] is True
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -467,7 +452,7 @@ def test_update_stage_remove_access_log_settings():
|
||||
)
|
||||
|
||||
stage = client.get_stage(restApiId=api_id, stageName=stage_name)
|
||||
stage.shouldnt.have.key("accessLogSettings")
|
||||
assert "accessLogSettings" not in stage
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -491,9 +476,10 @@ def test_update_stage_configuration_unknown_operation():
|
||||
],
|
||||
)
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("ValidationException")
|
||||
err["Message"].should.equal(
|
||||
"Member must satisfy enum value set: [add, remove, move, test, replace, copy]"
|
||||
assert err["Code"] == "ValidationException"
|
||||
assert (
|
||||
err["Message"]
|
||||
== "Member must satisfy enum value set: [add, remove, move, test, replace, copy]"
|
||||
)
|
||||
|
||||
|
||||
@ -506,4 +492,4 @@ def test_non_existent_stage():
|
||||
with pytest.raises(ClientError) as exc:
|
||||
client.get_stage(restApiId=api_id, stageName="xxx")
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("NotFoundException")
|
||||
assert err["Code"] == "NotFoundException"
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
import boto3
|
||||
import sure # noqa # pylint: disable=unused-import
|
||||
from moto import mock_apigateway
|
||||
from botocore.exceptions import ClientError
|
||||
import pytest
|
||||
@ -19,27 +18,24 @@ def test_create_request_validator():
|
||||
response = create_validator(client, api_id)
|
||||
response.pop(RESPONSE_METADATA)
|
||||
response.pop(ID)
|
||||
response.should.equal(
|
||||
{
|
||||
NAME: PARAM_NAME,
|
||||
VALIDATE_REQUEST_BODY: True,
|
||||
VALIDATE_REQUEST_PARAMETERS: True,
|
||||
}
|
||||
)
|
||||
assert response == {
|
||||
NAME: PARAM_NAME,
|
||||
VALIDATE_REQUEST_BODY: True,
|
||||
VALIDATE_REQUEST_PARAMETERS: True,
|
||||
}
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
def test_get_request_validators():
|
||||
|
||||
client = create_client()
|
||||
api_id = create_rest_api_id(client)
|
||||
response = client.get_request_validators(restApiId=api_id)
|
||||
|
||||
validators = response["items"]
|
||||
validators.should.have.length_of(0)
|
||||
assert len(validators) == 0
|
||||
|
||||
response.pop(RESPONSE_METADATA)
|
||||
response.should.equal({"items": []})
|
||||
assert response == {"items": []}
|
||||
|
||||
response = create_validator(client, api_id)
|
||||
validator_id1 = response[ID]
|
||||
@ -48,27 +44,25 @@ def test_get_request_validators():
|
||||
response = client.get_request_validators(restApiId=api_id)
|
||||
|
||||
validators = response["items"]
|
||||
validators.should.have.length_of(2)
|
||||
assert len(validators) == 2
|
||||
|
||||
response.pop(RESPONSE_METADATA)
|
||||
response.should.equal(
|
||||
{
|
||||
"items": [
|
||||
{
|
||||
ID: validator_id1,
|
||||
NAME: PARAM_NAME,
|
||||
VALIDATE_REQUEST_BODY: True,
|
||||
VALIDATE_REQUEST_PARAMETERS: True,
|
||||
},
|
||||
{
|
||||
ID: validator_id2,
|
||||
NAME: PARAM_NAME,
|
||||
VALIDATE_REQUEST_BODY: True,
|
||||
VALIDATE_REQUEST_PARAMETERS: True,
|
||||
},
|
||||
]
|
||||
}
|
||||
)
|
||||
assert response == {
|
||||
"items": [
|
||||
{
|
||||
ID: validator_id1,
|
||||
NAME: PARAM_NAME,
|
||||
VALIDATE_REQUEST_BODY: True,
|
||||
VALIDATE_REQUEST_PARAMETERS: True,
|
||||
},
|
||||
{
|
||||
ID: validator_id2,
|
||||
NAME: PARAM_NAME,
|
||||
VALIDATE_REQUEST_BODY: True,
|
||||
VALIDATE_REQUEST_PARAMETERS: True,
|
||||
},
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -81,14 +75,12 @@ def test_get_request_validator():
|
||||
restApiId=api_id, requestValidatorId=validator_id
|
||||
)
|
||||
response.pop(RESPONSE_METADATA)
|
||||
response.should.equal(
|
||||
{
|
||||
ID: validator_id,
|
||||
NAME: PARAM_NAME,
|
||||
VALIDATE_REQUEST_BODY: True,
|
||||
VALIDATE_REQUEST_PARAMETERS: True,
|
||||
}
|
||||
)
|
||||
assert response == {
|
||||
ID: validator_id,
|
||||
NAME: PARAM_NAME,
|
||||
VALIDATE_REQUEST_BODY: True,
|
||||
VALIDATE_REQUEST_PARAMETERS: True,
|
||||
}
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -103,14 +95,12 @@ def test_delete_request_validator():
|
||||
)
|
||||
|
||||
response.pop(RESPONSE_METADATA)
|
||||
response.should.equal(
|
||||
{
|
||||
ID: validator_id,
|
||||
NAME: PARAM_NAME,
|
||||
VALIDATE_REQUEST_BODY: True,
|
||||
VALIDATE_REQUEST_PARAMETERS: True,
|
||||
}
|
||||
)
|
||||
assert response == {
|
||||
ID: validator_id,
|
||||
NAME: PARAM_NAME,
|
||||
VALIDATE_REQUEST_BODY: True,
|
||||
VALIDATE_REQUEST_PARAMETERS: True,
|
||||
}
|
||||
|
||||
# delete validator
|
||||
response = client.delete_request_validator(
|
||||
@ -119,8 +109,8 @@ def test_delete_request_validator():
|
||||
with pytest.raises(ClientError) as ex:
|
||||
client.get_request_validator(restApiId=api_id, requestValidatorId=validator_id)
|
||||
err = ex.value.response["Error"]
|
||||
err["Code"].should.equal("BadRequestException")
|
||||
err["Message"].should.equal("Invalid Request Validator Id specified")
|
||||
assert err["Code"] == "BadRequestException"
|
||||
assert err["Message"] == "Invalid Request Validator Id specified"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -140,14 +130,12 @@ def test_update_request_validator():
|
||||
],
|
||||
)
|
||||
response.pop(RESPONSE_METADATA)
|
||||
response.should.equal(
|
||||
{
|
||||
ID: validator_id,
|
||||
NAME: PARAM_NAME + PARAM_NAME,
|
||||
VALIDATE_REQUEST_BODY: False,
|
||||
VALIDATE_REQUEST_PARAMETERS: False,
|
||||
}
|
||||
)
|
||||
assert response == {
|
||||
ID: validator_id,
|
||||
NAME: PARAM_NAME + PARAM_NAME,
|
||||
VALIDATE_REQUEST_BODY: False,
|
||||
VALIDATE_REQUEST_PARAMETERS: False,
|
||||
}
|
||||
|
||||
|
||||
def create_validator(client, api_id):
|
||||
|
||||
@ -10,7 +10,7 @@ def test_get_vpc_links_empty():
|
||||
client = boto3.client("apigateway", region_name="eu-west-1")
|
||||
|
||||
resp = client.get_vpc_links()
|
||||
resp.should.have.key("items").equals([])
|
||||
assert resp["items"] == []
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -24,12 +24,12 @@ def test_create_vpc_link():
|
||||
tags={"key1": "value1"},
|
||||
)
|
||||
|
||||
resp.should.have.key("id")
|
||||
resp.should.have.key("name").equals("vpcl")
|
||||
resp.should.have.key("description").equals("my first vpc link")
|
||||
resp.should.have.key("targetArns").equals(["elb:target:arn"])
|
||||
resp.should.have.key("status").equals("AVAILABLE")
|
||||
resp.should.have.key("tags").equals({"key1": "value1"})
|
||||
assert "id" in resp
|
||||
assert resp["name"] == "vpcl"
|
||||
assert resp["description"] == "my first vpc link"
|
||||
assert resp["targetArns"] == ["elb:target:arn"]
|
||||
assert resp["status"] == "AVAILABLE"
|
||||
assert resp["tags"] == {"key1": "value1"}
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -45,12 +45,12 @@ def test_get_vpc_link():
|
||||
|
||||
resp = client.get_vpc_link(vpcLinkId=vpc_link_id)
|
||||
|
||||
resp.should.have.key("id")
|
||||
resp.should.have.key("name").equals("vpcl")
|
||||
resp.should.have.key("description").equals("my first vpc link")
|
||||
resp.should.have.key("targetArns").equals(["elb:target:arn"])
|
||||
resp.should.have.key("status").equals("AVAILABLE")
|
||||
resp.should.have.key("tags").equals({"key1": "value1"})
|
||||
assert "id" in resp
|
||||
assert resp["name"] == "vpcl"
|
||||
assert resp["description"] == "my first vpc link"
|
||||
assert resp["targetArns"] == ["elb:target:arn"]
|
||||
assert resp["status"] == "AVAILABLE"
|
||||
assert resp["tags"] == {"key1": "value1"}
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -60,8 +60,8 @@ def test_get_vpc_link_unknown():
|
||||
with pytest.raises(ClientError) as exc:
|
||||
client.get_vpc_link(vpcLinkId="unknown")
|
||||
err = exc.value.response["Error"]
|
||||
err["Code"].should.equal("NotFoundException")
|
||||
err["Message"].should.equal("VPCLink not found")
|
||||
assert err["Code"] == "NotFoundException"
|
||||
assert err["Message"] == "VPCLink not found"
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -76,8 +76,8 @@ def test_get_vpc_links():
|
||||
)["id"]
|
||||
|
||||
links = client.get_vpc_links()["items"]
|
||||
links.should.have.length_of(1)
|
||||
links[0]["id"].should.equal(vpc_link_id)
|
||||
assert len(links) == 1
|
||||
assert links[0]["id"] == vpc_link_id
|
||||
|
||||
client.create_vpc_link(
|
||||
name="vpcl2",
|
||||
@ -87,7 +87,7 @@ def test_get_vpc_links():
|
||||
)
|
||||
|
||||
links = client.get_vpc_links()["items"]
|
||||
links.should.have.length_of(2)
|
||||
assert len(links) == 2
|
||||
|
||||
|
||||
@mock_apigateway
|
||||
@ -102,9 +102,9 @@ def test_delete_vpc_link():
|
||||
)["id"]
|
||||
|
||||
links = client.get_vpc_links()["items"]
|
||||
links.should.have.length_of(1)
|
||||
assert len(links) == 1
|
||||
|
||||
client.delete_vpc_link(vpcLinkId=vpc_link_id)
|
||||
|
||||
links = client.get_vpc_links()["items"]
|
||||
links.should.have.length_of(0)
|
||||
assert len(links) == 0
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
import sure # noqa # pylint: disable=unused-import
|
||||
import json
|
||||
|
||||
import moto.server as server
|
||||
@ -13,7 +12,7 @@ def test_list_apis():
|
||||
test_client = backend.test_client()
|
||||
|
||||
res = test_client.get("/restapis")
|
||||
json.loads(res.data).should.contain("item")
|
||||
assert "item" in json.loads(res.data)
|
||||
|
||||
|
||||
def test_usage_plans_apis():
|
||||
@ -22,33 +21,33 @@ def test_usage_plans_apis():
|
||||
|
||||
# List usage plans (expect empty)
|
||||
res = test_client.get("/usageplans")
|
||||
json.loads(res.data)["item"].should.have.length_of(0)
|
||||
assert len(json.loads(res.data)["item"]) == 0
|
||||
|
||||
# Create usage plan
|
||||
res = test_client.post("/usageplans", data=json.dumps({"name": "test"}))
|
||||
created_plan = json.loads(res.data)
|
||||
created_plan["name"].should.equal("test")
|
||||
assert created_plan["name"] == "test"
|
||||
|
||||
# List usage plans (expect 1 plan)
|
||||
res = test_client.get("/usageplans")
|
||||
json.loads(res.data)["item"].should.have.length_of(1)
|
||||
assert len(json.loads(res.data)["item"]) == 1
|
||||
|
||||
# Get single usage plan
|
||||
res = test_client.get(f"/usageplans/{created_plan['id']}")
|
||||
fetched_plan = json.loads(res.data)
|
||||
fetched_plan.should.equal(created_plan)
|
||||
assert fetched_plan == created_plan
|
||||
|
||||
# Not existing usage plan
|
||||
res = test_client.get("/usageplans/not_existing")
|
||||
res.status_code.should.equal(404)
|
||||
assert res.status_code == 404
|
||||
|
||||
# Delete usage plan
|
||||
res = test_client.delete(f"/usageplans/{created_plan['id']}")
|
||||
res.data.should.equal(b"{}")
|
||||
assert res.data == b"{}"
|
||||
|
||||
# List usage plans (expect empty again)
|
||||
res = test_client.get("/usageplans")
|
||||
json.loads(res.data)["item"].should.have.length_of(0)
|
||||
assert len(json.loads(res.data)["item"]) == 0
|
||||
|
||||
|
||||
def test_usage_plans_keys():
|
||||
@ -62,19 +61,19 @@ def test_usage_plans_keys():
|
||||
|
||||
# List usage plans keys (expect empty)
|
||||
res = test_client.get(f"/usageplans/{usage_plan_id}/keys")
|
||||
json.loads(res.data)["item"].should.have.length_of(0)
|
||||
assert len(json.loads(res.data)["item"]) == 0
|
||||
|
||||
# Invalid api key (does not exists at all)
|
||||
res = test_client.get(f"/usageplans/{usage_plan_id}/keys/not_existing")
|
||||
res.status_code.should.equal(404)
|
||||
assert res.status_code == 404
|
||||
|
||||
# not existing usage plan with existing api key
|
||||
res = test_client.get(f"/usageplans/not_existing/keys/{created_api_key['id']}")
|
||||
res.status_code.should.equal(404)
|
||||
assert res.status_code == 404
|
||||
|
||||
# not jet added api key
|
||||
res = test_client.get(f"/usageplans/{usage_plan_id}/keys/{created_api_key['id']}")
|
||||
res.status_code.should.equal(404)
|
||||
assert res.status_code == 404
|
||||
|
||||
# Create usage plan key
|
||||
res = test_client.post(
|
||||
@ -85,22 +84,22 @@ def test_usage_plans_keys():
|
||||
|
||||
# List usage plans keys (expect 1 key)
|
||||
res = test_client.get(f"/usageplans/{usage_plan_id}/keys")
|
||||
json.loads(res.data)["item"].should.have.length_of(1)
|
||||
assert len(json.loads(res.data)["item"]) == 1
|
||||
|
||||
# Get single usage plan key
|
||||
res = test_client.get(f"/usageplans/{usage_plan_id}/keys/{created_api_key['id']}")
|
||||
fetched_plan_key = json.loads(res.data)
|
||||
fetched_plan_key.should.equal(created_usage_plan_key)
|
||||
assert fetched_plan_key == created_usage_plan_key
|
||||
|
||||
# Delete usage plan key
|
||||
res = test_client.delete(
|
||||
f"/usageplans/{usage_plan_id}/keys/{created_api_key['id']}"
|
||||
)
|
||||
res.data.should.equal(b"{}")
|
||||
assert res.data == b"{}"
|
||||
|
||||
# List usage plans keys (expect to be empty again)
|
||||
res = test_client.get(f"/usageplans/{usage_plan_id}/keys")
|
||||
json.loads(res.data)["item"].should.have.length_of(0)
|
||||
assert len(json.loads(res.data)["item"]) == 0
|
||||
|
||||
|
||||
def test_create_usage_plans_key_non_existent_api_key():
|
||||
@ -113,7 +112,7 @@ def test_create_usage_plans_key_non_existent_api_key():
|
||||
f"/usageplans/{usage_plan_id}/keys",
|
||||
data=json.dumps({"keyId": "non-existent", "keyType": "API_KEY"}),
|
||||
)
|
||||
res.status_code.should.equal(404)
|
||||
assert res.status_code == 404
|
||||
|
||||
|
||||
def test_put_integration_response_without_body():
|
||||
@ -128,8 +127,8 @@ def test_put_integration_response_without_body():
|
||||
# client.put_integration_response(
|
||||
# restApiId=api_id, resourceId=root_id, httpMethod="GET", statusCode="200"
|
||||
# )
|
||||
# ex.value.response["Error"]["Code"].should.equal("BadRequestException")
|
||||
# ex.value.response["Error"]["Message"].should.equal("Invalid request input")
|
||||
# assert ex.value.response["Error"]["Code"] == "BadRequestException"
|
||||
# assert ex.value.response["Error"]["Message"] == "Invalid request input"
|
||||
#
|
||||
# As a workaround, we can create a PUT-request without body, which will force the error
|
||||
# Related: # https://github.com/aws/aws-sdk-js/issues/2588
|
||||
@ -140,7 +139,8 @@ def test_put_integration_response_without_body():
|
||||
res = test_client.put(
|
||||
"/restapis/f_id/resources/r_id/methods/m_id/integration/responses/200/"
|
||||
)
|
||||
res.status_code.should.equal(400)
|
||||
json.loads(res.data).should.equal(
|
||||
{"__type": "BadRequestException", "message": "Invalid request input"}
|
||||
)
|
||||
assert res.status_code == 400
|
||||
assert json.loads(res.data) == {
|
||||
"__type": "BadRequestException",
|
||||
"message": "Invalid request input",
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user