From c532bacb374266d356763b55e33c119ff29ca89c Mon Sep 17 00:00:00 2001 From: Akshay Gaikwad Date: Mon, 28 Nov 2022 12:25:58 +0530 Subject: [PATCH] Upgrade kratos service to v0.10.1 Signed-off-by: Akshay Gaikwad --- _kratos/kratos.yml | 9 ++++++--- docker-compose.yml | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- pkg/service/elastic_search_query.go | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/_kratos/kratos.yml b/_kratos/kratos.yml index 85d6318..244f557 100644 --- a/_kratos/kratos.yml +++ b/_kratos/kratos.yml @@ -1,4 +1,4 @@ -version: v0.7.1-alpha.1 +version: v0.10.1 dsn: postgres://admindbuser:admindbpassword@localhost:5432/admindb?sslmode=disable&max_conns=20&max_idle_conns=4 @@ -32,7 +32,7 @@ serve: selfservice: default_browser_return_url: http://127.0.0.1:3000/ - whitelisted_return_urls: + allowed_return_urls: - http://127.0.0.1:3000 methods: @@ -114,7 +114,10 @@ hashers: key_length: 16 identity: - default_schema_url: file:///etc/config/kratos/identity.schema.json + default_schema_id: default + schemas: + - id: default + url: file:///etc/config/kratos/identity.schema.json courier: smtp: diff --git a/docker-compose.yml b/docker-compose.yml index f8d9670..0254fa7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,7 @@ services: - xpack.security.enabled=false # disable auth for local dev kratos-migrate: - image: oryd/kratos:v0.8.0-alpha.3-sqlite + image: oryd/kratos:v0.10.1 environment: - DSN=postgres://$DB_USER:$DB_PASSWORD@postgresd:$DB_PORT/$DB_NAME?sslmode=disable&max_conns=20&max_idle_conns=4 volumes: @@ -50,7 +50,7 @@ services: kratos: depends_on: - kratos-migrate - image: oryd/kratos:v0.8.0-alpha.3-sqlite + image: oryd/kratos:v0.10.1 ports: - '4433:4433' # public - '4434:4434' # admin diff --git a/go.mod b/go.mod index 99d2f04..67ce98b 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/cloudflare/cfssl v0.0.0-20190726000631-633726f6bcb7 github.com/crewjam/saml v0.4.6 github.com/dgraph-io/ristretto v0.1.0 - github.com/elastic/go-elasticsearch v0.0.0 + github.com/elastic/go-elasticsearch/v6 v6.8.10 github.com/evanphx/json-patch v4.12.0+incompatible github.com/go-openapi/errors v0.20.2 github.com/go-openapi/runtime v0.23.1 diff --git a/go.sum b/go.sum index c764bfe..98d434f 100644 --- a/go.sum +++ b/go.sum @@ -185,8 +185,8 @@ github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/elastic/go-elasticsearch v0.0.0 h1:Pd5fqOuBxKxv83b0+xOAJDAkziWYwFinWnBO0y+TZaA= -github.com/elastic/go-elasticsearch v0.0.0/go.mod h1:TkBSJBuTyFdBnrNqoPc54FN0vKf5c04IdM4zuStJ7xg= +github.com/elastic/go-elasticsearch/v6 v6.8.10 h1:2lN0gJ93gMBXvkhwih5xquldszpm8FlUwqG5sPzr6a8= +github.com/elastic/go-elasticsearch/v6 v6.8.10/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= diff --git a/pkg/service/elastic_search_query.go b/pkg/service/elastic_search_query.go index 660f1fb..caf7334 100644 --- a/pkg/service/elastic_search_query.go +++ b/pkg/service/elastic_search_query.go @@ -6,7 +6,7 @@ import ( "encoding/json" "errors" - v6Client "github.com/elastic/go-elasticsearch" + v6Client "github.com/elastic/go-elasticsearch/v6" ) type elasticSearchQuery struct {