ci: Bump ory/sdk orb and Go version (#349)

ory · Jan 25, 2020 · a863281 · a863281
1 parent b72965f
commit a863281
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 35 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,13 +2,13 @@ version: 2.1
 
 orbs:
   changelog: ory/[email protected]
-  sdk: ory/[email protected].13
+  sdk: ory/[email protected].15
   goreleaser: ory/[email protected]
 
 jobs:
   format:
     docker:
-    - image: circleci/golang:1.12
+    - image: circleci/golang:1.13
     working_directory: /go/src/github.com/ory/oathkeeper
     steps:
       # This is disabled for now because goimports is really slow when go modules are used, see
@@ -21,7 +21,7 @@ jobs:
       #            source $BASH_ENV
       - checkout
       - run:
-          name: Enable go1.12 modules
+          name: Enable go1.13 modules
           command: |
             echo 'export GO111MODULE=on' >> $BASH_ENV
             source $BASH_ENV
@@ -31,7 +31,7 @@ jobs:
 
   test:
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.13
         environment:
         - GO111MODULE=on
     working_directory: /go/src/github.com/ory/oathkeeper
@@ -47,7 +47,7 @@ jobs:
 
   docs:
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.13
     working_directory: /go/src/github.com/ory/oathkeeper
     steps:
       - checkout

diff --git a/docs/api.swagger.json b/docs/api.swagger.json
@@ -518,7 +518,6 @@
   },
   "definitions": {
     "Upstream": {
-      "description": "Upstream Upstream Upstream Upstream Upstream Upstream Upstream Upstream Upstream upstream",
       "type": "object",
       "properties": {
         "preserve_host": {
@@ -557,35 +556,28 @@
       }
     },
     "jsonWebKey": {
-      "description": "JSONWebKey JSONWebKey JSONWebKey json web key",
       "type": "object",
       "properties": {
         "alg": {
           "description": "The \"alg\" (algorithm) parameter identifies the algorithm intended for\nuse with the key.  The values used should either be registered in the\nIANA \"JSON Web Signature and Encryption Algorithms\" registry\nestablished by [JWA] or be a value that contains a Collision-\nResistant Name.",
           "type": "string"
         },
         "crv": {
-          "description": "crv",
           "type": "string"
         },
         "d": {
-          "description": "d",
           "type": "string"
         },
         "dp": {
-          "description": "dp",
           "type": "string"
         },
         "dq": {
-          "description": "dq",
           "type": "string"
         },
         "e": {
-          "description": "e",
           "type": "string"
         },
         "k": {
-          "description": "k",
           "type": "string"
         },
         "kid": {
@@ -597,27 +589,22 @@
           "type": "string"
         },
         "n": {
-          "description": "n",
           "type": "string"
         },
         "p": {
-          "description": "p",
           "type": "string"
         },
         "q": {
-          "description": "q",
           "type": "string"
         },
         "qi": {
-          "description": "qi",
           "type": "string"
         },
         "use": {
           "description": "The \"use\" (public key use) parameter identifies the intended use of\nthe public key. The \"use\" parameter is employed to indicate whether\na public key is used for encrypting data or verifying the signature\non data. Values are commonly \"sig\" (signature) or \"enc\" (encryption).",
           "type": "string"
         },
         "x": {
-          "description": "x",
           "type": "string"
         },
         "x5c": {
@@ -628,7 +615,6 @@
           }
         },
         "y": {
-          "description": "y",
           "type": "string"
         }
       }
@@ -647,7 +633,7 @@
     },
     "rule": {
       "type": "object",
-      "title": "Rule Rule swaggerRule is a single rule that will get checked on every HTTP request.",
+      "title": "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.",
@@ -683,7 +669,6 @@
       }
     },
     "ruleHandler": {
-      "description": "RuleHandler RuleHandler rule handler",
       "type": "object",
       "properties": {
         "config": {
@@ -697,7 +682,6 @@
       }
     },
     "ruleMatch": {
-      "description": "RuleMatch RuleMatch RuleMatch RuleMatch rule match",
       "type": "object",
       "properties": {
         "methods": {
@@ -714,7 +698,6 @@
       }
     },
     "version": {
-      "description": "Version Version Version Version Version Version Version version",
       "type": "object",
       "properties": {
         "version": {

diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/ory/oathkeeper
 require (
 	github.com/Masterminds/goutils v1.1.0 // indirect
 	github.com/Masterminds/sprig v2.20.0+incompatible
-	github.com/Microsoft/go-winio v0.4.12 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a
 	github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7
 	github.com/blang/semver v3.5.1+incompatible
@@ -29,21 +28,20 @@ require (
 	github.com/julienschmidt/httprouter v1.2.0
 	github.com/lib/pq v1.0.0
 	github.com/mattn/goveralls v0.0.3
-	github.com/opencontainers/runc v1.0.0-rc5 // indirect
 	github.com/ory/fosite v0.29.2
 	github.com/ory/go-acc v0.0.0-20181118080137-ddc355013f90
 	github.com/ory/go-convenience v0.1.0
 	github.com/ory/gojsonschema v1.2.0
 	github.com/ory/graceful v0.1.1
 	github.com/ory/herodot v0.6.2
 	github.com/ory/ladon v1.0.1
-	github.com/ory/sdk/swagutil v0.0.0-20200116101926-c5b88ce6e4bd // indirect
+	github.com/ory/sdk/swagutil v0.0.0-20200123152503-0d50960e70bd // indirect
 	github.com/ory/viper v1.5.6
-	github.com/ory/x v0.0.89
+	github.com/ory/x v0.0.91
 	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
-	github.com/pkg/errors v0.8.1
+	github.com/pkg/errors v0.9.1
 	github.com/rs/cors v1.6.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.5
@@ -56,10 +54,11 @@ require (
 	github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce
 	github.com/urfave/negroni v1.0.0
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
-	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
+	golang.org/x/crypto v0.0.0-20200117160349-530e935923ad
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	golang.org/x/tools v0.0.0-20191224055732-dd894d0a8a40
 	gopkg.in/square/go-jose.v2 v2.3.1
+	gopkg.in/yaml.v2 v2.2.7
 )
 
 // Fix for https://github.com/golang/lint/issues/436