diff --git a/kratos.patch b/kratos.patch deleted file mode 100644 index ec8c5406..00000000 --- a/kratos.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/hydra/hydra.go b/hydra/hydra.go -index a4466307e..915489545 100644 ---- a/hydra/hydra.go -+++ b/hydra/hydra.go -@@ -72,7 +72,7 @@ func (h *DefaultHydra) getAdminURL(ctx context.Context) (string, error) { - return u.String(), nil - } - --func (h *DefaultHydra) getAdminAPIClient(ctx context.Context) (*hydraclientgo.OAuth2ApiService, error) { -+func (h *DefaultHydra) getAdminAPIClient(ctx context.Context) (*hydraclientgo.OAuth2APIService, error) { - url, err := h.getAdminURL(ctx) - if err != nil { - return nil, err -@@ -87,7 +87,7 @@ func (h *DefaultHydra) getAdminAPIClient(ctx context.Context) (*hydraclientgo.OA - } - - configuration.HTTPClient = client -- return hydraclientgo.NewAPIClient(configuration).OAuth2Api, nil -+ return hydraclientgo.NewAPIClient(configuration).OAuth2API.(*hydraclientgo.OAuth2APIService), nil - } - - func (h *DefaultHydra) AcceptLoginRequest(ctx context.Context, params AcceptLoginRequestParams) (string, error) { diff --git a/rockcraft.yaml b/rockcraft.yaml index a9971387..b39c33ed 100644 --- a/rockcraft.yaml +++ b/rockcraft.yaml @@ -39,14 +39,6 @@ parts: source-type: git source-tag: v1.1.0 override-build: | - # Patch the repo and replace the hydra sdk version - # Workaround for https://github.com/ory/kratos/issues/3904 - # TODO(nsklikas): Remove when issue is fixed - cp $CRAFT_PROJECT_DIR/kratos.patch . - git apply -v kratos.patch - go mod edit -replace github.com/ory/hydra-client-go/v2=github.com/ory/hydra-client-go/v2@v2.2.0 - go mod tidy - # Set the necessary flags src_config_path="github.com/ory/kratos/driver" build_ver="${src_config_path}/config.Version"