From 2f0a5c92b09acd5029aa60a8b9dd0cadd4f88abf Mon Sep 17 00:00:00 2001 From: Ben Krieger Date: Tue, 14 Jan 2025 10:22:56 -0500 Subject: [PATCH] feat!: Rename module to allow running go install --- Makefile | 2 ++ README.md | 36 ++++++++++++++++++---------- cmd/{ => rpc}/lib.go | 3 ++- cmd/{ => rpc}/main.go | 11 +++++---- go.mod | 2 +- internal/amt/commands.go | 5 ++-- internal/amt/commands_test.go | 5 ++-- internal/certs/certs.go | 5 ++-- internal/certs/certs_test.go | 3 ++- internal/flags/activate.go | 3 ++- internal/flags/activate_test.go | 3 ++- internal/flags/configure.go | 5 ++-- internal/flags/configure_test.go | 5 ++-- internal/flags/deactivate.go | 3 ++- internal/flags/deactivate_test.go | 3 ++- internal/flags/flags.go | 9 +++---- internal/flags/flags_test.go | 9 +++---- internal/flags/info.go | 3 ++- internal/flags/info_test.go | 3 ++- internal/flags/maintenance.go | 5 ++-- internal/flags/maintenance_test.go | 3 ++- internal/flags/version.go | 2 +- internal/lm/engine.go | 6 +++-- internal/lm/engine_test.go | 6 +++-- internal/local/Certificates.go | 6 +++-- internal/local/Certificates_test.go | 5 ++-- internal/local/activate.go | 3 ++- internal/local/activate_test.go | 9 +++---- internal/local/amt/localTransport.go | 3 ++- internal/local/amt/wsman.go | 6 +++-- internal/local/amtPassword.go | 6 +++-- internal/local/amtPassword_test.go | 5 ++-- internal/local/configure.go | 3 ++- internal/local/configure_test.go | 5 ++-- internal/local/deactivate.go | 2 +- internal/local/deactivate_test.go | 5 ++-- internal/local/ea_test.go | 3 ++- internal/local/ethernet.go | 8 ++++--- internal/local/ethernet_test.go | 10 ++++---- internal/local/features.go | 6 +++-- internal/local/features_test.go | 8 ++++--- internal/local/info.go | 12 ++++++---- internal/local/info_test.go | 8 ++++--- internal/local/linux.go | 6 +++-- internal/local/lps.go | 11 +++++---- internal/local/lps_test.go | 10 ++++---- internal/local/mebx.go | 2 +- internal/local/mebx_test.go | 5 ++-- internal/local/opstate.go | 4 ++-- internal/local/opstate_test.go | 7 +++--- internal/local/time.go | 3 ++- internal/local/time_test.go | 3 ++- internal/local/tls.go | 10 ++++---- internal/local/tls_test.go | 8 ++++--- internal/local/version.go | 3 ++- internal/local/version_test.go | 5 ++-- internal/local/wifi.go | 8 ++++--- internal/local/wifi_test.go | 7 +++--- internal/local/windows.go | 3 ++- internal/rps/executor.go | 7 +++--- internal/rps/message.go | 9 +++---- internal/rps/message_test.go | 7 +++--- internal/rps/rps.go | 5 ++-- internal/rps/rps_test.go | 5 ++-- internal/smb/samba.go | 3 ++- internal/smb/samba_test.go | 3 ++- makefile | 2 -- pkg/heci/windows.go | 2 +- pkg/pthi/commands.go | 3 ++- pkg/pthi/commands_test.go | 3 ++- pkg/pthi/status_test.go | 3 ++- 71 files changed, 244 insertions(+), 156 deletions(-) create mode 100644 Makefile rename cmd/{ => rpc}/lib.go (96%) rename cmd/{ => rpc}/main.go (86%) delete mode 100644 makefile diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..a39f52bd --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +build: + go build ./cmd/rpc diff --git a/README.md b/README.md index de307d7a..4cbfd7e8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # Remote Provisioning Client (RPC) + ![CodeQL](https://img.shields.io/github/actions/workflow/status/open-amt-cloud-toolkit/rpc-go/codeql-analysis.yml?style=for-the-badge&label=CodeQL&logo=github) ![Build](https://img.shields.io/github/actions/workflow/status/open-amt-cloud-toolkit/rpc-go/main.yml?style=for-the-badge&logo=github) ![Codecov](https://img.shields.io/codecov/c/github/open-amt-cloud-toolkit/rpc-go?style=for-the-badge&logo=codecov) @@ -17,7 +18,7 @@ The Remote Provisioning Client (RPC) is an application that assists with activat
-## Prerequisites +## Prerequisites - [Golang](https://go.dev/dl/) @@ -25,26 +26,32 @@ The Remote Provisioning Client (RPC) is an application that assists with activat ### Windows -#### As executable: +#### As executable: + ``` -go build -o rpc.exe ./cmd/main.go +go build -o rpc.exe ./cmd/rpc/main.go ``` -#### As Library: + +#### As Library: + ``` -go build -buildmode=c-shared -o rpc.dll ./cmd +go build -buildmode=c-shared -o rpc.dll ./cmd/rpc ``` ### Linux -#### As executable: +#### As executable: + ``` -go build -o rpc ./cmd/main.go +go build -o rpc ./cmd/rpc/main.go ``` -#### As Library: +#### As Library: + ``` -go build -buildmode=c-shared -o librpc.so ./cmd +CGO_ENABLED=1 go build -buildmode=c-shared -o librpc.so ./cmd/rpc ``` + ### Docker image ```bash @@ -54,21 +61,24 @@ docker build -t rpc-go:latest . ## Run Install the executable on a target device and then run from a terminal/shell -command line with adminstrator privileges. +command line with adminstrator privileges. -For usage, call the executable with no additional parameters. +For usage, call the executable with no additional parameters. ### Windows + ```shell .\rpc ``` ### Linux + ```bash sudo ./rpc ``` ### Docker + ```bash $ docker run --rm -it --device /dev/mei0 rpc-go:latest ``` @@ -77,7 +87,7 @@ $ docker run --rm -it --device /dev/mei0 rpc-go:latest # Dev tips for passing CI Checks -- Ensure code is formatted correctly with `gofmt -s -w ./` +- Ensure code is formatted correctly with `gofmt -s -w ./` - Ensure all unit tests pass with `go test ./...` - Ensure code has been linted with `docker run --rm -v ${pwd}:/app -w /app golangci/golangci-lint:v1.52.2 golangci-lint run -v` @@ -91,4 +101,4 @@ $ docker run --rm -it --device /dev/mei0 rpc-go:latest - Need additional support or want to get the latest news and events about Open AMT? Connect with the team directly through Discord. - [![Discord Banner 1](https://discordapp.com/api/guilds/1063200098680582154/widget.png?style=banner2)](https://discord.gg/DKHeUNEWVH) + [![Discord Banner 1](https://discordapp.com/api/guilds/1063200098680582154/widget.png?style=banner2)](https://discord.gg/DKHeUNEWVH) diff --git a/cmd/lib.go b/cmd/rpc/lib.go similarity index 96% rename from cmd/lib.go rename to cmd/rpc/lib.go index 8cdea7db..49322ec7 100644 --- a/cmd/lib.go +++ b/cmd/rpc/lib.go @@ -14,9 +14,10 @@ import ( "encoding/csv" "io" "os" - "rpc/pkg/utils" "strings" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + log "github.com/sirupsen/logrus" ) diff --git a/cmd/main.go b/cmd/rpc/main.go similarity index 86% rename from cmd/main.go rename to cmd/rpc/main.go index 237d3ab6..f4461b7d 100644 --- a/cmd/main.go +++ b/cmd/rpc/main.go @@ -6,13 +6,14 @@ package main import ( "os" - "rpc/internal/amt" - "rpc/internal/flags" - "rpc/internal/local" - "rpc/internal/rps" - "rpc/pkg/utils" log "github.com/sirupsen/logrus" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/amt" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/local" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/rps" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" ) const AccessErrMsg = "Failed to execute due to access issues. " + diff --git a/go.mod b/go.mod index 8131ee9d..4220af9b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module rpc +module github.com/open-amt-cloud-toolkit/rpc-go/v2 go 1.20 diff --git a/internal/amt/commands.go b/internal/amt/commands.go index 451095ee..4c1ea196 100644 --- a/internal/amt/commands.go +++ b/internal/amt/commands.go @@ -7,11 +7,12 @@ package amt import ( "errors" "fmt" - "rpc/pkg/pthi" - "rpc/pkg/utils" "strconv" "strings" "time" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/pthi" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" ) //TODO: Ensure pointers are freed properly throughout this file diff --git a/internal/amt/commands_test.go b/internal/amt/commands_test.go index 214a92ed..ce807b4d 100644 --- a/internal/amt/commands_test.go +++ b/internal/amt/commands_test.go @@ -7,11 +7,12 @@ package amt import ( "errors" "fmt" - "rpc/pkg/pthi" - "rpc/pkg/utils" "testing" "time" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/pthi" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/internal/certs/certs.go b/internal/certs/certs.go index a800701a..9891d5d3 100644 --- a/internal/certs/certs.go +++ b/internal/certs/certs.go @@ -15,12 +15,13 @@ import ( "encoding/hex" "encoding/pem" "fmt" - log "github.com/sirupsen/logrus" "math/big" "net" - "software.sslmate.com/src/go-pkcs12" "strings" "time" + + log "github.com/sirupsen/logrus" + "software.sslmate.com/src/go-pkcs12" ) type Composite struct { diff --git a/internal/certs/certs_test.go b/internal/certs/certs_test.go index 76e35013..11ed530f 100644 --- a/internal/certs/certs_test.go +++ b/internal/certs/certs_test.go @@ -6,9 +6,10 @@ package certs import ( - "github.com/stretchr/testify/assert" "strings" "testing" + + "github.com/stretchr/testify/assert" ) func RunNewSignedCompositeTest(t *testing.T, testDer string) { diff --git a/internal/flags/activate.go b/internal/flags/activate.go index ad8cee82..cd914d6b 100644 --- a/internal/flags/activate.go +++ b/internal/flags/activate.go @@ -9,7 +9,8 @@ import ( "fmt" "reflect" "regexp" - "rpc/pkg/utils" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" log "github.com/sirupsen/logrus" ) diff --git a/internal/flags/activate_test.go b/internal/flags/activate_test.go index 642fe8a4..7736fdbe 100644 --- a/internal/flags/activate_test.go +++ b/internal/flags/activate_test.go @@ -7,11 +7,12 @@ package flags import ( "os" - "rpc/pkg/utils" "strings" "testing" "time" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/internal/flags/configure.go b/internal/flags/configure.go index d44b8cbb..d788235e 100644 --- a/internal/flags/configure.go +++ b/internal/flags/configure.go @@ -12,10 +12,11 @@ import ( "fmt" "os" "path/filepath" - "rpc/internal/config" - "rpc/pkg/utils" "strings" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/config" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/cim/wifi" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/ieee8021x" diff --git a/internal/flags/configure_test.go b/internal/flags/configure_test.go index ceadc8c1..8c59ce4a 100644 --- a/internal/flags/configure_test.go +++ b/internal/flags/configure_test.go @@ -8,11 +8,12 @@ package flags import ( "fmt" "os" - "rpc/internal/config" - "rpc/pkg/utils" "strings" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/config" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/cim/wifi" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/ieee8021x" diff --git a/internal/flags/deactivate.go b/internal/flags/deactivate.go index 60b254b5..1af332b9 100644 --- a/internal/flags/deactivate.go +++ b/internal/flags/deactivate.go @@ -7,7 +7,8 @@ package flags import ( "fmt" - "rpc/pkg/utils" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" ) func (f *Flags) handleDeactivateCommand() error { diff --git a/internal/flags/deactivate_test.go b/internal/flags/deactivate_test.go index 8f912dfa..6b8c4c67 100644 --- a/internal/flags/deactivate_test.go +++ b/internal/flags/deactivate_test.go @@ -6,9 +6,10 @@ package flags import ( - "rpc/pkg/utils" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/internal/flags/flags.go b/internal/flags/flags.go index 45aae814..37b1d715 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -13,14 +13,15 @@ import ( "net" "os" "path/filepath" - "rpc/internal/amt" - "rpc/internal/config" - "rpc/internal/smb" - "rpc/pkg/utils" "strconv" "strings" "time" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/amt" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/config" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/smb" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + configv2 "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/config" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/security" diff --git a/internal/flags/flags_test.go b/internal/flags/flags_test.go index 59235b02..54f928d2 100644 --- a/internal/flags/flags_test.go +++ b/internal/flags/flags_test.go @@ -12,12 +12,13 @@ import ( "net" "os" "path/filepath" - "rpc/internal/config" - "rpc/internal/smb" - "rpc/pkg/pthi" - "rpc/pkg/utils" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/config" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/smb" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/pthi" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "gopkg.in/yaml.v3" "github.com/stretchr/testify/assert" diff --git a/internal/flags/info.go b/internal/flags/info.go index ebe8471a..e09e5e38 100644 --- a/internal/flags/info.go +++ b/internal/flags/info.go @@ -7,7 +7,8 @@ package flags import ( "flag" - "rpc/pkg/utils" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" ) type AmtInfoFlags struct { diff --git a/internal/flags/info_test.go b/internal/flags/info_test.go index d40e0e68..25d5032d 100644 --- a/internal/flags/info_test.go +++ b/internal/flags/info_test.go @@ -6,10 +6,11 @@ package flags import ( - "rpc/pkg/utils" "strings" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/internal/flags/maintenance.go b/internal/flags/maintenance.go index ed179cf3..37d1d899 100644 --- a/internal/flags/maintenance.go +++ b/internal/flags/maintenance.go @@ -12,8 +12,9 @@ import ( "os" "path/filepath" "regexp" - "rpc/internal/amt" - "rpc/pkg/utils" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/amt" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" log "github.com/sirupsen/logrus" ) diff --git a/internal/flags/maintenance_test.go b/internal/flags/maintenance_test.go index 0a636215..40afb0b1 100644 --- a/internal/flags/maintenance_test.go +++ b/internal/flags/maintenance_test.go @@ -8,10 +8,11 @@ package flags import ( "os" "path/filepath" - "rpc/pkg/utils" "strings" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/internal/flags/version.go b/internal/flags/version.go index da71c97b..5398de4b 100644 --- a/internal/flags/version.go +++ b/internal/flags/version.go @@ -6,7 +6,7 @@ package flags import ( - "rpc/pkg/utils" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" ) func (f *Flags) handleVersionCommand() error { diff --git a/internal/lm/engine.go b/internal/lm/engine.go index 17e0cfc8..ff57780b 100644 --- a/internal/lm/engine.go +++ b/internal/lm/engine.go @@ -7,12 +7,14 @@ package lm import ( "bytes" "encoding/binary" - "rpc/pkg/pthi" "sync" "time" - "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/apf" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/pthi" + log "github.com/sirupsen/logrus" + + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/apf" ) // LMConnection is struct for managing connection to LMS diff --git a/internal/lm/engine_test.go b/internal/lm/engine_test.go index e46f6558..582258a9 100644 --- a/internal/lm/engine_test.go +++ b/internal/lm/engine_test.go @@ -6,12 +6,14 @@ package lm import ( "errors" - "rpc/pkg/pthi" "sync" "testing" - "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/apf" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/pthi" + "github.com/stretchr/testify/assert" + + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/apf" ) type MockHECICommands struct{} diff --git a/internal/local/Certificates.go b/internal/local/Certificates.go index c6ef363b..6cb7037d 100644 --- a/internal/local/Certificates.go +++ b/internal/local/Certificates.go @@ -2,14 +2,16 @@ package local import ( "reflect" - "rpc/pkg/utils" "strings" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + + log "github.com/sirupsen/logrus" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publickey" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publicprivate" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/cim/concrete" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/cim/credential" - log "github.com/sirupsen/logrus" ) const ( diff --git a/internal/local/Certificates_test.go b/internal/local/Certificates_test.go index a58ad24a..72877709 100644 --- a/internal/local/Certificates_test.go +++ b/internal/local/Certificates_test.go @@ -2,10 +2,11 @@ package local import ( // "encoding/xml" - "rpc/internal/flags" - "rpc/pkg/utils" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publickey" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publicprivate" diff --git a/internal/local/activate.go b/internal/local/activate.go index 3ae75c4e..d646b8c9 100644 --- a/internal/local/activate.go +++ b/internal/local/activate.go @@ -15,9 +15,10 @@ import ( "encoding/hex" "encoding/pem" "errors" - "rpc/pkg/utils" "strings" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + log "github.com/sirupsen/logrus" pkcs12 "software.sslmate.com/src/go-pkcs12" ) diff --git a/internal/local/activate_test.go b/internal/local/activate_test.go index c65ac96c..72d696f2 100644 --- a/internal/local/activate_test.go +++ b/internal/local/activate_test.go @@ -7,12 +7,13 @@ package local import ( "crypto/x509" - amt2 "rpc/internal/amt" - "rpc/internal/certs" - "rpc/internal/flags" - "rpc/pkg/utils" "testing" + amt2 "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/amt" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/certs" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/internal/local/amt/localTransport.go b/internal/local/amt/localTransport.go index 3847fd24..2acfc3e9 100644 --- a/internal/local/amt/localTransport.go +++ b/internal/local/amt/localTransport.go @@ -11,9 +11,10 @@ import ( "fmt" "io" "net/http" - "rpc/internal/lm" "sync" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/lm" + "github.com/sirupsen/logrus" ) diff --git a/internal/local/amt/wsman.go b/internal/local/amt/wsman.go index 5bdfda85..ffb15e89 100644 --- a/internal/local/amt/wsman.go +++ b/internal/local/amt/wsman.go @@ -8,7 +8,10 @@ package amt import ( "encoding/base64" "net" - "rpc/pkg/utils" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + + "github.com/sirupsen/logrus" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/authorization" @@ -30,7 +33,6 @@ import ( "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/hostbasedsetup" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/ieee8021x" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/optin" - "github.com/sirupsen/logrus" ) type WSMANer interface { diff --git a/internal/local/amtPassword.go b/internal/local/amtPassword.go index c6049867..cdba9f2d 100644 --- a/internal/local/amtPassword.go +++ b/internal/local/amtPassword.go @@ -8,10 +8,12 @@ package local import ( "encoding/base64" "encoding/hex" - "rpc/pkg/utils" - "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/client" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + log "github.com/sirupsen/logrus" + + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/client" ) func (service *ProvisioningService) ChangeAMTPassword() (err error) { diff --git a/internal/local/amtPassword_test.go b/internal/local/amtPassword_test.go index cbfd4ec6..d979b52d 100644 --- a/internal/local/amtPassword_test.go +++ b/internal/local/amtPassword_test.go @@ -6,10 +6,11 @@ package local import ( - "rpc/internal/flags" - "rpc/pkg/utils" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/internal/local/configure.go b/internal/local/configure.go index f572ea12..cabe665a 100644 --- a/internal/local/configure.go +++ b/internal/local/configure.go @@ -8,7 +8,8 @@ package local import ( "errors" "net/url" - "rpc/pkg/utils" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" diff --git a/internal/local/configure_test.go b/internal/local/configure_test.go index d1b0231a..7874a785 100644 --- a/internal/local/configure_test.go +++ b/internal/local/configure_test.go @@ -6,10 +6,11 @@ package local import ( - "rpc/internal/flags" - "rpc/pkg/utils" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/internal/local/deactivate.go b/internal/local/deactivate.go index df7bc5c8..d65297b7 100644 --- a/internal/local/deactivate.go +++ b/internal/local/deactivate.go @@ -6,7 +6,7 @@ package local import ( - "rpc/pkg/utils" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" diff --git a/internal/local/deactivate_test.go b/internal/local/deactivate_test.go index 928ddc2a..f46f9b78 100644 --- a/internal/local/deactivate_test.go +++ b/internal/local/deactivate_test.go @@ -7,10 +7,11 @@ package local import ( "errors" - "rpc/internal/flags" - "rpc/pkg/utils" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/internal/local/ea_test.go b/internal/local/ea_test.go index 6beea119..7994b4d9 100644 --- a/internal/local/ea_test.go +++ b/internal/local/ea_test.go @@ -9,9 +9,10 @@ import ( "encoding/json" "net/http" "net/http/httptest" - "rpc/internal/flags" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/stretchr/testify/assert" ) diff --git a/internal/local/ethernet.go b/internal/local/ethernet.go index acc491f9..0bb5b870 100644 --- a/internal/local/ethernet.go +++ b/internal/local/ethernet.go @@ -2,12 +2,14 @@ package local import ( "os" - "rpc/internal/config" - "rpc/pkg/utils" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/config" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + + log "github.com/sirupsen/logrus" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/ethernetport" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/ieee8021x" - log "github.com/sirupsen/logrus" ) func (service *ProvisioningService) AddEthernetSettings() (err error) { diff --git a/internal/local/ethernet_test.go b/internal/local/ethernet_test.go index 28873a96..1ddc66c6 100644 --- a/internal/local/ethernet_test.go +++ b/internal/local/ethernet_test.go @@ -4,15 +4,17 @@ import ( "encoding/json" "net/http" "net/http/httptest" - "rpc/internal/config" - "rpc/internal/flags" - "rpc/pkg/utils" "strings" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/config" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + + "github.com/stretchr/testify/assert" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/ethernetport" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publickey" - "github.com/stretchr/testify/assert" ) var mockauthResponse = AuthResponse{Token: "someToken"} diff --git a/internal/local/features.go b/internal/local/features.go index 7816a030..263f21ac 100644 --- a/internal/local/features.go +++ b/internal/local/features.go @@ -5,13 +5,15 @@ package local import ( - "rpc/pkg/utils" "strings" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + + log "github.com/sirupsen/logrus" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/redirection" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/cim/kvm" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/optin" - log "github.com/sirupsen/logrus" ) func (service *ProvisioningService) SetAMTFeatures() error { diff --git a/internal/local/features_test.go b/internal/local/features_test.go index ee2fe235..b6f34a44 100644 --- a/internal/local/features_test.go +++ b/internal/local/features_test.go @@ -5,14 +5,16 @@ package local import ( - "rpc/internal/flags" - "rpc/pkg/utils" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + + "github.com/stretchr/testify/assert" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/redirection" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/cim/kvm" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/optin" - "github.com/stretchr/testify/assert" ) var getRedirectionResponse = redirection.Response{ diff --git a/internal/local/info.go b/internal/local/info.go index 6423ce1b..21ed781d 100644 --- a/internal/local/info.go +++ b/internal/local/info.go @@ -12,16 +12,18 @@ import ( "fmt" "net" "os" - "rpc/internal/amt" - "rpc/internal/flags" - "rpc/pkg/utils" "strconv" "strings" - "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publickey" - "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publicprivate" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/amt" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" + + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publickey" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publicprivate" ) type PrivateKeyPairReference struct { diff --git a/internal/local/info_test.go b/internal/local/info_test.go index d4c57475..41e3d690 100644 --- a/internal/local/info_test.go +++ b/internal/local/info_test.go @@ -8,12 +8,14 @@ package local import ( "errors" "net" - "rpc/internal/flags" - "rpc/pkg/utils" "testing" - "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publickey" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" + + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publickey" ) var MockPRSuccess = new(MockPasswordReaderSuccess) diff --git a/internal/local/linux.go b/internal/local/linux.go index 300e7e92..d58319bf 100644 --- a/internal/local/linux.go +++ b/internal/local/linux.go @@ -9,9 +9,11 @@ package local import ( - log "github.com/sirupsen/logrus" "os/exec" - "rpc/pkg/utils" + + log "github.com/sirupsen/logrus" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" ) func (n *RealOSNetworker) RenewDHCPLease() error { diff --git a/internal/local/lps.go b/internal/local/lps.go index 30c99c1e..fd792d86 100644 --- a/internal/local/lps.go +++ b/internal/local/lps.go @@ -7,11 +7,12 @@ package local import ( "net/url" - internalAMT "rpc/internal/amt" - "rpc/internal/config" - "rpc/internal/flags" - "rpc/internal/local/amt" - "rpc/pkg/utils" + + internalAMT "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/amt" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/config" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/local/amt" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" ) type OSNetworker interface { diff --git a/internal/local/lps_test.go b/internal/local/lps_test.go index 69615a40..89fd2ac3 100644 --- a/internal/local/lps_test.go +++ b/internal/local/lps_test.go @@ -9,12 +9,15 @@ import ( "encoding/xml" "errors" "net/http" - amt2 "rpc/internal/amt" - "rpc/internal/flags" - "rpc/pkg/utils" "testing" "time" + amt2 "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/amt" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + + "github.com/stretchr/testify/assert" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/authorization" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/ethernetport" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/general" @@ -34,7 +37,6 @@ import ( "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/hostbasedsetup" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/ieee8021x" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/optin" - "github.com/stretchr/testify/assert" ) type MockOSNetworker struct{} diff --git a/internal/local/mebx.go b/internal/local/mebx.go index 42d41536..030fb7bf 100644 --- a/internal/local/mebx.go +++ b/internal/local/mebx.go @@ -6,7 +6,7 @@ package local import ( - "rpc/pkg/utils" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" log "github.com/sirupsen/logrus" ) diff --git a/internal/local/mebx_test.go b/internal/local/mebx_test.go index 56e03596..ca1f92da 100644 --- a/internal/local/mebx_test.go +++ b/internal/local/mebx_test.go @@ -6,10 +6,11 @@ package local import ( - "rpc/internal/flags" - "rpc/pkg/utils" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/internal/local/opstate.go b/internal/local/opstate.go index 3b086e82..b963c019 100644 --- a/internal/local/opstate.go +++ b/internal/local/opstate.go @@ -6,8 +6,8 @@ package local import ( - "rpc/internal/flags" - "rpc/pkg/utils" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" log "github.com/sirupsen/logrus" ) diff --git a/internal/local/opstate_test.go b/internal/local/opstate_test.go index e3098392..102a4e00 100644 --- a/internal/local/opstate_test.go +++ b/internal/local/opstate_test.go @@ -7,11 +7,12 @@ package local import ( "errors" - "rpc/internal/amt" - "rpc/internal/flags" - "rpc/pkg/utils" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/amt" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/internal/local/time.go b/internal/local/time.go index 37d8471e..f44611e5 100644 --- a/internal/local/time.go +++ b/internal/local/time.go @@ -6,9 +6,10 @@ package local import ( - "rpc/pkg/utils" "time" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + log "github.com/sirupsen/logrus" ) diff --git a/internal/local/time_test.go b/internal/local/time_test.go index 96be3428..13bfd5fa 100644 --- a/internal/local/time_test.go +++ b/internal/local/time_test.go @@ -7,9 +7,10 @@ package local import ( "errors" - "rpc/internal/flags" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/stretchr/testify/assert" ) diff --git a/internal/local/tls.go b/internal/local/tls.go index cc3bc718..0a5a8c83 100644 --- a/internal/local/tls.go +++ b/internal/local/tls.go @@ -7,15 +7,17 @@ package local import ( "os" - "rpc/internal/certs" - "rpc/internal/flags" - "rpc/pkg/utils" "strings" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/certs" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + + log "github.com/sirupsen/logrus" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publickey" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publicprivate" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/tls" - log "github.com/sirupsen/logrus" ) const RemoteTLSInstanceId = `Intel(r) AMT 802.3 TLS Settings` diff --git a/internal/local/tls_test.go b/internal/local/tls_test.go index f995e1a9..1df9270a 100644 --- a/internal/local/tls_test.go +++ b/internal/local/tls_test.go @@ -10,15 +10,17 @@ import ( "fmt" "net/http" "net/http/httptest" - "rpc/internal/flags" - "rpc/pkg/utils" "strings" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + + "github.com/stretchr/testify/assert" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publickey" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publicprivate" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/tls" - "github.com/stretchr/testify/assert" ) func setupProvisioningService() (ProvisioningService, *MockAMT, *MockWSMAN) { diff --git a/internal/local/version.go b/internal/local/version.go index d964a134..675abfcb 100644 --- a/internal/local/version.go +++ b/internal/local/version.go @@ -8,8 +8,9 @@ package local import ( "encoding/json" "fmt" - "rpc/pkg/utils" "strings" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" ) type VersionInfo struct { diff --git a/internal/local/version_test.go b/internal/local/version_test.go index b220e820..2e1f3cc4 100644 --- a/internal/local/version_test.go +++ b/internal/local/version_test.go @@ -6,10 +6,11 @@ package local import ( - "rpc/internal/flags" - "rpc/pkg/utils" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/internal/local/wifi.go b/internal/local/wifi.go index 4beb82fb..52c67cdd 100644 --- a/internal/local/wifi.go +++ b/internal/local/wifi.go @@ -9,14 +9,16 @@ import ( "fmt" "os" "regexp" - "rpc/internal/config" - "rpc/pkg/utils" "time" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/config" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + + log "github.com/sirupsen/logrus" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/cim/models" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/cim/wifi" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/ieee8021x" - log "github.com/sirupsen/logrus" ) type Handles struct { diff --git a/internal/local/wifi_test.go b/internal/local/wifi_test.go index 4e45a407..95cb2a1f 100644 --- a/internal/local/wifi_test.go +++ b/internal/local/wifi_test.go @@ -10,12 +10,13 @@ import ( "errors" "net/http" "net/http/httptest" - "rpc/internal/config" - "rpc/internal/flags" - "rpc/pkg/utils" "strings" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/config" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/publickey" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/cim/wifi" "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/ieee8021x" diff --git a/internal/local/windows.go b/internal/local/windows.go index 9bf9e884..7315387d 100644 --- a/internal/local/windows.go +++ b/internal/local/windows.go @@ -9,7 +9,8 @@ package local import ( "os/exec" - "rpc/pkg/utils" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" log "github.com/sirupsen/logrus" ) diff --git a/internal/rps/executor.go b/internal/rps/executor.go index 883e172a..1278a360 100644 --- a/internal/rps/executor.go +++ b/internal/rps/executor.go @@ -7,12 +7,13 @@ package rps import ( "os" "os/signal" - "rpc/internal/flags" - "rpc/internal/lm" - "rpc/pkg/utils" "sync" "syscall" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/lm" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + log "github.com/sirupsen/logrus" ) diff --git a/internal/rps/message.go b/internal/rps/message.go index b5e93478..30eafdf3 100644 --- a/internal/rps/message.go +++ b/internal/rps/message.go @@ -8,12 +8,13 @@ import ( "encoding/base64" "encoding/json" "os" - "rpc/internal/amt" - "rpc/internal/flags" - "rpc/internal/local" - "rpc/pkg/utils" "time" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/amt" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/local" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + log "github.com/sirupsen/logrus" ) diff --git a/internal/rps/message_test.go b/internal/rps/message_test.go index abcc54aa..2f9bce92 100644 --- a/internal/rps/message_test.go +++ b/internal/rps/message_test.go @@ -8,12 +8,13 @@ import ( "encoding/base64" "encoding/json" "errors" - "rpc/internal/amt" - "rpc/internal/flags" - "rpc/pkg/utils" "testing" "time" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/amt" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/internal/rps/rps.go b/internal/rps/rps.go index e166d37a..6b00307d 100644 --- a/internal/rps/rps.go +++ b/internal/rps/rps.go @@ -10,8 +10,9 @@ import ( "encoding/json" "net/http" "net/url" - "rpc/internal/flags" - "rpc/pkg/utils" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" "github.com/gorilla/websocket" log "github.com/sirupsen/logrus" diff --git a/internal/rps/rps_test.go b/internal/rps/rps_test.go index 9e64df78..b07a0450 100644 --- a/internal/rps/rps_test.go +++ b/internal/rps/rps_test.go @@ -7,12 +7,13 @@ package rps import ( "net/http" "net/http/httptest" - "rpc/internal/flags" - "rpc/pkg/utils" "strings" "sync" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/internal/flags" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/gorilla/websocket" "github.com/stretchr/testify/assert" ) diff --git a/internal/smb/samba.go b/internal/smb/samba.go index 8dab640c..b3473c89 100644 --- a/internal/smb/samba.go +++ b/internal/smb/samba.go @@ -12,9 +12,10 @@ import ( netURL "net/url" "os" "os/user" - "rpc/pkg/utils" "strings" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/hirochachacha/go-smb2" log "github.com/sirupsen/logrus" ) diff --git a/internal/smb/samba_test.go b/internal/smb/samba_test.go index b6070455..8fd41826 100644 --- a/internal/smb/samba_test.go +++ b/internal/smb/samba_test.go @@ -8,9 +8,10 @@ package smb import ( "errors" "os/user" - "rpc/pkg/utils" "testing" + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/utils" + "github.com/stretchr/testify/assert" ) diff --git a/makefile b/makefile deleted file mode 100644 index 5e86cab5..00000000 --- a/makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - go build -o ./rpc ./cmd \ No newline at end of file diff --git a/pkg/heci/windows.go b/pkg/heci/windows.go index 824d8d9a..bc37fcf8 100644 --- a/pkg/heci/windows.go +++ b/pkg/heci/windows.go @@ -15,7 +15,7 @@ import ( "syscall" "unsafe" - setupapi "rpc/pkg/windows" + setupapi "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/windows" "golang.org/x/sys/windows" ) diff --git a/pkg/pthi/commands.go b/pkg/pthi/commands.go index df07a45a..9b7a5813 100644 --- a/pkg/pthi/commands.go +++ b/pkg/pthi/commands.go @@ -8,7 +8,8 @@ import ( "bytes" "encoding/binary" "errors" - "rpc/pkg/heci" + + "github.com/open-amt-cloud-toolkit/rpc-go/v2/pkg/heci" ) type Command struct { diff --git a/pkg/pthi/commands_test.go b/pkg/pthi/commands_test.go index eb3ff1c8..3e99e0d9 100644 --- a/pkg/pthi/commands_test.go +++ b/pkg/pthi/commands_test.go @@ -10,8 +10,9 @@ import ( "errors" "testing" - "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/apf" "github.com/stretchr/testify/assert" + + "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/apf" ) type MockHECICommands struct{} diff --git a/pkg/pthi/status_test.go b/pkg/pthi/status_test.go index 8a08f176..4b23e6ce 100644 --- a/pkg/pthi/status_test.go +++ b/pkg/pthi/status_test.go @@ -6,8 +6,9 @@ package pthi import ( - "github.com/stretchr/testify/assert" "testing" + + "github.com/stretchr/testify/assert" ) func TestAmtStatus_String(t *testing.T) {