Skip to content

Commit da8b416

Browse files
- Tests pass.
1 parent 787f0f1 commit da8b416

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

test/python/flask/azure/app.py

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,6 @@ def keys_list_02(resourceGroupName):
213213
response.status_code = 200
214214
return response
215215

216-
@app.route('/subscriptions/000000-0000-0000-0000-000000000022/resourceGroups/<resourceGroupName>/providers/Microsoft.KeyVault/vaults/stackql-alt-keyvault/keys/', methods=['GET'])
217-
def keys_list_03(resourceGroupName):
218-
template_name = "keys-list-02.json"
219-
response = make_response(render_template(template_name, request=request))
220-
response.headers.update({"Content-Type": "application/json"})
221-
response.status_code = 200
222-
return response
223-
224216
@app.route('/subscriptions/000000-0000-0000-0000-000000000022/resourceGroups/<resourceGroupName>/providers/Microsoft.KeyVault/vaults/stackql-testing-keyvault/keys/dummy-key-01/', methods=['GET'])
225217
def key_detail_01(resourceGroupName):
226218
template_name = "key-detail-01.json"
@@ -269,14 +261,30 @@ def key_detail_06(resourceGroupName):
269261
response.status_code = 200
270262
return response
271263

272-
@app.route('/subscriptions/000000-0000-0000-0000-000000000011/resourceGroups/<resourceGroupName>/providers/Microsoft.KeyVault/vaults/stackql-testing-keyvault/keys/', methods=['GET']):
264+
@app.route('/subscriptions/000000-0000-0000-0000-000000000011/resourceGroups/<resourceGroupName>/providers/Microsoft.KeyVault/vaults/stackql-testing-keyvault/keys/', methods=['GET'])
273265
def keys_list_03(resourceGroupName):
274266
template_name = "keys-list-03.json"
275267
response = make_response(render_template(template_name, request=request))
276268
response.headers.update({"Content-Type": "application/json"})
277269
response.status_code = 200
278270
return response
279271

272+
@app.route('/subscriptions/<subscriptionId>/providers/Microsoft.Compute/sshPublicKeys/', methods=['GET'])
273+
def ssh_public_keys_list(subscriptionId):
274+
template_name = "ssh-public-keys-list-01.json"
275+
response = make_response(render_template(template_name, request=request))
276+
response.headers.update({"Content-Type": "application/json"})
277+
response.status_code = 200
278+
return response
279+
280+
@app.route('/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupId>/providers/Microsoft.Compute/virtualMachines/', methods=['GET'])
281+
def virtual_machines_list(subscriptionId, resourceGroupId):
282+
template_name = "virtual-machines-list-01.json"
283+
response = make_response(render_template(template_name, request=request))
284+
response.headers.update({"Content-Type": "application/json"})
285+
response.status_code = 200
286+
return response
287+
280288
# A catch-all route that accepts any path
281289
@app.route('/<path:any_path>', methods=['GET', 'POST', 'PUT', 'DELETE', 'PATCH'])
282290
def catch_all(any_path):
@@ -287,8 +295,9 @@ def generic_handler(request: Request):
287295
route_cfg: dict = cfg_obj.match_route(request)
288296
template_name = route_cfg.get("httpResponse", {}).get("template", "")
289297
if not template_name:
290-
logger.error(f"Missing template for route: {request}")
291-
return jsonify({'error': f'Missing template for route: {request}'}), 500
298+
rv = make_response(render_template('nil-response.json', request=request))
299+
rv.status_code = 404
300+
return rv
292301
logger.info(f"routing to template: {template_name}")
293302
response = make_response(render_template(template_name, request=request))
294303
response.headers.update(route_cfg.get("httpResponse", {}).get("headers", {}))

test/python/flask/azure/expectations.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
}
8484
},
8585
"httpResponse": {
86-
"template": "vpn-gateways-list.json",
86+
"template": "vpn-gateways-list-01.json",
8787
"headers": {
8888
"Content-Type": "application/json; charset=utf-8"
8989
}

test/python/flask/azure/templates/nil-response.json

Whitespace-only changes.

test/python/flask/azure/templates/virtuall-machines-list-01.json renamed to test/python/flask/azure/templates/virtual-machines-list-01.json

File renamed without changes.

0 commit comments

Comments
 (0)