Sdk 693 Update to Okapi 1.6.0 (#694)

trinsic-id · Jun 2, 2022 · 3aeef9f · 3aeef9f
1 parent f8cad4e
commit 3aeef9f
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 22 deletions.
diff --git a/dotnet/Trinsic/Trinsic.csproj b/dotnet/Trinsic/Trinsic.csproj
@@ -38,7 +38,7 @@
         <PackageReference Include="Grpc.Tools" Version="2.46.1" PrivateAssets="All" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-        <PackageReference Include="Okapi.Net" Version="1.4.2">
+        <PackageReference Include="Okapi.Net" Version="1.6.0">
             <PrivateAssets>none</PrivateAssets>
         </PackageReference>
     </ItemGroup>

diff --git a/go/go.mod b/go/go.mod
@@ -5,7 +5,7 @@ go 1.16
 require (
 	github.com/google/uuid v1.3.0
 	github.com/stretchr/testify v1.7.0
-	github.com/trinsic-id/okapi/go v1.5.0
+	github.com/trinsic-id/okapi/go v1.6.0
 	google.golang.org/grpc v1.41.0
 	google.golang.org/protobuf v1.27.1
 )
diff --git a/go/go.sum b/go/go.sum
@@ -78,6 +78,8 @@ github.com/trinsic-id/okapi/go v1.4.0 h1:D7vVSnVB75dRabaVfxc1ZrnQttnOWvzkCleLuwo
 github.com/trinsic-id/okapi/go v1.4.0/go.mod h1:8K9N5GlLGylTkoCsyHJakjM+ed4w9vPZqW+kOr6867U=
 github.com/trinsic-id/okapi/go v1.5.0 h1:EsExtCsYXKu4nlA3TAenmCHZH+/5XtuKaMbGQowcAY0=
 github.com/trinsic-id/okapi/go v1.5.0/go.mod h1:aU28oQqJLtqfidWi+z+s9yyl3ejNOdm/MEI+QGpfqpI=
+github.com/trinsic-id/okapi/go v1.6.0 h1:6qVjc41lpqD9gK46B+GLQ+q5KnPp7jhiG+6lRDD3eqc=
+github.com/trinsic-id/okapi/go v1.6.0/go.mod h1:aU28oQqJLtqfidWi+z+s9yyl3ejNOdm/MEI+QGpfqpI=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

diff --git a/java/build.gradle b/java/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
 
     implementation 'org.jetbrains:annotations:23.0.0'
-    implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.19.1'
+    implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.19.2'
     implementation 'com.google.protobuf:protobuf-java-util:3.19.4'
     implementation group: 'net.java.dev.jna', name: 'jna', version: '5.8.0'
     implementation 'io.grpc:grpc-kotlin-stub:1.2.1'
@@ -58,7 +58,7 @@ dependencies {
     implementation 'io.grpc:grpc-protobuf:1.44.1'
     // This has to match the version of protoc-gen-grpc-java used in `sdk/devops/generate_proto_files.py`
     implementation 'io.grpc:grpc-stub:1.44.1'
-    implementation urlFile('https://github.com/trinsic-id/okapi/releases/download/v1.4.0/trinsic-okapi-1.4.0.jar', 'trinsic-okapi-1.4.0')
+    implementation urlFile('https://github.com/trinsic-id/okapi/releases/download/v1.6.0/trinsic-okapi-1.6.0.jar', 'trinsic-okapi-1.6.0')
 }
 
 test {

diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,4 +1,4 @@
 git+https://github.com/danielgtaylor/python-betterproto.git@master#egg=betterproto
 grpclib~=0.4.3rc2
 grpcio-tools
-trinsic-okapi~=1.4.1
+trinsic-okapi~=1.6.0
diff --git a/python/setup.cfg b/python/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = trinsic-sdk
-version = 1.4.0
+version = 1.6.0
 author = Scott Phillips
 author_email = scott.phillips@trinsic.id
 description = Trinsic Services SDK bindings
@@ -21,7 +21,7 @@ python_requires = >=3.8
 install_requires =
     grpclib>=0.4.3rc2
     betterproto>=2.0.0b4
-    trinsic-okapi>=1.4.0
+    trinsic-okapi>=1.6.0
 
 [options.packages.find]
 exclude = tests
diff --git a/ruby/trinsic.gemspec b/ruby/trinsic.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'concurrent-ruby', '~> 1.1.9'
   spec.add_dependency 'google-protobuf', '>= 3.17.3'
   spec.add_dependency 'grpc', '~>1.42'
-  spec.add_dependency 'trinsic-okapi', '>= 1.4.1'
+  spec.add_dependency 'trinsic-okapi', '>= 1.6.1'
 
   spec.add_development_dependency 'minitest', '~> 5.14'
   spec.add_development_dependency 'minitest-reporters', '~>1.4'

diff --git a/web/Generate-Proto.ps1 b/web/Generate-Proto.ps1
@@ -10,7 +10,7 @@ $OUTPUT_DIR = $OutDir
 $PROTO_DIR = Resolve-Path "$PSScriptRoot/../proto"
 Write-Output $PROTO_DIR
 
-if ((Get-Command "$PROTOC" -ErrorAction SilentlyContinue) -eq $null)
+if ($null -eq (Get-Command "$PROTOC" -ErrorAction SilentlyContinue))
 {
     Write-Host "Unable to find $PROTOC in your PATH"
     Return

diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -4,6 +4,9 @@
   "description": "Node and Browser wrapper for the Trinsic services",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
+  "files": [
+    "lib/*"
+  ],
   "scripts": {
     "build": "npm run build:proto && npm run build:typescript",
     "build:proto": "pwsh Generate-Proto.ps1",
@@ -31,7 +34,7 @@
   "license": "ISC",
   "dependencies": {
     "@improbable-eng/grpc-web-node-http-transport": "^0.15.0",
-    "@trinsic/okapi": "1.6.0-rc2",
+    "@trinsic/okapi": "1.6.0",
     "assert": "^2.0.0",
     "base64url": "^3.0.1",
     "browserify-fs": "^1.0.0",

diff --git a/web/test/AccountService.test.ts b/web/test/AccountService.test.ts
@@ -1,6 +1,6 @@
 import { AccountService } from "../src";
 
-import {getTestServerOptions} from "./env";
+import {getTestServerOptions, set20SecTimeout} from "./env";
 
 const options = getTestServerOptions();
 
@@ -11,6 +11,7 @@ async function printGetInfo(service: AccountService, profile: string) {
 }
 
 describe("AccountService Unit Tests", () => {
+  set20SecTimeout()
   it("protect/unprotect account profile", async () => {
     let service = new AccountService(options);
     let myProfile = await service.signIn();