CI/CD Build Errors (#305)

fundthmcalculus · web-flow · commit 2e6a29b69a54 · 2021-12-07T17:50:20.000-05:00
diff --git a/.github/workflows/build-golang.yml b/.github/workflows/build-golang.yml
@@ -30,12 +30,12 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.9
-      - name: Display Golang version
+      - name: Build and Test Golang
         run: |
           go version
           go install golang.org/x/lint/golint@latest
           go install github.com/jstemmer/go-junit-report@latest
-          python ../../devops/build_sdks.py --package-version=${{ github.event.inputs.packageVersion }}
+          python ../../devops/build_sdks.py
           go build
           golint
           go test -v | go-junit-report > test_output.xml
diff --git a/devops/build_sdks.py b/devops/build_sdks.py
@@ -87,6 +87,8 @@ def build_ruby(args) -> None:
     ruby_dir = abspath(join(dirname(__file__), '..', 'ruby'))
     update_line(join(ruby_dir, 'lib', 'version.rb'),
                 {'  VERSION =': f"  VERSION = '{get_package_versions(args)}'"})
+    copy_okapi_libs(abspath(join(ruby_dir, '..', 'libs')))
+    copy_okapi_libs(ruby_dir)  # Ruby FFI loads from current directory first, this enables macos
 
 
 def build_golang(args) -> None:
diff --git a/go/okapi/native.go b/go/okapi/native.go
@@ -9,17 +9,16 @@ import "C"
 
 import (
 	"fmt"
-	"unsafe"
-
 	"google.golang.org/protobuf/proto"
+	"unsafe"
 )
 
-type OkapiError struct {
+type NativeError struct {
 	Message       string
 	InternalError error
 }
 
-func (o OkapiError) Error() string {
+func (o NativeError) Error() string {
 	return fmt.Sprintf("Error:%s  InternalError:%v", o.Message, o.InternalError)
 }
 
@@ -124,7 +123,7 @@ func createError(code int32, err C.ExternError) error {
 	}
 }
 func wrapError(message string, internalError error) error {
-	return &OkapiError{
+	return &NativeError{
 		Message:       message,
 		InternalError: internalError,
 	}
diff --git a/go/okapi/oberon_test.go b/go/okapi/oberon_test.go
@@ -40,16 +40,16 @@ func TestDemoWithBlinding(t *testing.T) {
 	data := []byte("alice")
 	nonce := []byte("1234")
 	// blinding code to be used by issuer and given to holder to transfer the token securely
-	issuer_2fa := []byte("issuer code")
+	issuer2fa := []byte("issuer code")
 
 	tokenRequest := okapiproto.CreateOberonTokenRequest{Data: data, Sk: key.Sk}
-	tokenRequest.Blinding = append(tokenRequest.Blinding, issuer_2fa)
+	tokenRequest.Blinding = append(tokenRequest.Blinding, issuer2fa)
 
 	blindedToken, _ := ob.CreateToken(&tokenRequest)
 
 	// Holder unblinds token
 	unblindRequest := okapiproto.UnBlindOberonTokenRequest{Token: blindedToken.Token}
-	unblindRequest.Blinding = append(unblindRequest.Blinding, issuer_2fa)
+	unblindRequest.Blinding = append(unblindRequest.Blinding, issuer2fa)
 	token, _ := ob.UnblindToken(&unblindRequest)
 
 	// Holder prepares a proof without blinding
diff --git a/java/build.gradle b/java/build.gradle
@@ -12,7 +12,7 @@ plugins {
 def jarDomainId = "id"
 def jarGroupId = "trinsic"
 def jarArtifactId = "okapi"
-def jarVersion = "1.1.1"
+def jarVersion = "1.2.0"
 
 publishing {
     repositories {
diff --git a/python/setup.cfg b/python/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = trinsic-okapi
-version = 1.1.1
+version = 1.2.0
 author = Scott Phillips
 author_email = scott.phillips@trinsic.id
 description = Trinsic okapi SDK bindings
diff --git a/ruby/Gemfile b/ruby/Gemfile
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec
diff --git a/ruby/Rakefile b/ruby/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
diff --git a/ruby/lib/okapi.rb b/ruby/lib/okapi.rb
@@ -123,7 +123,6 @@ def self.ffi_call(function, request, response_klass)
   class DidError < StandardError
     def initialize(code = 0, msg = nil)
       @code = code
-      # @msg = msg
       super(msg)
     end
 
diff --git a/ruby/lib/version.rb b/ruby/lib/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Okapi
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end
diff --git a/ruby/okapi.gemspec b/ruby/okapi.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/trinsic-id/okapi'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/trinsic-id/okapi/ruby'

Original file line number	Diff line number	Diff line change
`@@ -9,17 +9,16 @@ import "C"`
`9`	`9`
`10`	`10`	`import (`
`11`	`11`	`"fmt"`
`12`		`- "unsafe"`
`13`		`-`
`14`	`12`	`"google.golang.org/protobuf/proto"`
	`13`	`+ "unsafe"`
`15`	`14`	`)`
`16`	`15`
`17`		`-type OkapiError struct {`
	`16`	`+type NativeError struct {`
`18`	`17`	`Message string`
`19`	`18`	`InternalError error`
`20`	`19`	`}`
`21`	`20`
`22`		`-func (o OkapiError) Error() string {`
	`21`	`+func (o NativeError) Error() string {`
`23`	`22`	`return fmt.Sprintf("Error:%s InternalError:%v", o.Message, o.InternalError)`
`24`	`23`	`}`
`25`	`24`
`@@ -124,7 +123,7 @@ func createError(code int32, err C.ExternError) error {`
`124`	`123`	`}`
`125`	`124`	`}`
`126`	`125`	`func wrapError(message string, internalError error) error {`
`127`		`- return &OkapiError{`
	`126`	`+ return &NativeError{`
`128`	`127`	`Message: message,`
`129`	`128`	`InternalError: internalError,`
`130`	`129`	`}`
-Original file line number
+Diff line change
@@ @@ -1,2 +1,4 @@ @@
 +# frozen_string_literal: true
++
 source 'https://rubygems.org'
 gemspec
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`require 'bundler/gem_tasks'`
`2`	`4`	`require 'rake/testtask'`
`3`	`5`