Skip to content

Commit 7a0a17a

Browse files
wtobis-splunkwtobis-splunk
committed
fix: replace <base href> with explicit relative paths in templates
1 parent 57fe298 commit 7a0a17a

File tree

9 files changed

+39
-44
lines changed

9 files changed

+39
-44
lines changed

‎splunk_add_on_ucc_framework/package/appserver/templates/base.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
<meta http-equiv="x-ua-compatible" content="ie=edge" />
2222
<title>Loading</title>
2323
<meta name="viewport" content="width=device-width, initial-scale=1" />
24-
<base href="../../" />
25-
<script src="config?autoload=1" crossorigin="use-credentials"></script>
26-
<script src="static/js/i18n.js"></script>
27-
<script src="i18ncatalog?autoload=1"></script>
24+
<script src="../../config?autoload=1" crossorigin="use-credentials"></script>
25+
<script src="../../static/js/i18n.js"></script>
26+
<script src="../../i18ncatalog?autoload=1"></script>
2827
</head>
2928

3029
<body>
31-
<script type="module" src="static/app/__APP_NAME__/js/build/entry_page.js"></script>
30+
<script type="module" src="../../static/app/__APP_NAME__/js/build/entry_page.js"></script>
3231
</body>
3332
</html>

‎splunk_add_on_ucc_framework/package/appserver/templates/redirect.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,15 @@
2121
<meta http-equiv="x-ua-compatible" content="ie=edge" />
2222
<title>Loading</title>
2323
<meta name="viewport" content="width=device-width, initial-scale=1" />
24-
<base href="../../" />
25-
<script src="config?autoload=1" crossorigin="use-credentials"></script>
26-
<script src="static/js/i18n.js"></script>
27-
<script src="i18ncatalog?autoload=1"></script>
24+
<script src="../../config?autoload=1" crossorigin="use-credentials"></script>
25+
<script src="../../static/js/i18n.js"></script>
26+
<script src="../../i18ncatalog?autoload=1"></script>
2827
</head>
2928

3029
<body>
3130
<script
3231
type="module"
33-
src="static/app/__APP_NAME__/js/build/__TA_NAME___redirect_page.__TA_VERSION__.js"
32+
src="../../static/app/__APP_NAME__/js/build/__TA_NAME___redirect_page.__TA_VERSION__.js"
3433
></script>
3534
</body>
3635
</html>

‎tests/testdata/expected_addons/expected_addon_no_configuration/Splunk_TA_UCCExample/appserver/templates/base.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
<meta http-equiv="x-ua-compatible" content="ie=edge" />
2222
<title>Loading</title>
2323
<meta name="viewport" content="width=device-width, initial-scale=1" />
24-
<base href="../../" />
25-
<script src="config?autoload=1" crossorigin="use-credentials"></script>
26-
<script src="static/js/i18n.js"></script>
27-
<script src="i18ncatalog?autoload=1"></script>
24+
<script src="../../config?autoload=1" crossorigin="use-credentials"></script>
25+
<script src="../../static/js/i18n.js"></script>
26+
<script src="../../i18ncatalog?autoload=1"></script>
2827
</head>
2928

3029
<body>
31-
<script type="module" src="static/app/Splunk_TA_UCCExample/js/build/entry_page.js"></script>
30+
<script type="module" src="../../static/app/Splunk_TA_UCCExample/js/build/entry_page.js"></script>
3231
</body>
3332
</html>

‎tests/testdata/expected_addons/expected_output_global_config_configuration/Splunk_TA_UCCExample/appserver/templates/base.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
<meta http-equiv="x-ua-compatible" content="ie=edge" />
2222
<title>Loading</title>
2323
<meta name="viewport" content="width=device-width, initial-scale=1" />
24-
<base href="../../" />
25-
<script src="config?autoload=1" crossorigin="use-credentials"></script>
26-
<script src="static/js/i18n.js"></script>
27-
<script src="i18ncatalog?autoload=1"></script>
24+
<script src="../../config?autoload=1" crossorigin="use-credentials"></script>
25+
<script src="../../static/js/i18n.js"></script>
26+
<script src="../../i18ncatalog?autoload=1"></script>
2827
</head>
2928

3029
<body>
31-
<script type="module" src="static/app/Splunk_TA_UCCExample/js/build/entry_page.js"></script>
30+
<script type="module" src="../../static/app/Splunk_TA_UCCExample/js/build/entry_page.js"></script>
3231
</body>
3332
</html>

‎tests/testdata/expected_addons/expected_output_global_config_configuration/Splunk_TA_UCCExample/appserver/templates/splunk_ta_uccexample_redirect.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,15 @@
2121
<meta http-equiv="x-ua-compatible" content="ie=edge" />
2222
<title>Loading</title>
2323
<meta name="viewport" content="width=device-width, initial-scale=1" />
24-
<base href="../../" />
25-
<script src="config?autoload=1" crossorigin="use-credentials"></script>
26-
<script src="static/js/i18n.js"></script>
27-
<script src="i18ncatalog?autoload=1"></script>
24+
<script src="../../config?autoload=1" crossorigin="use-credentials"></script>
25+
<script src="../../static/js/i18n.js"></script>
26+
<script src="../../i18ncatalog?autoload=1"></script>
2827
</head>
2928

3029
<body>
3130
<script
3231
type="module"
33-
src="static/app/Splunk_TA_UCCExample/js/build/splunk_ta_uccexample_redirect_page.1.0.0.js"
32+
src="../../static/app/Splunk_TA_UCCExample/js/build/splunk_ta_uccexample_redirect_page.1.0.0.js"
3433
></script>
3534
</body>
3635
</html>

‎tests/testdata/expected_addons/expected_output_global_config_everything/Splunk_TA_UCCExample/appserver/templates/base.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
<meta http-equiv="x-ua-compatible" content="ie=edge" />
2222
<title>Loading</title>
2323
<meta name="viewport" content="width=device-width, initial-scale=1" />
24-
<base href="../../" />
25-
<script src="config?autoload=1" crossorigin="use-credentials"></script>
26-
<script src="static/js/i18n.js"></script>
27-
<script src="i18ncatalog?autoload=1"></script>
24+
<script src="../../config?autoload=1" crossorigin="use-credentials"></script>
25+
<script src="../../static/js/i18n.js"></script>
26+
<script src="../../i18ncatalog?autoload=1"></script>
2827
</head>
2928

3029
<body>
31-
<script type="module" src="static/app/Splunk_TA_UCCExample/js/build/entry_page.js"></script>
30+
<script type="module" src="../../static/app/Splunk_TA_UCCExample/js/build/entry_page.js"></script>
3231
</body>
3332
</html>

‎tests/testdata/expected_addons/expected_output_global_config_everything/Splunk_TA_UCCExample/appserver/templates/splunk_ta_uccexample_redirect.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,15 @@
2121
<meta http-equiv="x-ua-compatible" content="ie=edge" />
2222
<title>Loading</title>
2323
<meta name="viewport" content="width=device-width, initial-scale=1" />
24-
<base href="../../" />
25-
<script src="config?autoload=1" crossorigin="use-credentials"></script>
26-
<script src="static/js/i18n.js"></script>
27-
<script src="i18ncatalog?autoload=1"></script>
24+
<script src="../../config?autoload=1" crossorigin="use-credentials"></script>
25+
<script src="../../static/js/i18n.js"></script>
26+
<script src="../../i18ncatalog?autoload=1"></script>
2827
</head>
2928

3029
<body>
3130
<script
3231
type="module"
33-
src="static/app/Splunk_TA_UCCExample/js/build/splunk_ta_uccexample_redirect_page.5.5.8R5fd76615.js"
32+
src="../../static/app/Splunk_TA_UCCExample/js/build/splunk_ta_uccexample_redirect_page.5.5.8R5fd76615.js"
3433
></script>
3534
</body>
3635
</html>

‎tests/testdata/test_addons/package_global_config_configuration/package/appserver/templates/base.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
<meta http-equiv="x-ua-compatible" content="ie=edge" />
2222
<title>Loading</title>
2323
<meta name="viewport" content="width=device-width, initial-scale=1" />
24-
<base href="../../" />
25-
<script src="config?autoload=1" crossorigin="use-credentials"></script>
26-
<script src="static/js/i18n.js"></script>
27-
<script src="i18ncatalog?autoload=1"></script>
24+
<script src="../../config?autoload=1" crossorigin="use-credentials"></script>
25+
<script src="../../static/js/i18n.js"></script>
26+
<script src="../../i18ncatalog?autoload=1"></script>
2827
</head>
2928

3029
<body>
31-
<script type="module" src="static/app/__APP_NAME__/js/build/entry_page.js"></script>
30+
<script type="module" src="../../static/app/__APP_NAME__/js/build/entry_page.js"></script>
3231
</body>
3332
</html>

‎tests/unit/test_package_files_update.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ def test_package_files_update_replaces_legacy_base_template(tmp_path, caplog):
4848

4949
handle_package_files_update(str(tmp_path))
5050

51-
assert '<base href="../../" />' in template_path.read_text()
51+
assert '<script src="../../config?autoload=1"' in template_path.read_text()
5252
assert (
53-
'<script type="module" src="static/app/__APP_NAME__/js/build/entry_page.js"></script>'
53+
'<script type="module" src="../../static/app/__APP_NAME__/js/build/entry_page.js"></script>'
5454
in template_path.read_text()
5555
)
5656
assert "cherrypy.request.path_info" not in template_path.read_text()
@@ -69,8 +69,11 @@ def test_package_files_update_replaces_legacy_redirect_template(tmp_path, caplog
6969

7070
handle_package_files_update(str(tmp_path))
7171

72-
assert '<base href="../../" />' in template_path.read_text()
73-
assert "__TA_NAME___redirect_page.__TA_VERSION__.js" in template_path.read_text()
72+
assert '<script src="../../config?autoload=1"' in template_path.read_text()
73+
assert (
74+
"../../static/app/__APP_NAME__/js/build/__TA_NAME___redirect_page.__TA_VERSION__.js"
75+
in template_path.read_text()
76+
)
7477
assert "cherrypy.request.path_info" not in template_path.read_text()
7578
assert "${make_url(" not in template_path.read_text()
7679
assert caplog.messages == [

0 commit comments

Comments
 (0)