openstack/zaqar
Code Issues Proposed changes

Merge "Reject enabling v1 API"

Browse Source
This commit is contained in:
Zuul
2025-08-12 00:47:01 +00:00
committed by Gerrit Code Review
parent 30cd9699c3 582bf02ab4
commit 36b986a615
23 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@@ -81,7 +81,7 @@ function configure_zaqar {
iniset $ZAQAR_CONF DEFAULT debug True iniset $ZAQAR_CONF DEFAULT debug True
iniset $ZAQAR_CONF DEFAULT unreliable True iniset $ZAQAR_CONF DEFAULT unreliable True
iniset $ZAQAR_CONF DEFAULT admin_mode True iniset $ZAQAR_CONF DEFAULT admin_mode True
iniset $ZAQAR_CONF DEFAULT enable_deprecated_api_versions 1,1.1 iniset $ZAQAR_CONF DEFAULT enable_deprecated_api_versions 1.1
iniset $ZAQAR_CONF signed_url secret_key notreallysecret iniset $ZAQAR_CONF signed_url secret_key notreallysecret
if is_service_enabled key; then if is_service_enabled key; then

2
zaqar/conf/default.py
View File

@@ -35,7 +35,7 @@ unreliable = cfg.BoolOpt(
enable_deprecated_api_versions = cfg.ListOpt( enable_deprecated_api_versions = cfg.ListOpt(
'enable_deprecated_api_versions', default=[], 'enable_deprecated_api_versions', default=[],
item_type=cfg.types.String(choices=('1', '1.1')), item_type=cfg.types.String(choices=('1.1',)),
help='List of deprecated API versions to enable.') help='List of deprecated API versions to enable.')

2
zaqar/tests/etc/drivers_storage_invalid.conf
View File

@@ -2,7 +2,7 @@
debug = False debug = False
verbose = False verbose = False
admin_mode = False admin_mode = False
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/drivers_transport_invalid.conf
View File

@@ -1,7 +1,7 @@
[DEFAULT] [DEFAULT]
debug = False debug = False
verbose = False verbose = False
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = invalid transport = invalid

2
zaqar/tests/etc/functional-tests.conf
View File

@@ -1,7 +1,7 @@
[DEFAULT] [DEFAULT]
# run_tests = True # run_tests = True
unreliable = True unreliable = True
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[zaqar] [zaqar]
# url = http://0.0.0.0:8888 # url = http://0.0.0.0:8888

4
zaqar/tests/etc/functional-zaqar.conf
View File

@@ -5,7 +5,7 @@ verbose = True
# Show debugging output in logs (sets DEBUG log level output) # Show debugging output in logs (sets DEBUG log level output)
debug = True debug = True
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
# Log to this file! # Log to this file!
; log_file = /var/log/zaqar/server.log ; log_file = /var/log/zaqar/server.log
@@ -22,7 +22,7 @@ enable_deprecated_api_versions = 1,1.1
;syslog_log_facility = LOG_LOCAL0 ;syslog_log_facility = LOG_LOCAL0
unreliable = True unreliable = True
enable_deprecated_api_versions = 1, 1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
# Transport driver module (e.g., wsgi) # Transport driver module (e.g., wsgi)

2
zaqar/tests/etc/keystone_auth.conf
View File

@@ -3,7 +3,7 @@ auth_strategy = keystone
debug = False debug = False
verbose = False verbose = False
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/websocket_mongodb.conf
View File

@@ -1,6 +1,6 @@
[DEFAULT] [DEFAULT]
unreliable = True unreliable = True
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]

2
zaqar/tests/etc/websocket_mongodb_keystone_auth.conf
View File

@@ -1,6 +1,6 @@
[DEFAULT] [DEFAULT]
auth_strategy = keystone auth_strategy = keystone
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]

2
zaqar/tests/etc/websocket_mongodb_subscriptions.conf
View File

