Module fixes for Windows (#1816)

viamrobotics · Jan 31, 2023 · 82408a4 · 82408a4
1 parent 3b3eb81
commit 82408a4
Show file tree

Hide file tree

Showing 7 changed files with 143 additions and 64 deletions.
diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml
@@ -1,218 +1,219 @@
-# This file is NOT optimized for human-readability - please use the
-# `license_finder` program to read and edit it: https://github.com/viamrobotics/rdk#license-check
 ---
 - - :permit
   - MIT
-  - :who:
-    :why:
+  - :who: 
+    :why: 
     :versions: []
     :when: 2022-08-01 21:53:06.561636718 Z
 - - :permit
   - New BSD
-  - :who:
-    :why:
+  - :who: 
+    :why: 
     :versions: []
     :when: 2022-08-15 13:09:14.673806968 Z
 - - :permit
   - Apache 2.0
-  - :who:
-    :why:
+  - :who: 
+    :why: 
     :versions: []
     :when: 2022-08-15 13:15:11.855751606 Z
 - - :permit
   - Simplified BSD
-  - :who:
-    :why:
+  - :who: 
+    :why: 
     :versions: []
     :when: 2022-08-15 13:17:08.745016552 Z
 - - :permit
   - ISC
-  - :who:
-    :why:
+  - :who: 
+    :why: 
     :versions: []
     :when: 2022-08-15 13:37:40.979906881 Z
 - - :license
   - github.com/ajstarks/svgo
   - Creative Commons Attribution 4.0 International Public License
-  - :who:
+  - :who: 
     :license_links: https://github.com/ajstarks/svgo/blob/1546f124cd8b0cba8d505fa2ddb110c211670c59/LICENSE
     :versions: []
     :when: 2022-08-15 14:34:00.115389050 Z
 - - :license
   - github.com/go-fonts/liberation
   - New BSD
-  - :who:
+  - :who: 
     :license_links: https://github.com/go-fonts/liberation/blob/0c2fdab5e932afd0923f4f71ae23691a66305ef6/LICENSE
     :versions: []
     :when: 2022-08-15 14:47:01.153930427 Z
 - - :license
   - github.com/go-gl/mathgl
   - New BSD
-  - :who:
+  - :who: 
     :license_links: https://github.com/go-gl/mathgl/blob/45f44e1fbc36e29eb200186c5fd63828a2ffc540/LICENSE
     :versions: []
     :when: 2022-08-15 14:51:09.537862545 Z
 - - :license
   - github.com/go-latex/latex
   - New BSD
-  - :who:
+  - :who: 
     :why: 'TODO(RSDK-583): why is license finder unable to detect this license automatically?'
     :license_links: https://github.com/go-latex/latex/blob/c0d11ff05a81a63afdffbba6e577b2a3a6e69c85/LICENSE
     :versions: []
     :when: 2022-08-15 14:55:14.011453253 Z
 - - :license
   - github.com/improbable-eng/grpc-web
   - Apache License 2.0
-  - :who:
+  - :who: 
     :why: 'TODO(RSDK-583): why is license finder unable to detect this license automatically?'
     :license_links: https://github.com/improbable-eng/grpc-web/blob/90ce72a31aa7bdfd6eae03fc735953902949c0de/LICENSE.txt
     :versions: []
     :when: 2022-08-15 14:58:14.484806455 Z
 - - :license
   - github.com/jmespath/go-jmespath
   - Apache License 2.0
-  - :who:
+  - :who: 
     :why: 'TODO(RSDK-583): why is license finder unable to detect this license automatically?'
     :license_links: https://github.com/jmespath/go-jmespath/blob/b0104c826a24d7c202da8e1dbfb9ea4cfa35d774/LICENSE
     :versions: []
     :when: 2022-08-15 15:00:22.812116090 Z
 - - :license
   - github.com/xdg-go/pbkdf2
   - Apache License 2.0
-  - :who:
+  - :who: 
     :why: 'TODO(RSDK-583): why is license finder unable to detect this license automatically?'
     :license_links: https://github.com/xdg-go/pbkdf2/blob/7f452ef1dac88350356f1bb84a23748205e64b96/LICENSE
     :versions: []
     :when: 2022-08-15 15:02:55.419786268 Z
 - - :license
   - github.com/xdg-go/scram
   - Apache License 2.0
-  - :who:
+  - :who: 
     :why: 'TODO(RSDK-583): why is license finder unable to detect this license automatically?'
     :license_links: https://github.com/xdg-go/scram/blob/ef29d5590bacede26100601bb2f7d9bb08bacc75/LICENSE
     :versions: []
     :when: 2022-08-15 15:48:55.549018227 Z
 - - :license
   - github.com/xdg-go/stringprep
   - Apache License 2.0
-  - :who:
+  - :who: 
     :why: 'TODO(RSDK-583): why is license finder unable to detect this license automatically?'
     :license_links: https://github.com/xdg-go/stringprep/blob/eb5c8f240eb1ea3fe0144fd4d3e0c305492d8eb1/LICENSE
     :versions: []
     :when: 2022-08-15 15:50:08.659677721 Z
 - - :license
   - go-hep.org/x/hep
   - New BSD
-  - :who:
+  - :who: 
     :why: 'TODO(RSDK-583): why is license finder unable to detect this license automatically?'
     :license_links: https://github.com/go-hep/hep/blob/535619c28f900dcd37c522f2b9d593ec61b7b8dd/LICENSE
     :versions: []
     :when: 2022-08-15 15:53:36.138009630 Z
 - - :license
   - gonum.org/v1/plot
   - New BSD
-  - :who:
+  - :who: 
     :why: 'TODO(RSDK-583): why is license finder unable to detect this license automatically?'
     :license_links: https://github.com/gonum/plot/blob/c2b63591159b9dceb2cbf953702691d2a2fe7a6d/LICENSE
     :versions: []
     :when: 2022-08-15 15:56:25.026774237 Z
 - - :permit
   - Creative Commons Attribution 4.0 International Public License
-  - :who:
-    :why:
+  - :who: 
+    :why: 
     :versions: []
     :when: 2022-08-29 22:26:18.925886068 Z
 - - :permit
   - GPLv3
-  - :who:
-    :why:
+  - :who: 
+    :why: 
     :versions: []
     :when: 2022-08-30 15:22:06.823924964 Z
 - - :license
   - github.com/gen2brain/malgo
   - The Unlicense
-  - :who:
+  - :who: 
     :license_links: https://github.com/gen2brain/malgo/blob/6af716cf2273f0675789cc1366977970e31b2239/LICENSE
     :versions: []
     :when: 2022-08-30 15:37:02.011437856 Z
 - - :license
   - github.com/goburrow/modbus
   - New BSD
-  - :who:
+  - :who: 
     :why: https://github.com/goburrow/modbus/blob/606c02f4eef527a1d4cf7d8733d5fd7ba34f91d8/LICENSE
     :versions: []
     :when: 2022-09-14 16:27:17.872831000 Z
 - - :approve
   - github.com/ziutek/mymysql
-  - :who:
+  - :who: 
     :why: license language is compatible with AGPL
     :versions: []
     :when: 2022-09-14 16:27:17.872831000 Z
     :license_links: https://github.com/ziutek/mymysql/blob/fffb8880277462abe6f4526dbd69a1982f9437b6/LICENSE
 - - :license
   - github.com/golang/freetype
   - GPLv2+
-  - :who:
+  - :who: 
     :why: we are allowed to choose one of two licenses (freetype or GPL version 2
       or higher) - we are choosing the latter
     :versions: []
     :when: 2022-08-30 16:08:52.919938114 Z
     :license_links: https://github.com/golang/freetype/blob/e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4/LICENSE
 - - :permit
   - The Unlicense
-  - :who:
-    :why:
+  - :who: 
+    :why: 
     :versions: []
     :when: 2022-08-30 16:12:12.044846522 Z
     :license_links: https://unlicense.org
 - - :license
   - github.com/gonum/blas
   - New BSD
-  - :who:
-    :why:
-      'TODO(RSDK-582): this library is deprecated but still an indirect dependency
+  - :who: 
+    :why: 'TODO(RSDK-582): this library is deprecated but still an indirect dependency
       to RDK'
     :license_links: https://github.com/gonum/license/blob/59758bd3db1383fa1f02f88eceee1f8568a87039/LICENSE
     :versions: []
     :when: 2022-08-30 16:24:12.727870628 Z
 - - :license
   - github.com/gonum/lapack
   - New BSD
-  - :who:
-    :why:
-      'TODO(RSDK-582): this library is deprecated but still an indirect dependency
+  - :who: 
+    :why: 'TODO(RSDK-582): this library is deprecated but still an indirect dependency
       to RDK'
     :license_links: https://github.com/gonum/license/blob/59758bd3db1383fa1f02f88eceee1f8568a87039/LICENSE
     :versions: []
     :when: 2022-08-30 16:24:20.022268639 Z
 - - :license
   - github.com/gonum/matrix
   - New BSD
-  - :who:
-    :why:
-      'TODO(RSDK-582): this library is deprecated but still an indirect dependency
+  - :who: 
+    :why: 'TODO(RSDK-582): this library is deprecated but still an indirect dependency
       to RDK'
     :license_links: https://github.com/gonum/license/blob/59758bd3db1383fa1f02f88eceee1f8568a87039/LICENSE
     :versions: []
     :when: 2022-08-30 16:24:26.855308650 Z
 - - :license
-  - '@viamrobotics/rpc'
+  - "@viamrobotics/rpc"
   - MIT
-  - :who:
+  - :who: 
     :why: 'TODO(RSDK-583): why is license finder unable to detect this license automatically?'
     :license_links: https://github.com/viamrobotics/goutils/blob/6684974ace14045e04d479777852602817e03313/LICENSE
     :versions: []
     :when: 2022-08-31 20:08:14.585047144 Z
 - - :approve
   - github.com/viamrobotics/evdev
-  - :who:
-    :why: 'license language is compatible with AGPL'
-    :license_links: 'https://github.com/viamrobotics/evdev/blob/5a415229fba9557cca9bfedc7ba89cb48f28fab0/LICENSE'
+  - :who: 
+    :why: license language is compatible with AGPL
+    :license_links: https://github.com/viamrobotics/evdev/blob/5a415229fba9557cca9bfedc7ba89cb48f28fab0/LICENSE
     :versions: []
     :when: 2022-08-31 20:13:08.147340927 Z
 - - :permit
   - GPLv2+
-  - :who:
-    :why:
+  - :who: 
+    :why: 
     :versions: []
     :when: 2022-09-16 15:13:54.129990412 Z
+- - :approve
+  - github.com/opencensus-integrations/gomongowrapper
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2023-01-30 21:31:27.476042000 Z
diff --git a/examples/customresources/demos/simplemodule/module.go b/examples/customresources/demos/simplemodule/module.go
@@ -19,7 +19,8 @@ import (
 
 	"go.viam.com/utils"
 )
-var myModel = resource.NewModel("acme", "demo","mycounter")
+
+var myModel = resource.NewModel("acme", "demo", "mycounter")
 
 func main() {
 	utils.ContextualMain(mainWithArgs, golog.NewDevelopmentLogger("SimpleModule"))
@@ -44,6 +45,7 @@ func mainWithArgs(ctx context.Context, args []string, logger golog.Logger) error
 	if err != nil {
 		return err
 	}
+
 	// This will block (leaving the module running) until the context is cancelled.
 	// The utils.ContextualMain catches OS signals and will cancel our context for us when one is sent for shutdown/termination.
 	<-ctx.Done()

diff --git a/go.mod b/go.mod
@@ -79,7 +79,7 @@ require (
 	go.viam.com/api v0.1.53
 	go.viam.com/dynamixel v0.0.0-20210507131419-60a9033552cb
 	go.viam.com/test v1.1.1-0.20220909204145-f61b7c01c33e
-	go.viam.com/utils v0.1.10-0.20230123200924-1f2acca19ec7
+	go.viam.com/utils v0.1.10-0.20230130193222-8829956fedc2
 	goji.io v2.0.2+incompatible
 	golang.org/x/image v0.1.0
 	golang.org/x/tools v0.2.0
@@ -265,6 +265,7 @@ require (
 	github.com/nishanths/exhaustive v0.8.3 // indirect
 	github.com/nishanths/predeclared v0.2.2 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/opencensus-integrations/gomongowrapper v0.0.3 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
 	github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect