diff options
author | John Estabrook <jestabro@vyos.io> | 2024-09-29 20:49:30 -0500 |
---|---|---|
committer | John Estabrook <jestabro@vyos.io> | 2024-09-29 22:21:21 -0500 |
commit | 40d966310cb5d8d758f7fa801facd0a560795783 (patch) | |
tree | 5e2b03ac317e241809b8e9a7be944a42d8bf7b07 | |
parent | 8322cc4d82067d7efe5051250c58d8cfbc895bce (diff) | |
download | vyos-1x-40d966310cb5d8d758f7fa801facd0a560795783.tar.gz vyos-1x-40d966310cb5d8d758f7fa801facd0a560795783.zip |
http-api: T6736: add migration script and update version
-rw-r--r-- | interface-definitions/include/version/https-version.xml.i | 2 | ||||
-rw-r--r-- | src/migration-scripts/https/6-to-7 | 43 |
2 files changed, 44 insertions, 1 deletions
diff --git a/interface-definitions/include/version/https-version.xml.i b/interface-definitions/include/version/https-version.xml.i index 525314dbd..a889a7805 100644 --- a/interface-definitions/include/version/https-version.xml.i +++ b/interface-definitions/include/version/https-version.xml.i @@ -1,3 +1,3 @@ <!-- include start from include/version/https-version.xml.i --> -<syntaxVersion component='https' version='6'></syntaxVersion> +<syntaxVersion component='https' version='7'></syntaxVersion> <!-- include end --> diff --git a/src/migration-scripts/https/6-to-7 b/src/migration-scripts/https/6-to-7 new file mode 100644 index 000000000..571f3b6ae --- /dev/null +++ b/src/migration-scripts/https/6-to-7 @@ -0,0 +1,43 @@ +# Copyright 2024 VyOS maintainers and contributors <maintainers@vyos.io> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library. If not, see <http://www.gnu.org/licenses/>. + +# T6736: move REST API to distinct node + + +from vyos.configtree import ConfigTree + + +base = ['service', 'https', 'api'] + +def migrate(config: ConfigTree) -> None: + if not config.exists(base): + # Nothing to do + return + + # Move REST API configuration to new node + # REST API was previously enabled if base path exists + config.set(['service', 'https', 'api', 'rest']) + for entry in ('debug', 'strict'): + if config.exists(base + [entry]): + config.set(base + ['rest', entry]) + config.delete(base + [entry]) + + # Move CORS settings under GraphQL + # CORS is not implemented for REST API + if config.exists(base + ['cors']): + old_base = base + ['cors'] + new_base = base + ['graphql', 'cors'] + config.copy(old_base, new_base) + config.delete(old_base) |