chore: remove unused x/watcherx/websocket

gaultier · ory-bot · commit f609df7b6feb · 2025-11-26T15:46:00.000Z
GitOrigin-RevId: dcc24bbcc13d26bc7ad3bfae67edfd823a9ad06d
diff --git a/.schema/config.schema.json b/.schema/config.schema.json
@@ -351,7 +351,7 @@
       "oneOf": [
         {
           "title": "Legacy namespace Repo URI",
-          "description": "A URI that points to a directory of namespace files, a single file with all namespaces, or a websocket connection that provides former via `github.com/ory/x/watcherx.WatchAndServeWS`",
+          "description": "A URI that points to a directory of namespace files, or a single file with all namespaces",
           "type": "string",
           "format": "uri"
         },
@@ -369,12 +369,11 @@
             "location": {
               "type": "string",
               "title": "Ory Permission Language config file URI",
-              "description": "A URI that points to a directory of namespace files, a single file with all namespaces, or a websocket connection that provides former via `github.com/ory/x/watcherx.WatchAndServeWS`",
+              "description": "A URI that points to a directory of namespace files, or a single file with all namespaces",
               "format": "uri",
               "examples": [
                 "file://./keto_namespaces.ts",
-                "file:///etc/configs/keto_namespaces.ts",
-                "ws://my.websocket.server/keto_namespaces.ts"
+                "file:///etc/configs/keto_namespaces.ts"
               ]
             },
             "experimental_strict_mode": {
diff --git a/cmd/namespace/validate.go b/cmd/namespace/validate.go
@@ -149,7 +149,7 @@ func validateConfigFile(cmd *cobra.Command, fn string) error {
 	}
 
 	if ns, ok := val["namespaces"]; ok {
-		// ns can either be a ws url or a list of namespace objects)
+		// ns can either be a file url or a list of namespace objects
 		switch t := ns.(type) {
 		case string:
 			logger := logrusx.New("cmd", "0")
diff --git a/embedx/config.schema.json b/embedx/config.schema.json
@@ -351,7 +351,7 @@
       "oneOf": [
         {
           "title": "Legacy namespace Repo URI",
-          "description": "A URI that points to a directory of namespace files, a single file with all namespaces, or a websocket connection that provides former via `github.com/ory/x/watcherx.WatchAndServeWS`",
+          "description": "A URI that points to a directory of namespace files, or a single file with all namespaces",
           "type": "string",
           "format": "uri"
         },
@@ -369,12 +369,11 @@
             "location": {
               "type": "string",
               "title": "Ory Permission Language config file URI",
-              "description": "A URI that points to a directory of namespace files, a single file with all namespaces, or a websocket connection that provides former via `github.com/ory/x/watcherx.WatchAndServeWS`",
+              "description": "A URI that points to a directory of namespace files, or a single file with all namespaces",
               "format": "uri",
               "examples": [
                 "file://./keto_namespaces.ts",
-                "file:///etc/configs/keto_namespaces.ts",
-                "ws://my.websocket.server/keto_namespaces.ts"
+                "file:///etc/configs/keto_namespaces.ts"
               ]
             },
             "experimental_strict_mode": {
diff --git a/go.mod b/go.mod
@@ -160,7 +160,6 @@ require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/gorilla/handlers v1.5.2 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
diff --git a/go.sum b/go.sum
@@ -279,8 +279,6 @@ github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyC
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
-github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1 h1:KcFzXwzM/kGhIRHvc8jdixfIJjVzuUJdnv+5xsPutog=
 github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1/go.mod h1:qOchhhIlmRcqk/O9uCo/puJlyo07YINaIqdZfZG3Jkc=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
diff --git a/oryx/watcherx/definitions.go b/oryx/watcherx/definitions.go
@@ -62,8 +62,6 @@ func Watch(ctx context.Context, u *url.URL, c EventChannel) (Watcher, error) {
 	// see urlx.Parse for why the empty string is also file
 	case "file", "":
 		return WatchFile(ctx, u.Path, c)
-	case "ws":
-		return WatchWebsocket(ctx, u, c)
 	}
 	return nil, &errSchemeUnknown{u.Scheme}
 }
diff --git a/oryx/watcherx/websocket_client.go b/oryx/watcherx/websocket_client.go
diff --git a/oryx/watcherx/websocket_server.go b/oryx/watcherx/websocket_server.go

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ func validateConfigFile(cmd *cobra.Command, fn string) error {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`if ns, ok := val["namespaces"]; ok {`
`152`		`- // ns can either be a ws url or a list of namespace objects)`
	`152`	`+ // ns can either be a file url or a list of namespace objects`
`153`	`153`	`switch t := ns.(type) {`
`154`	`154`	`case string:`
`155`	`155`	`logger := logrusx.New("cmd", "0")`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,6 @@ func Watch(ctx context.Context, u *url.URL, c EventChannel) (Watcher, error) {`
`62`	`62`	`// see urlx.Parse for why the empty string is also file`
`63`	`63`	`case "file", "":`
`64`	`64`	`return WatchFile(ctx, u.Path, c)`
`65`		`- case "ws":`
`66`		`- return WatchWebsocket(ctx, u, c)`
`67`	`65`	`}`
`68`	`66`	`return nil, &errSchemeUnknown{u.Scheme}`
`69`	`67`	`}`