refactor ServiceStatus struct to common package

SSHcom · Jul 25, 2023 · 49f5db3 · 49f5db3
1 parent 26c56db
commit 49f5db3
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 64 deletions.
diff --git a/api/auth/client.go b/api/auth/client.go
@@ -9,6 +9,7 @@ package auth
 import (
 	"net/url"
 
+	"github.com/SSHcom/privx-sdk-go/common"
 	"github.com/SSHcom/privx-sdk-go/restapi"
 )
 
@@ -24,8 +25,8 @@ func New(api restapi.Connector) *Auth {
 }
 
 // AuthStatus get microservice status
-func (store *Auth) AuthStatus() (*ServiceStatus, error) {
-	status := &ServiceStatus{}
+func (store *Auth) AuthStatus() (*common.ServiceStatus, error) {
+	status := &common.ServiceStatus{}
 
 	_, err := store.api.
 		URL("/auth/api/v1/status").

diff --git a/api/auth/model.go b/api/auth/model.go
@@ -8,12 +8,6 @@ package auth
 
 import "time"
 
-// KeyValue key value definition
-type KeyValue struct {
-	Key   string `json:"k"`
-	Value string `json:"v"`
-}
-
 // Params query params definition
 type Params struct {
 	Sortkey string `json:"sortkey,omitempty"`
@@ -22,19 +16,6 @@ type Params struct {
 	Limit   int    `json:"limit,omitempty"`
 }
 
-// ServiceStatus auth service status definition
-type ServiceStatus struct {
-	Variant       string     `json:"variant,omitempty"`
-	Version       string     `json:"version,omitempty"`
-	APIVersion    string     `json:"api_version,omitempty"`
-	Status        string     `json:"status,omitempty"`
-	StatusMessage string     `json:"status_message,omitempty"`
-	ApplicationID string     `json:"app_id,omitempty"`
-	ServerMode    string     `json:"server-mode,omitempty"`
-	StatusDetails []KeyValue `json:"status_details,omitempty"`
-	StartTime     time.Time  `json:"start_time,omitempty"`
-}
-
 // IDPClient idp client definition
 type IDPClient struct {
 	ID                             string            `json:"id"`

diff --git a/api/connectionmanager/client.go b/api/connectionmanager/client.go
@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"net/url"
 
+	"github.com/SSHcom/privx-sdk-go/common"
 	"github.com/SSHcom/privx-sdk-go/restapi"
 )
 
@@ -366,12 +367,12 @@ func (store *ConnectionManager) ConnectionCounts(timerange TimeRange) (Connectio
 }
 
 // UebaStatus Get Ueba service status
-func (store *ConnectionManager) UebaStatus() (ServiceStatus, error) {
-	uebaStatus := ServiceStatus{}
+func (store *ConnectionManager) UebaStatus() (*common.ServiceStatus, error) {
+	uebaStatus := &common.ServiceStatus{}
 
 	_, err := store.api.
 		URL("/connection-manager/api/v1/ueba/status").
-		Get(&uebaStatus)
+		Get(uebaStatus)
 
 	return uebaStatus, err
 }

diff --git a/api/connectionmanager/model.go b/api/connectionmanager/model.go
@@ -228,22 +228,3 @@ type UebaInternalStatus struct {
 	DatasetID           string                      `json:"dataset_id" validate:"uuid,omitempty"`
 	ModelInstanceStatus []UebaInternalModelInstance `json:"model_instance_status"`
 }
-
-// KeyValue key value definition
-type KeyValue struct {
-	Key   string `json:"k"`
-	Value string `json:"v"`
-}
-
-// ServiceStatus ueba service status definition
-type ServiceStatus struct {
-	Variant       string     `json:"variant,omitempty"`
-	Version       string     `json:"version"`
-	APIVersion    string     `json:"api_version"`
-	Status        string     `json:"status"`
-	StatusMessage string     `json:"status_message,omitempty"`
-	ApplicationID string     `json:"app_id,omitempty"`
-	ServerMode    string     `json:"server-mode,omitempty"`
-	StatusDetails []KeyValue `json:"status_details,omitempty"`
-	StartTime     time.Time  `json:"start_time"`
-}
diff --git a/api/dbproxy/client.go b/api/dbproxy/client.go
@@ -7,6 +7,7 @@
 package dbproxy
 
 import (
+	"github.com/SSHcom/privx-sdk-go/common"
 	"github.com/SSHcom/privx-sdk-go/restapi"
 )
 
@@ -22,8 +23,8 @@ func New(api restapi.Connector) *DbProxy {
 }
 
 // DbProxyStatus get microservice status
-func (store *DbProxy) DbProxyStatus() (*ServiceStatus, error) {
-	status := &ServiceStatus{}
+func (store *DbProxy) DbProxyStatus() (*common.ServiceStatus, error) {
+	status := &common.ServiceStatus{}
 
 	_, err := store.api.
 		URL("/db-proxy/api/v1/status").

diff --git a/api/dbproxy/model.go b/api/dbproxy/model.go
@@ -6,25 +6,6 @@
 
 package dbproxy
 
-import "time"
-
-// KeyValue key value definition
-type KeyValue struct {
-	Key   string `json:"k"`
-	Value string `json:"v"`
-}
-
-// ServiceStatus db proxy service status definition
-type ServiceStatus struct {
-	Version       string     `json:"version"`
-	APIVersion    string     `json:"api_version"`
-	Status        string     `json:"status"`
-	StatusMessage string     `json:"status_message,omitempty"`
-	ApplicationID string     `json:"app_id,omitempty"`
-	StatusDetails []KeyValue `json:"status_details,omitempty"`
-	StartTime     time.Time  `json:"start_time"`
-}
-
 // DBProxyCACertificateInfo DB proxy x509 CA certificate information
 type DBProxyCACertificateInfo struct {
 	Subject           string `json:"subject,omitempty"`

diff --git a/common/model.go b/common/model.go
@@ -0,0 +1,22 @@
+package common
+
+import "time"
+
+// KeyValue key value definition
+type KeyValue struct {
+	Key   string `json:"k"`
+	Value string `json:"v"`
+}
+
+// ServiceStatus service status definition
+type ServiceStatus struct {
+	Variant       string     `json:"variant,omitempty"`
+	Version       string     `json:"version,omitempty"`
+	APIVersion    string     `json:"api_version,omitempty"`
+	Status        string     `json:"status,omitempty"`
+	StatusMessage string     `json:"status_message,omitempty"`
+	ApplicationID string     `json:"app_id,omitempty"`
+	ServerMode    string     `json:"server-mode,omitempty"`
+	StatusDetails []KeyValue `json:"status_details,omitempty"`
+	StartTime     time.Time  `json:"start_time,omitempty"`
+}