remove package from permissions, add rest of build files

momentohq · Aug 16, 2023 · 0d8b5f1 · 0d8b5f1
1 parent 74a212b
commit 0d8b5f1
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 17 deletions.
diff --git a/javascript-web/generate_protos.sh b/javascript-web/generate_protos.sh
@@ -65,7 +65,7 @@ mkdir $out
 # So we do a terrible hack to comment out the package declaration before generating the JS types,
 # but add them back before generating the GRPC web bindings
 
-proto_file_list=" extensions.proto cacheclient.proto controlclient.proto auth.proto cacheping.proto cachepubsub.proto vectorindex.proto "
+proto_file_list=" permissions.proto extensions.proto cacheclient.proto controlclient.proto auth.proto cacheping.proto cachepubsub.proto vectorindex.proto token.proto "
 
 echo "Backing up protos dir"
 cp -r ../proto ../proto.bak

diff --git a/javascript-web/index.ts b/javascript-web/index.ts
@@ -1,4 +1,5 @@
 export * as cache from './CacheclientServiceClientPb'
 export * as control from './ControlclientServiceClientPb'
 export * as auth from './AuthServiceClientPb'
+export * as token from './TokenServiceClientPb'
 export * as ping from './CachepingServiceClientPb'
diff --git a/javascript-web/package-lock.json b/javascript-web/package-lock.json
diff --git a/javascript-web/package.json b/javascript-web/package.json
@@ -17,10 +17,12 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@tsconfig/node16": "1.0.2",
+    "@types/google-protobuf": "^3.15.6",
     "@types/node": "16.10.3",
-    "typescript": "4.4.3"
+    "typescript": "^4.9.5"
   },
   "dependencies": {
+    "google-protobuf": "3.21.2",
     "grpc-web": "1.4.2"
   },
   "files": [

diff --git a/javascript/generate_protos.sh b/javascript/generate_protos.sh
@@ -2,4 +2,4 @@
 set -e
 set -x
 
-PATH=node_modules/protoc-gen-ts/bin/:$PATH protoc -I=../proto -I=/usr/local/include --ts_out=src cacheclient.proto controlclient.proto cachepubsub.proto auth.proto cacheping.proto vectorindex.proto
+PATH=node_modules/protoc-gen-ts/bin/:$PATH protoc -I=../proto -I=/usr/local/include --ts_out=src permissions.proto cacheclient.proto controlclient.proto cachepubsub.proto auth.proto cacheping.proto vectorindex.proto token.proto
diff --git a/javascript/index.ts b/javascript/index.ts
@@ -3,3 +3,4 @@ export * as control from './controlclient'
 export * as pubsub from './cachepubsub'
 export * as ping from './cacheping'
 export * as auth from './auth'
+export * as token from './token'
diff --git a/kotlin-messages/kotlin/messages/generated-sources/descriptors/client_protos.dsc b/kotlin-messages/kotlin/messages/generated-sources/descriptors/client_protos.dsc
diff --git a/proto/auth.proto b/proto/auth.proto
@@ -73,7 +73,7 @@ message _GenerateApiTokenRequest {
 
     string auth_token = 3;
 
-  permissions.Permissions permissions = 4;
+    Permissions permissions = 4;
 }
 
 message _GenerateApiTokenResponse {

diff --git a/proto/permissions.proto b/proto/permissions.proto
@@ -4,8 +4,6 @@ option go_package = "github.com/momentohq/client-sdk-go;client_sdk_go";
 option java_multiple_files = true;
 option java_package = "momento.shared.permissions";
 
-package permissions;
-
 // Aliases for categories of functionality.
 enum CacheRole {
   CachePermitNone = 0;

diff --git a/proto/token.proto b/proto/token.proto
@@ -6,8 +6,6 @@ option go_package = "github.com/momentohq/client-sdk-go;client_sdk_go";
 option java_multiple_files = true;
 option java_package = "momento.auth";
 
-package token;
-
 service Token {
   rpc GenerateTempAuthToken (_GenerateTempAuthTokenRequest) returns (stream _GenerateTempAuthTokenResponse) {}
 }
@@ -21,7 +19,7 @@ message _GenerateTempAuthTokenRequest {
 
     Expires expires = 1;
 
-    permissions.Permissions permissions = 2;
+    Permissions permissions = 2;
 }
 
 message _GenerateTempAuthTokenResponse {

diff --git a/python/run-protoc.sh b/python/run-protoc.sh
@@ -23,7 +23,7 @@ do
     if [[ $python_protobuf_version == "protobuf>4" ]]; then
         pyi_out="--pyi_out=$src_path"
     fi
-    poetry run python -m grpc_tools.protoc -I../proto --python_out=$src_path $pyi_out --grpc_python_out=$src_path extensions.proto cacheclient.proto controlclient.proto auth.proto cachepubsub.proto vectorindex.proto
+    poetry run python -m grpc_tools.protoc -I../proto --python_out=$src_path $pyi_out --grpc_python_out=$src_path permissions.proto extensions.proto cacheclient.proto controlclient.proto auth.proto cachepubsub.proto vectorindex.proto token.proto
 
     # A shortcoming of the generated code is in the grpc generated code,
     # the protobuf imports are absolute instead of relative.