Merge pull request #589 from gstvg/schema-update

Update the schema to v1.05.02-2022-11-01 and regenerate code

Makefile

@@ -22,7 +22,7 @@ install-py-opcua:
 	pip3 install opcua
 
 gen:
-	go get -d golang.org/x/tools/cmd/stringer
+	go install golang.org/x/tools/cmd/stringer@latest
 	go generate ./...
 	go mod tidy
 

cmd/service/main.go

@@ -108,6 +108,9 @@ import "time"
 func Enums(dict *TypeDictionary) []Type {
 	var enums []Type
 	for _, t := range dict.Enums {
+		if len(t.Values) == 0 {
+			continue
+		}
 		e := Type{
 			Name: goname.Format(t.Name),
 			Kind: KindEnum,

cmd/status/main.go

@@ -94,9 +94,6 @@ func (n StatusCode) Error() string {
 
 var (
 	StatusOK StatusCode = 0x0
-    StatusUncertain StatusCode = 0x40000000
-    StatusBad StatusCode = 0x80000000
-
 	{{range .}}{{index . 0}} StatusCode = {{index . 1}}
 	{{end}}
 )
@@ -111,7 +108,7 @@ var StatusCodes = map[StatusCode]StatusCodeDesc{
 	StatusOK: {Name: "OK", Text: ""},
 	StatusUncertain: {Name: "Uncertain", Text: ""},
 	StatusBad: {Name: "Bad", Text: ""},
-	{{range .}}{{index . 0}}: { Name: "{{index . 0}}", Text: "{{index . 2}}" },
+	{{range .}}{{index . 0}}: { Name: "{{index . 0}}", Text: {{index . 2}} },
 	{{end}}
 }
 `))

examples/crypto/crypto.go

@@ -17,7 +17,7 @@ import (
 	"syscall"
 	"time"
 
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 
 	"github.com/gopcua/opcua"
 	"github.com/gopcua/opcua/debug"
@@ -271,7 +271,7 @@ func authFromFlags(cert []byte) (ua.UserTokenType, opcua.Option) {
 
 		if passPrompt {
 			fmt.Print("Enter password: ")
-			passInput, err := terminal.ReadPassword(int(syscall.Stdin))
+			passInput, err := term.ReadPassword(int(syscall.Stdin))
 			if err != nil {
 				log.Fatalf("Error reading password: %s", err)
 			}

generate.sh

@@ -4,10 +4,9 @@ rm -f */*_gen.go
 go run cmd/id/main.go
 go run cmd/status/main.go
 go run cmd/service/*.go
-go run cmd/stats/*.go
 
 # install stringer if not installed already
-command -v stringer || go get -u golang.org/x/tools/cmd/stringer
+command -v stringer || go install golang.org/x/tools/cmd/stringer@latest
 
 # find all enum types
 enums=$(grep -w '^type' ua/enums*.go | awk '{print $2;}' | paste -sd, -)
@@ -19,8 +18,5 @@ echo "Wrote ua/enums_strings_gen.go"
 stringer -type ConnState -output connstate_strings_gen.go
 echo "Wrote connstate_strings_gen.go"
 
-(cd stats && stringer -type Metric -output metrics_strings_gen.go)
-echo "Wrote stats/metrics_strings_gen.go"
-
 # remove golang.org/x/tools/cmd/stringer from list of dependencies
 go mod tidy

go.mod

@@ -5,14 +5,11 @@ go 1.20
 require (
 	github.com/pascaldekloe/goe v0.1.1
 	github.com/pkg/errors v0.9.1
-	golang.org/x/crypto v0.9.0
 	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
+	golang.org/x/term v0.8.0
 )
 
-require (
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/term v0.8.0 // indirect
-)
+require golang.org/x/sys v0.8.0 // indirect
 
 retract (
 	v0.2.5 // https://github.com/gopcua/opcua/issues/538

go.sum

@@ -2,8 +2,6 @@ github.com/pascaldekloe/goe v0.1.1 h1:Ah6WQ56rZONR3RW3qWa2NCZ6JAVvSpUcoLBaOmYFt9
 github.com/pascaldekloe/goe v0.1.1/go.mod h1:KSyfaxQOh0HZPjDP1FL/kFtbqYqrALJTaMafFUIccqU=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
-golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=