@@ -1,6 +1,6 @@
[DEFAULT] [DEFAULT]
unreliable = True unreliable = True
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]

2
zaqar/tests/etc/wsgi_faulty.conf
View File

@@ -1,7 +1,7 @@
[DEFAULT] [DEFAULT]
debug = False debug = False
verbose = False verbose = False
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/wsgi_fifo_mongodb.conf
View File

@@ -2,7 +2,7 @@
debug = False debug = False
verbose = False verbose = False
unreliable = True unreliable = True
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/wsgi_mongodb.conf
View File

@@ -2,7 +2,7 @@
debug = False debug = False
verbose = False verbose = False
unreliable = True unreliable = True
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/wsgi_mongodb_default_limits.conf
View File

@@ -1,5 +1,5 @@
[DEFAULT] [DEFAULT]
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/wsgi_mongodb_pooled.conf
View File

@@ -2,7 +2,7 @@
pooling = True pooling = True
admin_mode = True admin_mode = True
unreliable = True unreliable = True
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/wsgi_mongodb_pooled_disable_virtual_pool.conf
View File

@@ -2,7 +2,7 @@
pooling = True pooling = True
admin_mode = True admin_mode = True
unreliable = True unreliable = True
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/wsgi_mongodb_validation.conf
View File

@@ -1,5 +1,5 @@
[DEFAULT] [DEFAULT]
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/wsgi_redis.conf
View File

@@ -1,7 +1,7 @@
[DEFAULT] [DEFAULT]
debug = False debug = False
verbose = False verbose = False
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/wsgi_redis_pooled.conf
View File

@@ -1,6 +1,6 @@
[DEFAULT] [DEFAULT]
pooling = True pooling = True
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/wsgi_sqlalchemy.conf
View File

@@ -2,7 +2,7 @@
debug = False debug = False
verbose = False verbose = False
admin_mode = False admin_mode = False
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/wsgi_sqlalchemy_pooled.conf
View File

@@ -1,7 +1,7 @@
[DEFAULT] [DEFAULT]
pooling = True pooling = True
admin_mode = True admin_mode = True
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

2
zaqar/tests/etc/wsgi_swift.conf
View File

@@ -1,7 +1,7 @@
[DEFAULT] [DEFAULT]
debug = False debug = False
verbose = False verbose = False
enable_deprecated_api_versions = 1,1.1 enable_deprecated_api_versions = 1.1
[drivers] [drivers]
transport = wsgi transport = wsgi

6
zaqar/tests/unit/common/test_decorators.py
View File

@@ -150,7 +150,7 @@ class TestDecorators(base.TestBase):
self.config(enable_deprecated_api_versions=[]) self.config(enable_deprecated_api_versions=[])
# 1. Test accessing current API version # 1. Test accessing current API version
VERSION = { VERSION = {
'id': '1', 'id': '2',
'status': 'CURRENT', 'status': 'CURRENT',
'updated': 'Just yesterday' 'updated': 'Just yesterday'
} }
@@ -163,7 +163,7 @@ class TestDecorators(base.TestBase):
# 2. Test accessing deprecated API version # 2. Test accessing deprecated API version
VERSION = { VERSION = {
'id': '1', 'id': '1.1',
'status': 'DEPRECATED', 'status': 'DEPRECATED',
'updated': 'A long time ago' 'updated': 'A long time ago'
} }
@@ -175,7 +175,7 @@ class TestDecorators(base.TestBase):
public_endpoint_2(None, self.conf) public_endpoint_2(None, self.conf)
# 3. Test enabling deprecated API version # 3. Test enabling deprecated API version
self.config(enable_deprecated_api_versions=['1']) self.config(enable_deprecated_api_versions=['1.1'])
@decorators.api_version_manager(VERSION) @decorators.api_version_manager(VERSION)
def public_endpoint_3(driver, conf): def public_endpoint_3(driver, conf):