Rename module to allow running go install

open-amt-cloud-toolkit · Jan 14, 2025 · 0792aed · 0792aed
1 parent fdf3d38
commit 0792aed
Show file tree

Hide file tree

Showing 68 changed files with 219 additions and 141 deletions.
diff --git a/cmd/lib.go → cmd/rpc/lib.go b/cmd/lib.go → 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 → cmd/rpc/main.go b/cmd/main.go → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {