From d9cae9273ea645c7838fffb6f0ca402281ecfe4c Mon Sep 17 00:00:00 2001 From: Orne Brocaar Date: Wed, 13 Nov 2019 10:27:56 +0100 Subject: [PATCH] Rollback to grpc-ecosystem/grpc-gateway v1.9.5. v1.9.6 changes the URL parameter naming. The updated naming does not respect the `json_name` in the Protobuf file. See also: https://github.com/grpc-ecosystem/grpc-gateway/issues/1084. --- .../as/external/api/application.swagger.json | 44 +++++++++-------- swagger/as/external/api/common.swagger.json | 4 ++ swagger/as/external/api/device.swagger.json | 48 ++++++++++--------- .../external/api/deviceProfile.swagger.json | 8 +++- .../as/external/api/deviceQueue.swagger.json | 14 ++++-- .../external/api/fuotaDeployment.swagger.json | 18 ++++--- swagger/as/external/api/gateway.swagger.json | 16 ++++--- .../external/api/gatewayProfile.swagger.json | 8 +++- swagger/as/external/api/internal.swagger.json | 4 ++ .../external/api/multicastGroup.swagger.json | 28 ++++++----- .../external/api/networkServer.swagger.json | 8 +++- .../as/external/api/organization.swagger.json | 28 ++++++----- swagger/as/external/api/profiles.swagger.json | 4 ++ .../external/api/serviceProfile.swagger.json | 8 +++- swagger/as/external/api/user.swagger.json | 8 +++- swagger/go.mod | 2 +- swagger/go.sum | 33 ++++++------- 17 files changed, 169 insertions(+), 114 deletions(-) diff --git a/swagger/as/external/api/application.swagger.json b/swagger/as/external/api/application.swagger.json index 3ed9261e..b3bf4ded 100644 --- a/swagger/as/external/api/application.swagger.json +++ b/swagger/as/external/api/application.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/application.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], @@ -121,7 +125,7 @@ ] } }, - "/api/applications/{applicationId}/integrations": { + "/api/applications/{application_id}/integrations": { "get": { "summary": "ListIntegrations lists all configured integrations.", "operationId": "ListIntegrations", @@ -135,7 +139,7 @@ }, "parameters": [ { - "name": "applicationId", + "name": "application_id", "description": "The id of the application.", "in": "path", "required": true, @@ -148,7 +152,7 @@ ] } }, - "/api/applications/{applicationId}/integrations/http": { + "/api/applications/{application_id}/integrations/http": { "get": { "summary": "GetHTTPIntegration returns the HTTP application-integration.", "operationId": "GetHTTPIntegration", @@ -162,7 +166,7 @@ }, "parameters": [ { - "name": "applicationId", + "name": "application_id", "description": "Application ID.", "in": "path", "required": true, @@ -187,7 +191,7 @@ }, "parameters": [ { - "name": "applicationId", + "name": "application_id", "description": "The id of the application.", "in": "path", "required": true, @@ -200,7 +204,7 @@ ] } }, - "/api/applications/{applicationId}/integrations/influxdb": { + "/api/applications/{application_id}/integrations/influxdb": { "get": { "summary": "GetInfluxDBIntegration returns the InfluxDB application-integration.", "operationId": "GetInfluxDBIntegration", @@ -214,7 +218,7 @@ }, "parameters": [ { - "name": "applicationId", + "name": "application_id", "description": "Application ID.", "in": "path", "required": true, @@ -239,7 +243,7 @@ }, "parameters": [ { - "name": "applicationId", + "name": "application_id", "description": "Application ID.", "in": "path", "required": true, @@ -252,7 +256,7 @@ ] } }, - "/api/applications/{applicationId}/integrations/thingsboard": { + "/api/applications/{application_id}/integrations/thingsboard": { "get": { "summary": "GetThingsBoardIntegration returns the ThingsBoard application-integration.", "operationId": "GetThingsBoardIntegration", @@ -266,7 +270,7 @@ }, "parameters": [ { - "name": "applicationId", + "name": "application_id", "description": "Application ID.", "in": "path", "required": true, @@ -291,7 +295,7 @@ }, "parameters": [ { - "name": "applicationId", + "name": "application_id", "description": "Application ID.", "in": "path", "required": true, @@ -356,7 +360,7 @@ ] } }, - "/api/applications/{integration.applicationId}/integrations/http": { + "/api/applications/{integration.application_id}/integrations/http": { "post": { "summary": "CreateHTTPIntegration creates a HTTP application-integration.", "operationId": "CreateHTTPIntegration", @@ -370,7 +374,7 @@ }, "parameters": [ { - "name": "integration.applicationId", + "name": "integration.application_id", "description": "The id of the application.", "in": "path", "required": true, @@ -403,7 +407,7 @@ }, "parameters": [ { - "name": "integration.applicationId", + "name": "integration.application_id", "description": "The id of the application.", "in": "path", "required": true, @@ -424,7 +428,7 @@ ] } }, - "/api/applications/{integration.applicationId}/integrations/influxdb": { + "/api/applications/{integration.application_id}/integrations/influxdb": { "post": { "summary": "CreateInfluxDBIntegration create an InfluxDB application-integration.", "operationId": "CreateInfluxDBIntegration", @@ -438,7 +442,7 @@ }, "parameters": [ { - "name": "integration.applicationId", + "name": "integration.application_id", "description": "Application ID.", "in": "path", "required": true, @@ -471,7 +475,7 @@ }, "parameters": [ { - "name": "integration.applicationId", + "name": "integration.application_id", "description": "Application ID.", "in": "path", "required": true, @@ -492,7 +496,7 @@ ] } }, - "/api/applications/{integration.applicationId}/integrations/thingsboard": { + "/api/applications/{integration.application_id}/integrations/thingsboard": { "post": { "summary": "CreateThingsBoardIntegration creates a ThingsBoard application-integration.", "operationId": "CreateThingsBoardIntegration", @@ -506,7 +510,7 @@ }, "parameters": [ { - "name": "integration.applicationId", + "name": "integration.application_id", "description": "Application ID.", "in": "path", "required": true, @@ -539,7 +543,7 @@ }, "parameters": [ { - "name": "integration.applicationId", + "name": "integration.application_id", "description": "Application ID.", "in": "path", "required": true, diff --git a/swagger/as/external/api/common.swagger.json b/swagger/as/external/api/common.swagger.json index 1e7b9948..3b9f3cc8 100644 --- a/swagger/as/external/api/common.swagger.json +++ b/swagger/as/external/api/common.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/common.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], diff --git a/swagger/as/external/api/device.swagger.json b/swagger/as/external/api/device.swagger.json index 6995b5ce..94608da7 100644 --- a/swagger/as/external/api/device.swagger.json +++ b/swagger/as/external/api/device.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/device.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], @@ -100,7 +104,7 @@ ] } }, - "/api/devices/{devEui}": { + "/api/devices/{dev_eui}": { "get": { "summary": "Get returns the device matching the given DevEUI.", "operationId": "Get", @@ -114,7 +118,7 @@ }, "parameters": [ { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -138,7 +142,7 @@ }, "parameters": [ { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -150,7 +154,7 @@ ] } }, - "/api/devices/{devEui}/activation": { + "/api/devices/{dev_eui}/activation": { "get": { "summary": "GetActivation returns the current activation details of the device (OTAA and ABP).", "operationId": "GetActivation", @@ -164,7 +168,7 @@ }, "parameters": [ { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -188,7 +192,7 @@ }, "parameters": [ { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -200,7 +204,7 @@ ] } }, - "/api/devices/{devEui}/events": { + "/api/devices/{dev_eui}/events": { "get": { "summary": "StreamEventLogs stream the device events (uplink payloads, ACKs, joins, errors).\n * This endpoint is intended for debugging only.\n * This endpoint does not work from a web-browser.", "operationId": "StreamEventLogs", @@ -214,7 +218,7 @@ }, "parameters": [ { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -226,7 +230,7 @@ ] } }, - "/api/devices/{devEui}/frames": { + "/api/devices/{dev_eui}/frames": { "get": { "summary": "StreamFrameLogs streams the uplink and downlink frame-logs for the given DevEUI.\n * These are the raw LoRaWAN frames and this endpoint is intended for debugging only.\n * This endpoint does not work from a web-browser.", "operationId": "StreamFrameLogs", @@ -240,7 +244,7 @@ }, "parameters": [ { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -252,7 +256,7 @@ ] } }, - "/api/devices/{devEui}/getRandomDevAddr": { + "/api/devices/{dev_eui}/getRandomDevAddr": { "post": { "summary": "GetRandomDevAddr returns a random DevAddr taking the NwkID prefix into account.", "operationId": "GetRandomDevAddr", @@ -266,7 +270,7 @@ }, "parameters": [ { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -278,7 +282,7 @@ ] } }, - "/api/devices/{devEui}/keys": { + "/api/devices/{dev_eui}/keys": { "get": { "summary": "GetKeys returns the device-keys for the given DevEUI.", "operationId": "GetKeys", @@ -292,7 +296,7 @@ }, "parameters": [ { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -316,7 +320,7 @@ }, "parameters": [ { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -328,7 +332,7 @@ ] } }, - "/api/devices/{device.devEui}": { + "/api/devices/{device.dev_eui}": { "put": { "summary": "Update updates the device matching the given DevEUI.", "operationId": "Update", @@ -342,7 +346,7 @@ }, "parameters": [ { - "name": "device.devEui", + "name": "device.dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -362,7 +366,7 @@ ] } }, - "/api/devices/{deviceActivation.devEui}/activate": { + "/api/devices/{device_activation.dev_eui}/activate": { "post": { "summary": "Activate (re)activates the device (only when ABP is set to true).", "operationId": "Activate", @@ -376,7 +380,7 @@ }, "parameters": [ { - "name": "deviceActivation.devEui", + "name": "device_activation.dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -396,7 +400,7 @@ ] } }, - "/api/devices/{deviceKeys.devEui}/keys": { + "/api/devices/{device_keys.dev_eui}/keys": { "post": { "summary": "CreateKeys creates the given device-keys.", "operationId": "CreateKeys", @@ -410,7 +414,7 @@ }, "parameters": [ { - "name": "deviceKeys.devEui", + "name": "device_keys.dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -442,7 +446,7 @@ }, "parameters": [ { - "name": "deviceKeys.devEui", + "name": "device_keys.dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, diff --git a/swagger/as/external/api/deviceProfile.swagger.json b/swagger/as/external/api/deviceProfile.swagger.json index 73cd9542..8d6424cd 100644 --- a/swagger/as/external/api/deviceProfile.swagger.json +++ b/swagger/as/external/api/deviceProfile.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/deviceProfile.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], @@ -87,7 +91,7 @@ ] } }, - "/api/device-profiles/{deviceProfile.id}": { + "/api/device-profiles/{device_profile.id}": { "put": { "summary": "Update updates the given device-profile.", "operationId": "Update", @@ -101,7 +105,7 @@ }, "parameters": [ { - "name": "deviceProfile.id", + "name": "device_profile.id", "description": "Device-profile ID (UUID string).", "in": "path", "required": true, diff --git a/swagger/as/external/api/deviceQueue.swagger.json b/swagger/as/external/api/deviceQueue.swagger.json index f91abf42..04276843 100644 --- a/swagger/as/external/api/deviceQueue.swagger.json +++ b/swagger/as/external/api/deviceQueue.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/deviceQueue.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], @@ -11,7 +15,7 @@ "application/json" ], "paths": { - "/api/devices/{devEui}/queue": { + "/api/devices/{dev_eui}/queue": { "get": { "summary": "List lists the items in the device-queue.", "operationId": "List", @@ -25,7 +29,7 @@ }, "parameters": [ { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -49,7 +53,7 @@ }, "parameters": [ { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -61,7 +65,7 @@ ] } }, - "/api/devices/{deviceQueueItem.devEui}/queue": { + "/api/devices/{device_queue_item.dev_eui}/queue": { "post": { "summary": "Enqueue adds the given item to the device-queue.", "operationId": "Enqueue", @@ -75,7 +79,7 @@ }, "parameters": [ { - "name": "deviceQueueItem.devEui", + "name": "device_queue_item.dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, diff --git a/swagger/as/external/api/fuotaDeployment.swagger.json b/swagger/as/external/api/fuotaDeployment.swagger.json index 31d45ec5..7416436e 100644 --- a/swagger/as/external/api/fuotaDeployment.swagger.json +++ b/swagger/as/external/api/fuotaDeployment.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/fuotaDeployment.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], @@ -11,7 +15,7 @@ "application/json" ], "paths": { - "/api/devices/{devEui}/fuota-deployments": { + "/api/devices/{dev_eui}/fuota-deployments": { "post": { "summary": "CreateForDevice creates a deployment for the given DevEUI.", "operationId": "CreateForDevice", @@ -25,7 +29,7 @@ }, "parameters": [ { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, @@ -95,7 +99,7 @@ ] } }, - "/api/fuota-deployments/{fuotaDeploymentId}/devices": { + "/api/fuota-deployments/{fuota_deployment_id}/devices": { "get": { "summary": "ListDeploymentDevices lists the devices (and status) for the given fuota deployment ID.", "operationId": "ListDeploymentDevices", @@ -109,7 +113,7 @@ }, "parameters": [ { - "name": "fuotaDeploymentId", + "name": "fuota_deployment_id", "description": "ID of the deployment (string formatted UUID).\nThis value will be automatically assigned on create.", "in": "path", "required": true, @@ -137,7 +141,7 @@ ] } }, - "/api/fuota-deployments/{fuotaDeploymentId}/devices/{devEui}": { + "/api/fuota-deployments/{fuota_deployment_id}/devices/{dev_eui}": { "get": { "summary": "GetDeploymentDevice returns the deployment device.", "operationId": "GetDeploymentDevice", @@ -151,14 +155,14 @@ }, "parameters": [ { - "name": "fuotaDeploymentId", + "name": "fuota_deployment_id", "description": "ID of the deployment (string formatted UUID).\nThis value will be automatically assigned on create.", "in": "path", "required": true, "type": "string" }, { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded).", "in": "path", "required": true, diff --git a/swagger/as/external/api/gateway.swagger.json b/swagger/as/external/api/gateway.swagger.json index 508a842f..94485777 100644 --- a/swagger/as/external/api/gateway.swagger.json +++ b/swagger/as/external/api/gateway.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/gateway.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], @@ -120,7 +124,7 @@ ] } }, - "/api/gateways/{gatewayId}/frames": { + "/api/gateways/{gateway_id}/frames": { "get": { "summary": "StreamFrameLogs streams the uplink and downlink frame-logs for the given gateway ID.\nNotes:\n * These are the raw LoRaWAN frames and this endpoint is intended for debugging only.\n * This endpoint does not work from a web-browser.", "operationId": "StreamFrameLogs", @@ -134,7 +138,7 @@ }, "parameters": [ { - "name": "gatewayId", + "name": "gateway_id", "description": "Gateway ID (HEX encoded).", "in": "path", "required": true, @@ -146,7 +150,7 @@ ] } }, - "/api/gateways/{gatewayId}/pings/last": { + "/api/gateways/{gateway_id}/pings/last": { "get": { "summary": "GetLastPing returns the last emitted ping and gateways receiving this ping.", "operationId": "GetLastPing", @@ -160,7 +164,7 @@ }, "parameters": [ { - "name": "gatewayId", + "name": "gateway_id", "description": "Gateway ID (HEX encoded).", "in": "path", "required": true, @@ -172,7 +176,7 @@ ] } }, - "/api/gateways/{gatewayId}/stats": { + "/api/gateways/{gateway_id}/stats": { "get": { "summary": "GetStats lists the gateway stats given the query parameters.", "operationId": "GetStats", @@ -186,7 +190,7 @@ }, "parameters": [ { - "name": "gatewayId", + "name": "gateway_id", "description": "Gateway ID (HEX encoded).", "in": "path", "required": true, diff --git a/swagger/as/external/api/gatewayProfile.swagger.json b/swagger/as/external/api/gatewayProfile.swagger.json index becb509d..c9af3f3d 100644 --- a/swagger/as/external/api/gatewayProfile.swagger.json +++ b/swagger/as/external/api/gatewayProfile.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/gatewayProfile.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], @@ -79,7 +83,7 @@ ] } }, - "/api/gateway-profiles/{gatewayProfile.id}": { + "/api/gateway-profiles/{gateway_profile.id}": { "put": { "summary": "Update updates the given gateway-profile.", "operationId": "Update", @@ -93,7 +97,7 @@ }, "parameters": [ { - "name": "gatewayProfile.id", + "name": "gateway_profile.id", "description": "Gateway-profile ID (UUID string).", "in": "path", "required": true, diff --git a/swagger/as/external/api/internal.swagger.json b/swagger/as/external/api/internal.swagger.json index 3ba7171e..a1b4917b 100644 --- a/swagger/as/external/api/internal.swagger.json +++ b/swagger/as/external/api/internal.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/internal.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], diff --git a/swagger/as/external/api/multicastGroup.swagger.json b/swagger/as/external/api/multicastGroup.swagger.json index 9c0fa485..59abe7f5 100644 --- a/swagger/as/external/api/multicastGroup.swagger.json +++ b/swagger/as/external/api/multicastGroup.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/multicastGroup.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], @@ -150,7 +154,7 @@ ] } }, - "/api/multicast-groups/{multicastGroup.id}": { + "/api/multicast-groups/{multicast_group.id}": { "put": { "summary": "Update updates the given multicast-group.", "operationId": "Update", @@ -164,7 +168,7 @@ }, "parameters": [ { - "name": "multicastGroup.id", + "name": "multicast_group.id", "description": "ID (string formatted UUID).\nThis will be generated automatically on create.", "in": "path", "required": true, @@ -184,7 +188,7 @@ ] } }, - "/api/multicast-groups/{multicastGroupId}/devices": { + "/api/multicast-groups/{multicast_group_id}/devices": { "post": { "summary": "AddDevice adds the given device to the multicast-group.", "operationId": "AddDevice", @@ -198,7 +202,7 @@ }, "parameters": [ { - "name": "multicastGroupId", + "name": "multicast_group_id", "description": "Multicast-group ID (string formatted UUID).", "in": "path", "required": true, @@ -218,7 +222,7 @@ ] } }, - "/api/multicast-groups/{multicastGroupId}/devices/{devEui}": { + "/api/multicast-groups/{multicast_group_id}/devices/{dev_eui}": { "delete": { "summary": "RemoveDevice removes the given device from the multicast-group.", "operationId": "RemoveDevice", @@ -232,14 +236,14 @@ }, "parameters": [ { - "name": "multicastGroupId", + "name": "multicast_group_id", "description": "Multicast-group ID (string formatted UUID).", "in": "path", "required": true, "type": "string" }, { - "name": "devEui", + "name": "dev_eui", "description": "Device EUI (HEX encoded string).", "in": "path", "required": true, @@ -251,7 +255,7 @@ ] } }, - "/api/multicast-groups/{multicastGroupId}/queue": { + "/api/multicast-groups/{multicast_group_id}/queue": { "get": { "summary": "ListQueue lists the items in the multicast-group queue.", "operationId": "ListQueue", @@ -265,7 +269,7 @@ }, "parameters": [ { - "name": "multicastGroupId", + "name": "multicast_group_id", "description": "Multicast-group ID (string formatted UUID).", "in": "path", "required": true, @@ -289,7 +293,7 @@ }, "parameters": [ { - "name": "multicastGroupId", + "name": "multicast_group_id", "description": "Multicast-group ID (string formatted UUID).", "in": "path", "required": true, @@ -301,7 +305,7 @@ ] } }, - "/api/multicast-groups/{multicastQueueItem.multicastGroupId}/queue": { + "/api/multicast-groups/{multicast_queue_item.multicast_group_id}/queue": { "post": { "summary": "Enqueue adds the given item to the multicast-queue.", "operationId": "Enqueue", @@ -315,7 +319,7 @@ }, "parameters": [ { - "name": "multicastQueueItem.multicastGroupId", + "name": "multicast_queue_item.multicast_group_id", "description": "Multicast-group ID (string formatted UUID).", "in": "path", "required": true, diff --git a/swagger/as/external/api/networkServer.swagger.json b/swagger/as/external/api/networkServer.swagger.json index a0590206..1320215f 100644 --- a/swagger/as/external/api/networkServer.swagger.json +++ b/swagger/as/external/api/networkServer.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/networkServer.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], @@ -131,7 +135,7 @@ ] } }, - "/api/network-servers/{networkServer.id}": { + "/api/network-servers/{network_server.id}": { "put": { "summary": "Update updates the given network-server.", "operationId": "Update", @@ -145,7 +149,7 @@ }, "parameters": [ { - "name": "networkServer.id", + "name": "network_server.id", "description": "Network-server ID.", "in": "path", "required": true, diff --git a/swagger/as/external/api/organization.swagger.json b/swagger/as/external/api/organization.swagger.json index 1672dca0..33ec7a18 100644 --- a/swagger/as/external/api/organization.swagger.json +++ b/swagger/as/external/api/organization.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/organization.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], @@ -165,7 +169,7 @@ ] } }, - "/api/organizations/{organizationId}/users": { + "/api/organizations/{organization_id}/users": { "get": { "summary": "Get organization's user list.", "operationId": "ListUsers", @@ -179,7 +183,7 @@ }, "parameters": [ { - "name": "organizationId", + "name": "organization_id", "description": "Organization ID.", "in": "path", "required": true, @@ -208,7 +212,7 @@ ] } }, - "/api/organizations/{organizationId}/users/{userId}": { + "/api/organizations/{organization_id}/users/{user_id}": { "get": { "summary": "Get data for a particular organization user.", "operationId": "GetUser", @@ -222,7 +226,7 @@ }, "parameters": [ { - "name": "organizationId", + "name": "organization_id", "description": "Organization ID.", "in": "path", "required": true, @@ -230,7 +234,7 @@ "format": "int64" }, { - "name": "userId", + "name": "user_id", "description": "User ID.", "in": "path", "required": true, @@ -255,7 +259,7 @@ }, "parameters": [ { - "name": "organizationId", + "name": "organization_id", "description": "Organization ID.", "in": "path", "required": true, @@ -263,7 +267,7 @@ "format": "int64" }, { - "name": "userId", + "name": "user_id", "description": "User ID.", "in": "path", "required": true, @@ -276,7 +280,7 @@ ] } }, - "/api/organizations/{organizationUser.organizationId}/users": { + "/api/organizations/{organization_user.organization_id}/users": { "post": { "summary": "Add a new user to an organization.", "operationId": "AddUser", @@ -290,7 +294,7 @@ }, "parameters": [ { - "name": "organizationUser.organizationId", + "name": "organization_user.organization_id", "description": "Organization ID.", "in": "path", "required": true, @@ -311,7 +315,7 @@ ] } }, - "/api/organizations/{organizationUser.organizationId}/users/{organizationUser.userId}": { + "/api/organizations/{organization_user.organization_id}/users/{organization_user.user_id}": { "put": { "summary": "Update a user in an organization.", "operationId": "UpdateUser", @@ -325,7 +329,7 @@ }, "parameters": [ { - "name": "organizationUser.organizationId", + "name": "organization_user.organization_id", "description": "Organization ID.", "in": "path", "required": true, @@ -333,7 +337,7 @@ "format": "int64" }, { - "name": "organizationUser.userId", + "name": "organization_user.user_id", "description": "User ID.", "in": "path", "required": true, diff --git a/swagger/as/external/api/profiles.swagger.json b/swagger/as/external/api/profiles.swagger.json index 02b11333..40c9c2f6 100644 --- a/swagger/as/external/api/profiles.swagger.json +++ b/swagger/as/external/api/profiles.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/profiles.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], diff --git a/swagger/as/external/api/serviceProfile.swagger.json b/swagger/as/external/api/serviceProfile.swagger.json index 1ebba381..452f2ca2 100644 --- a/swagger/as/external/api/serviceProfile.swagger.json +++ b/swagger/as/external/api/serviceProfile.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/serviceProfile.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], @@ -129,7 +133,7 @@ ] } }, - "/api/service-profiles/{serviceProfile.id}": { + "/api/service-profiles/{service_profile.id}": { "put": { "summary": "Update updates the given serviceprofile.", "operationId": "Update", @@ -143,7 +147,7 @@ }, "parameters": [ { - "name": "serviceProfile.id", + "name": "service_profile.id", "description": "Service-profile ID (UUID string).\nThis will be automatically set on create.", "in": "path", "required": true, diff --git a/swagger/as/external/api/user.swagger.json b/swagger/as/external/api/user.swagger.json index d3dfda75..165cb803 100644 --- a/swagger/as/external/api/user.swagger.json +++ b/swagger/as/external/api/user.swagger.json @@ -4,6 +4,10 @@ "title": "as/external/api/user.proto", "version": "version not set" }, + "schemes": [ + "http", + "https" + ], "consumes": [ "application/json" ], @@ -165,7 +169,7 @@ ] } }, - "/api/users/{userId}/password": { + "/api/users/{user_id}/password": { "put": { "summary": "UpdatePassword updates a password.", "operationId": "UpdatePassword", @@ -179,7 +183,7 @@ }, "parameters": [ { - "name": "userId", + "name": "user_id", "description": "User ID.", "in": "path", "required": true, diff --git a/swagger/go.mod b/swagger/go.mod index 0827e666..5c474f5a 100644 --- a/swagger/go.mod +++ b/swagger/go.mod @@ -3,7 +3,7 @@ module github.com/brocaar/chirpstack-api/swagger go 1.13 require ( - github.com/grpc-ecosystem/grpc-gateway v1.12.1 // indirect + github.com/grpc-ecosystem/grpc-gateway v1.9.5 google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a // indirect gopkg.in/yaml.v2 v2.2.5 // indirect ) diff --git a/swagger/go.sum b/swagger/go.sum index 6fbac40f..aa68d312 100644 --- a/swagger/go.sum +++ b/swagger/go.sum @@ -1,6 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -10,44 +9,40 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/grpc-ecosystem/grpc-gateway v1.12.1 h1:zCy2xE9ablevUOrUZc3Dl72Dt+ya2FNAvC2yLYMHzi4= -github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +github.com/grpc-ecosystem/grpc-gateway v1.9.5 h1:UImYN5qQ8tuGpGE16ZmjvcTtTw24zw1QAp/SlnNrZhI= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c h1:hrpEMCZ2O7DR5gC1n2AJGVhrwiEjOi35+jxtIuZpTMo= -google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a h1:Ob5/580gVHBJZgXnff1cZDbG+xLtMVE5mDRTe+nIsX4= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=