diff --git a/docs/api.swagger.json b/docs/api.swagger.json index 75868fc06d..00e2e3de27 100755 --- a/docs/api.swagger.json +++ b/docs/api.swagger.json @@ -518,7 +518,7 @@ }, "definitions": { "Upstream": { - "description": "Upstream Upstream Upstream Upstream Upstream Upstream Upstream upstream", + "description": "Upstream Upstream Upstream Upstream Upstream Upstream Upstream Upstream upstream", "type": "object", "properties": { "preserve_host": { @@ -536,6 +536,7 @@ } }, "healthNotReadyStatus": { + "description": "HealthNotReadyStatus health not ready status", "type": "object", "properties": { "errors": { @@ -548,7 +549,7 @@ } }, "healthStatus": { - "description": "HealthStatus HealthStatus HealthStatus HealthStatus HealthStatus health status", + "description": "HealthStatus HealthStatus HealthStatus HealthStatus HealthStatus HealthStatus health status", "type": "object", "properties": { "status": { @@ -558,7 +559,7 @@ } }, "jsonWebKey": { - "description": "JSONWebKey json web key", + "description": "JSONWebKey JSONWebKey json web key", "type": "object", "properties": { "alg": { @@ -635,6 +636,7 @@ } }, "jsonWebKeySet": { + "description": "JSONWebKeySet json web key set", "type": "object", "properties": { "keys": { @@ -648,7 +650,7 @@ }, "rule": { "type": "object", - "title": "swaggerRule is a single rule that will get checked on every HTTP request.", + "title": "Rule swaggerRule is a single rule that will get checked on every HTTP request.", "properties": { "authenticators": { "description": "Authenticators is a list of authentication handlers that will try and authenticate the provided credentials.\nAuthenticators are checked iteratively from index 0 to n and if the first authenticator to return a positive\nresult will be the one used.\n\nIf you want the rule to first check a specific authenticator before \"falling back\" to others, have that authenticator\nas the first item in the array.", @@ -684,6 +686,7 @@ } }, "ruleHandler": { + "description": "RuleHandler rule handler", "type": "object", "properties": { "config": { @@ -697,7 +700,7 @@ } }, "ruleMatch": { - "description": "RuleMatch RuleMatch rule match", + "description": "RuleMatch RuleMatch RuleMatch rule match", "type": "object", "properties": { "methods": { @@ -714,7 +717,7 @@ } }, "version": { - "description": "Version Version Version Version Version version", + "description": "Version Version Version Version Version Version version", "type": "object", "properties": { "version": { diff --git a/go.mod b/go.mod index bea2c790be..5d0b44bb67 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( github.com/ory/ladon v1.0.1 github.com/ory/sdk/swagutil v0.0.0-20200116101926-c5b88ce6e4bd // indirect github.com/ory/viper v1.5.6 - github.com/ory/x v0.0.88 + github.com/ory/x v0.0.89 github.com/pborman/uuid v1.2.0 github.com/pelletier/go-toml v1.6.0 // indirect github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 diff --git a/go.sum b/go.sum index f262e94f06..b514ad38ca 100644 --- a/go.sum +++ b/go.sum @@ -582,6 +582,8 @@ github.com/ory/x v0.0.87 h1:C81kgyXDE1MgL0aPp2fHmHNbMlgQwicdrEmPbICG0Wk= github.com/ory/x v0.0.87/go.mod h1:wrnJRjIfYXFY/AUiuUlcIUpLBDxFtWc+8x6toAeLZXU= github.com/ory/x v0.0.88 h1:epgeKh5kaT/89YQ9o/eIO3rgwmo3kOwyXcHJRZcZogI= github.com/ory/x v0.0.88/go.mod h1:wrnJRjIfYXFY/AUiuUlcIUpLBDxFtWc+8x6toAeLZXU= +github.com/ory/x v0.0.89 h1:8jYqLy3BDmVjWUoi30Rt34m+/DdLF8OiZ0NjzSDS0bE= +github.com/ory/x v0.0.89/go.mod h1:wrnJRjIfYXFY/AUiuUlcIUpLBDxFtWc+8x6toAeLZXU= github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= diff --git a/internal/httpclient/models/health_not_ready_status.go b/internal/httpclient/models/health_not_ready_status.go index 0de7b2c13a..dc878b4d71 100644 --- a/internal/httpclient/models/health_not_ready_status.go +++ b/internal/httpclient/models/health_not_ready_status.go @@ -11,7 +11,7 @@ import ( "github.com/go-openapi/swag" ) -// HealthNotReadyStatus health not ready status +// HealthNotReadyStatus HealthNotReadyStatus health not ready status // swagger:model healthNotReadyStatus type HealthNotReadyStatus struct { diff --git a/internal/httpclient/models/health_status.go b/internal/httpclient/models/health_status.go index 1b1f45891b..1b7db0f8e8 100644 --- a/internal/httpclient/models/health_status.go +++ b/internal/httpclient/models/health_status.go @@ -11,7 +11,7 @@ import ( "github.com/go-openapi/swag" ) -// HealthStatus HealthStatus HealthStatus HealthStatus HealthStatus HealthStatus health status +// HealthStatus HealthStatus HealthStatus HealthStatus HealthStatus HealthStatus HealthStatus health status // swagger:model healthStatus type HealthStatus struct { diff --git a/internal/httpclient/models/json_web_key.go b/internal/httpclient/models/json_web_key.go index 1f7a9c7362..2cd54b3cd4 100644 --- a/internal/httpclient/models/json_web_key.go +++ b/internal/httpclient/models/json_web_key.go @@ -11,7 +11,7 @@ import ( "github.com/go-openapi/swag" ) -// JSONWebKey JSONWebKey json web key +// JSONWebKey JSONWebKey JSONWebKey json web key // swagger:model jsonWebKey type JSONWebKey struct { diff --git a/internal/httpclient/models/json_web_key_set.go b/internal/httpclient/models/json_web_key_set.go index 45a15b21c2..9b0874e67a 100644 --- a/internal/httpclient/models/json_web_key_set.go +++ b/internal/httpclient/models/json_web_key_set.go @@ -14,7 +14,7 @@ import ( "github.com/go-openapi/swag" ) -// JSONWebKeySet json web key set +// JSONWebKeySet JSONWebKeySet json web key set // swagger:model jsonWebKeySet type JSONWebKeySet struct { diff --git a/internal/httpclient/models/rule.go b/internal/httpclient/models/rule.go index f167706b50..cc15aadfb0 100644 --- a/internal/httpclient/models/rule.go +++ b/internal/httpclient/models/rule.go @@ -14,7 +14,7 @@ import ( "github.com/go-openapi/swag" ) -// Rule swaggerRule is a single rule that will get checked on every HTTP request. +// Rule Rule swaggerRule is a single rule that will get checked on every HTTP request. // swagger:model rule type Rule struct { diff --git a/internal/httpclient/models/rule_handler.go b/internal/httpclient/models/rule_handler.go index 28fc148c86..152ed287d6 100644 --- a/internal/httpclient/models/rule_handler.go +++ b/internal/httpclient/models/rule_handler.go @@ -11,7 +11,7 @@ import ( "github.com/go-openapi/swag" ) -// RuleHandler rule handler +// RuleHandler RuleHandler rule handler // swagger:model ruleHandler type RuleHandler struct { diff --git a/internal/httpclient/models/rule_match.go b/internal/httpclient/models/rule_match.go index b45686ba0f..7dd55ed15f 100644 --- a/internal/httpclient/models/rule_match.go +++ b/internal/httpclient/models/rule_match.go @@ -11,7 +11,7 @@ import ( "github.com/go-openapi/swag" ) -// RuleMatch RuleMatch RuleMatch rule match +// RuleMatch RuleMatch RuleMatch RuleMatch rule match // swagger:model ruleMatch type RuleMatch struct { diff --git a/internal/httpclient/models/upstream.go b/internal/httpclient/models/upstream.go index 55b841226d..6eab6aced7 100644 --- a/internal/httpclient/models/upstream.go +++ b/internal/httpclient/models/upstream.go @@ -11,7 +11,7 @@ import ( "github.com/go-openapi/swag" ) -// Upstream Upstream Upstream Upstream Upstream Upstream Upstream Upstream upstream +// Upstream Upstream Upstream Upstream Upstream Upstream Upstream Upstream Upstream upstream // swagger:model Upstream type Upstream struct { diff --git a/internal/httpclient/models/version.go b/internal/httpclient/models/version.go index b56cdc5f5c..8fde52fb92 100644 --- a/internal/httpclient/models/version.go +++ b/internal/httpclient/models/version.go @@ -11,7 +11,7 @@ import ( "github.com/go-openapi/swag" ) -// Version Version Version Version Version Version version +// Version Version Version Version Version Version Version version // swagger:model version type Version struct {