From c318106c01b2b3976049f2c3ba0c8502a874242b Mon Sep 17 00:00:00 2001 From: Graham Hayes Date: Fri, 17 Nov 2017 17:17:38 +0000 Subject: Remove v1 API This completes the long awaited removal of the V1 API. Change-Id: I30c8a5e8569b1b86286c5e3cb07856c06ebe5803 --- etc/designate/api-paste.ini | 15 --------- etc/designate/policy.yaml.sample | 70 ++++------------------------------------ 2 files changed, 6 insertions(+), 79 deletions(-) (limited to 'etc') diff --git a/etc/designate/api-paste.ini b/etc/designate/api-paste.ini index b899d46c..41e840d4 100644 --- a/etc/designate/api-paste.ini +++ b/etc/designate/api-paste.ini @@ -1,7 +1,6 @@ [composite:osapi_dns] use = egg:Paste#urlmap /: osapi_dns_versions -/v1: osapi_dns_v1 /v2: osapi_dns_v2 /admin: osapi_dns_admin @@ -13,14 +12,6 @@ keystone = http_proxy_to_wsgi cors maintenance faultwrapper osapi_dns_app_versio [app:osapi_dns_app_versions] paste.app_factory = designate.api.versions:factory -[composite:osapi_dns_v1] -use = call:designate.api.middleware:auth_pipeline_factory -noauth = http_proxy_to_wsgi cors request_id noauthcontext maintenance validation_API_v1 faultwrapper_v1 normalizeuri osapi_dns_app_v1 -keystone = http_proxy_to_wsgi cors request_id authtoken keystonecontext maintenance validation_API_v1 faultwrapper_v1 normalizeuri osapi_dns_app_v1 - - -[app:osapi_dns_app_v1] -paste.app_factory = designate.api.v1:factory [composite:osapi_dns_v2] use = call:designate.api.middleware:auth_pipeline_factory @@ -66,11 +57,5 @@ paste.filter_factory = designate.api.middleware:NormalizeURIMiddleware.factory [filter:faultwrapper] paste.filter_factory = designate.api.middleware:FaultWrapperMiddleware.factory -[filter:faultwrapper_v1] -paste.filter_factory = designate.api.middleware:FaultWrapperMiddlewareV1.factory - -[filter:validation_API_v1] -paste.filter_factory = designate.api.middleware:APIv1ValidationErrorMiddleware.factory - [filter:validation_API_v2] paste.filter_factory = designate.api.middleware:APIv2ValidationErrorMiddleware.factory diff --git a/etc/designate/policy.yaml.sample b/etc/designate/policy.yaml.sample index 5123b1e3..c73680fa 100644 --- a/etc/designate/policy.yaml.sample +++ b/etc/designate/policy.yaml.sample @@ -26,7 +26,7 @@ #"admin_or_target": "rule:admin or rule:target" # -#"zone_primary_or_admin": "('PRIMARY':%(zone_type)s and rule:admin_or_owner) OR ('SECONDARY':%(zone_type)s AND is_admin:True)" +#"zone_primary_or_admin": "('PRIMARY':%(zone_type)s and rule:admin_or_owner) OR ('SECONDARY':%(zone_type)s AND is_admin:True)" # Create blacklist. # POST /v2/blacklists @@ -120,75 +120,36 @@ # DELETE /v2/quotas/{project_id} #"reset_quotas": "rule:admin" -# Create record. -# POST /v1/domains//records -#"create_record": "rule:admin_or_owner" - -# Get records. -# GET /v1/domains//records -#"get_records": "rule:admin_or_owner" - -# Get record. -# GET /v1/domains//records/ -#"get_record": "rule:admin_or_owner" - # Find records. # GET /v2/reverse/floatingips/{region}:{floatingip_id} # GET /v2/reverse/floatingips #"find_records": "rule:admin_or_owner" -# Find record. -# GET /v1/domains//records/ -# DELETE /v1/domains//records/ -# PUT /v1/domains//records/ -#"find_record": "rule:admin_or_owner" - -# Update record. -# PUT /v1/domains//records/ -#"update_record": "rule:admin_or_owner" - -# Delete record. -# DELETE /v1/domains//records/ -#"delete_record": "rule:admin_or_owner" - # #"count_records": "rule:admin_or_owner" # Create Recordset # POST /v2/zones/{zone_id}/recordsets # PATCH /v2/reverse/floatingips/{region}:{floatingip_id} -#"create_recordset": "('PRIMARY':%(zone_type)s and rule:admin_or_owner) OR ('SECONDARY':%(zone_type)s AND is_admin:True)" +#"create_recordset": "('PRIMARY':%(zone_type)s and rule:admin_or_owner) OR ('SECONDARY':%(zone_type)s AND is_admin:True)" # #"get_recordsets": "rule:admin_or_owner" # Get recordset -# GET /v1/domains//records/ -# PUT /v1/domains//records/ # GET /v2/zones/{zone_id}/recordsets/{recordset_id} # DELETE /v2/zones/{zone_id}/recordsets/{recordset_id} # PUT /v2/zones/{zone_id}/recordsets/{recordset_id} #"get_recordset": "rule:admin_or_owner" -# Find recordsets -# GET /v1/domains//records -#"find_recordsets": "rule:admin_or_owner" - -# Find recordset -# POST /v1/domains//records -# DELETE /v1/domains//records/ -#"find_recordset": "rule:admin_or_owner" - # Update recordset -# PUT /v1/domains//records/ # PUT /v2/zones/{zone_id}/recordsets/{recordset_id} # PATCH /v2/reverse/floatingips/{region}:{floatingip_id} -#"update_recordset": "('PRIMARY':%(zone_type)s and rule:admin_or_owner) OR ('SECONDARY':%(zone_type)s AND is_admin:True)" +#"update_recordset": "('PRIMARY':%(zone_type)s and rule:admin_or_owner) OR ('SECONDARY':%(zone_type)s AND is_admin:True)" # Delete RecordSet -# DELETE /v1/domains//records/ # DELETE /v2/zones/{zone_id}/recordsets/{recordset_id} -#"delete_recordset": "('PRIMARY':%(zone_type)s and rule:admin_or_owner) OR ('SECONDARY':%(zone_type)s AND is_admin:True)" +#"delete_recordset": "('PRIMARY':%(zone_type)s and rule:admin_or_owner) OR ('SECONDARY':%(zone_type)s AND is_admin:True)" # Count recordsets #"count_recordset": "rule:admin_or_owner" @@ -234,14 +195,10 @@ #"delete_tld": "rule:admin" # Create Tsigkey -# POST /v1/tsigkeys # POST /v2/tsigkeys #"create_tsigkey": "rule:admin" # List Tsigkeys -# GET /v1/tsigkeys -# GET /v1/tsigkeys/ -# DELETE /v1/tsigkeys/ # GET /v2/tsigkeys #"find_tsigkeys": "rule:admin" @@ -251,17 +208,14 @@ #"get_tsigkey": "rule:admin" # Update Tsigkey -# PATCH /v1/tsigkeys/{tsigkey_id} # PATCH /v2/tsigkeys/{tsigkey_id} #"update_tsigkey": "rule:admin" # Delete a Tsigkey -# DELETE /v1/tsigkeys/{tsigkey_id} # DELETE /v2/tsigkeys/{tsigkey_id} #"delete_tsigkey": "rule:admin" # Create Zone -# POST /v1//domains # POST /v2/zones #"create_zone": "rule:admin_or_owner" @@ -269,8 +223,6 @@ #"get_zones": "rule:admin_or_owner" # Get Zone -# GET /v1/domains//records/ -# GET /v1/domains//records # GET /v2/zones/{zone_id} # PATCH /v2/zones/{zone_id} # PUT /v2/zones/{zone_id}/recordsets/{recordset_id} @@ -280,24 +232,14 @@ #"get_zone_servers": "rule:admin_or_owner" # List existing zones -# GET /v1/domains # GET /v2/zones #"find_zones": "rule:admin_or_owner" -# Find Zone -# GET /v1/domains/ -# GET /v1/domains//servers -# PUT /v1/domains/ -# DELETE /v1/domains/ -#"find_zone": "rule:admin_or_owner" - # Update Zone -# PUT /v1/domains/ # PATCH /v2/zones/{zone_id} #"update_zone": "rule:admin_or_owner" # Delete Zone -# DELETE /v1/domains/ # DELETE /v2/zones/{zone_id} #"delete_zone": "rule:admin_or_owner" @@ -364,7 +306,7 @@ # Create Zone Transfer Accept # POST /v2/zones/tasks/transfer_accepts -#"create_zone_transfer_accept": "rule:admin_or_owner or tenant:%(target_tenant_id)s or None:%(target_tenant_id)s" +#"create_zone_transfer_accept": "rule:admin_or_owner OR tenant:%(target_tenant_id)s OR None:%(target_tenant_id)s" # Get Zone Transfer Accept # GET /v2/zones/tasks/transfer_requests/{zone_transfer_accept_id} @@ -391,7 +333,7 @@ # Show a Zone Transfer Request # GET /v2/zones/tasks/transfer_requests/{zone_transfer_request_id} # PATCH /v2/zones/tasks/transfer_requests/{zone_transfer_request_id} -#"get_zone_transfer_request": "rule:admin_or_owner or tenant:%(target_tenant_id)s or None:%(target_tenant_id)s" +#"get_zone_transfer_request": "rule:admin_or_owner OR tenant:%(target_tenant_id)s OR None:%(target_tenant_id)s" # #"get_zone_transfer_request_detailed": "rule:admin_or_owner" -- cgit v1.2.1