Skip to content
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.

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

Access Log API Support for Virtual Gateways #222

Merged
merged 4 commits into from
Jun 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 7 additions & 19 deletions appmesh-preview/sdk/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -1700,6 +1700,9 @@
},
"listeners": {
"shape": "VirtualGatewayListeners"
},
"logging": {
"shape": "VirtualGatewayLogging"
}
}
},
Expand Down Expand Up @@ -1844,9 +1847,6 @@
"healthCheck": {
"shape": "VirtualGatewayHealthCheckPolicy"
},
"logging": {
"shape": "VirtualGatewayLogging"
},
"portMapping": {
"shape": "VirtualGatewayPortMapping"
},
Expand Down Expand Up @@ -4013,10 +4013,7 @@
"shape": "TcpRouteAction"
},
"timeout": {
"shape": "TcpTimeout",
"tags": [
"preview"
]
"shape": "TcpTimeout"
}
}
},
Expand Down Expand Up @@ -4455,10 +4452,7 @@
"shape": "PortMapping"
},
"timeout": {
"shape": "ListenerTimeout",
"tags": [
"preview"
]
"shape": "ListenerTimeout"
},
"tls": {
"shape": "ListenerTls"
Expand All @@ -4482,10 +4476,7 @@
"shape": "GrpcRetryPolicy"
},
"timeout": {
"shape": "GrpcTimeout",
"tags": [
"preview"
]
"shape": "GrpcTimeout"
}
}
},
Expand Down Expand Up @@ -4906,10 +4897,7 @@
"shape": "HttpRetryPolicy"
},
"timeout": {
"shape": "HttpTimeout",
"tags": [
"preview"
]
"shape": "HttpTimeout"
}
}
},
Expand Down
61 changes: 33 additions & 28 deletions appmesh-preview/sdk/api.normal.json
Original file line number Diff line number Diff line change
Expand Up @@ -1772,6 +1772,9 @@
},
"listeners": {
"shape": "VirtualGatewayListeners"
},
"logging": {
"shape": "VirtualGatewayLogging"
}
}
},
Expand Down Expand Up @@ -1922,9 +1925,6 @@
"healthCheck": {
"shape": "VirtualGatewayHealthCheckPolicy"
},
"logging": {
"shape": "VirtualGatewayLogging"
},
"portMapping": {
"shape": "VirtualGatewayPortMapping"
},
Expand Down Expand Up @@ -2504,18 +2504,23 @@
"type": "structure",
"members": {
"grpc": {
"shape": "GrpcTimeout"
"shape": "GrpcTimeout",
"documentation": "<p>An object that represents types of timeouts. </p>"
},
"http": {
"shape": "HttpTimeout"
"shape": "HttpTimeout",
"documentation": "<p>An object that represents types of timeouts. </p>"
},
"http2": {
"shape": "HttpTimeout"
"shape": "HttpTimeout",
"documentation": "<p>An object that represents types of timeouts. </p>"
},
"tcp": {
"shape": "TcpTimeout"
"shape": "TcpTimeout",
"documentation": "<p>An object that represents types of timeouts. </p>"
}
}
},
"documentation": "<p>An object that represents timeouts for different protocols.</p>"
},
"MeshList": {
"type": "list",
Expand Down Expand Up @@ -3282,12 +3287,15 @@
"type": "structure",
"members": {
"idle": {
"shape": "Duration"
"shape": "Duration",
"documentation": "<p>An object that represents an idle timeout. An idle timeout bounds the amount of time that a connection may be idle. The default value is none.</p>"
},
"perRequest": {
"shape": "Duration"
"shape": "Duration",
"documentation": "<p>An object that represents a per request timeout. The default value is 15 seconds. If you set a higher timeout, then make sure that the higher value is set for each App Mesh resource in a conversation. For example, if a virtual node backend uses a virtual router provider to route to another virtual node, then the timeout should be greater than 15 seconds for the source and destination virtual node and the route.</p>"
Comment on lines +3294 to +3295

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "for the source and destination" could use some clarification. Shouldn't it be the other way around? This is what I get from the description:

[VN w/ backend timeout=20] --> [VS] --> [VR + Route] --> [VN timeout=25]

But logically it seems like the VN using the other service as a backend should have a larger timeout. Like this:

[VN w/ backend timeout=25] --> [VS] --> [VR + Route] --> [VN timeout=20]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is auto-generated from our doc-model, can take this discussion offline.

}
}
},
"documentation": "<p>An object that represents types of timeouts. </p>"
},
"DeleteVirtualServiceInput": {
"type": "structure",
Expand Down Expand Up @@ -3936,12 +3944,15 @@
"type": "structure",
"members": {
"idle": {
"shape": "Duration"
"shape": "Duration",
"documentation": "<p>An object that represents an idle timeout. An idle timeout bounds the amount of time that a connection may be idle. The default value is none.</p>"
},
"perRequest": {
"shape": "Duration"
"shape": "Duration",
"documentation": "<p>An object that represents a per request timeout. The default value is 15 seconds. If you set a higher timeout, then make sure that the higher value is set for each App Mesh resource in a conversation. For example, if a virtual node backend uses a virtual router provider to route to another virtual node, then the timeout should be greater than 15 seconds for the source and destination virtual node and the route.</p>"
}
}
},
"documentation": "<p>An object that represents types of timeouts. </p>"
},
"VirtualNodeStatus": {
"type": "structure",
Expand Down Expand Up @@ -4356,9 +4367,7 @@
},
"timeout": {
"shape": "TcpTimeout",
"tags": [
"preview"
]
"documentation": "<p>An object that represents types of timeouts. </p>"
}
},
"documentation": "<p>An object that represents a TCP route type.</p>"
Expand Down Expand Up @@ -4855,9 +4864,7 @@
},
"timeout": {
"shape": "ListenerTimeout",
"tags": [
"preview"
]
"documentation": "<p>An object that represents timeouts for different protocols.</p>"
},
"tls": {
"shape": "ListenerTls",
Expand Down Expand Up @@ -4887,9 +4894,7 @@
},
"timeout": {
"shape": "GrpcTimeout",
"tags": [
"preview"
]
"documentation": "<p>An object that represents types of timeouts. </p>"
}
},
"documentation": "<p>An object that represents a gRPC route type.</p>"
Expand Down Expand Up @@ -5250,9 +5255,11 @@
"type": "structure",
"members": {
"idle": {
"shape": "Duration"
"shape": "Duration",
"documentation": "<p>An object that represents an idle timeout. An idle timeout bounds the amount of time that a connection may be idle. The default value is none.</p>"
}
}
},
"documentation": "<p>An object that represents types of timeouts. </p>"
},
"HttpScheme": {
"type": "string",
Expand Down Expand Up @@ -5357,9 +5364,7 @@
},
"timeout": {
"shape": "HttpTimeout",
"tags": [
"preview"
]
"documentation": "<p>An object that represents types of timeouts. </p>"
}
},
"documentation": "<p>An object that represents an HTTP or HTTP/2 route type.</p>"
Expand Down
39 changes: 28 additions & 11 deletions appmesh-preview/sdk/docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,8 @@
"refs": {
"GrpcRoute$action": "<p>An object that represents the action to take if a match is determined.</p>",
"GrpcRoute$match": "<p>An object that represents the criteria for determining a request match.</p>",
"GrpcRoute$retryPolicy": "<p>An object that represents a retry policy.</p>"
"GrpcRoute$retryPolicy": "<p>An object that represents a retry policy.</p>",
"GrpcRoute$timeout": "<p>An object that represents types of timeouts. </p>"
}
},
"GrpcRouteAction": {
Expand Down Expand Up @@ -560,8 +561,11 @@
}
},
"GrpcTimeout": {
"base": null,
"refs": { }
"base": "<p>An object that represents types of timeouts. </p>",
"refs": {
"GrpcTimeout$idle": "<p>An object that represents an idle timeout. An idle timeout bounds the amount of time that a connection may be idle. The default value is none.</p>",
"GrpcTimeout$perRequest": "<p>An object that represents a per request timeout. The default value is 15 seconds. If you set a higher timeout, then make sure that the higher value is set for each App Mesh resource in a conversation. For example, if a virtual node backend uses a virtual router provider to route to another virtual node, then the timeout should be greater than 15 seconds for the source and destination virtual node and the route.</p>"
}
},
"HeaderMatch": {
"base": null,
Expand Down Expand Up @@ -649,7 +653,8 @@
"refs": {
"HttpRoute$action": "<p>An object that represents the action to take if a match is determined.</p>",
"HttpRoute$match": "<p>An object that represents the criteria for determining a request match.</p>",
"HttpRoute$retryPolicy": "<p>An object that represents a retry policy.</p>"
"HttpRoute$retryPolicy": "<p>An object that represents a retry policy.</p>",
"HttpRoute$timeout": "<p>An object that represents types of timeouts. </p>"
}
},
"HttpRouteAction": {
Expand Down Expand Up @@ -686,8 +691,11 @@
"refs": { }
},
"HttpTimeout": {
"base": null,
"refs": { }
"base": "<p>An object that represents types of timeouts. </p>",
"refs": {
"HttpTimeout$idle": "<p>An object that represents an idle timeout. An idle timeout bounds the amount of time that a connection may be idle. The default value is none.</p>",
"HttpTimeout$perRequest": "<p>An object that represents a per request timeout. The default value is 15 seconds. If you set a higher timeout, then make sure that the higher value is set for each App Mesh resource in a conversation. For example, if a virtual node backend uses a virtual router provider to route to another virtual node, then the timeout should be greater than 15 seconds for the source and destination virtual node and the route.</p>"
}
},
"InternalServerErrorException": {
"base": "<p>The request processing has failed because of an unknown error, exception, or\n failure.</p>",
Expand Down Expand Up @@ -825,12 +833,18 @@
"refs": {
"Listener$healthCheck": "<p>The health check information for the listener.</p>",
"Listener$portMapping": "<p>The port mapping information for the listener.</p>",
"Listener$timeout": "<p>An object that represents timeouts for different protocols.</p>",
"Listener$tls": "<p>A reference to an object that represents the Transport Layer Security (TLS) properties for a listener.</p>"
}
},
"ListenerTimeout": {
"base": null,
"refs": { }
"base": "<p>An object that represents timeouts for different protocols.</p>",
"refs": {
"ListenerTimeout$grpc": "<p>An object that represents types of timeouts. </p>",
"ListenerTimeout$http": "<p>An object that represents types of timeouts. </p>",
"ListenerTimeout$http2": "<p>An object that represents types of timeouts. </p>",
"ListenerTimeout$tcp": "<p>An object that represents types of timeouts. </p>"
}
},
"ListenerTls": {
"base": "<p>An object that represents the Transport Layer Security (TLS) properties for a listener.</p>",
Expand Down Expand Up @@ -1094,7 +1108,8 @@
"TcpRoute": {
"base": "<p>An object that represents a TCP route type.</p>",
"refs": {
"TcpRoute$action": "<p>The action to take if a match is determined.</p>"
"TcpRoute$action": "<p>The action to take if a match is determined.</p>",
"TcpRoute$timeout": "<p>An object that represents types of timeouts. </p>"
}
},
"TcpRouteAction": {
Expand All @@ -1104,8 +1119,10 @@
}
},
"TcpTimeout": {
"base": null,
"refs": { }
"base": "<p>An object that represents types of timeouts. </p>",
"refs": {
"TcpTimeout$idle": "<p>An object that represents an idle timeout. An idle timeout bounds the amount of time that a connection may be idle. The default value is none.</p>"
}
},
"Timestamp": {
"base": null,
Expand Down
Loading