Merge pull request #479 from kube-tarian/kad-agent-dep-remove

Removed the dependancy on kad-agent internal package
kube-tarian · May 3, 2024 · bb3e734 · bb3e734
2 parents 9de1981 + 19b03ef
commit bb3e734
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/server/cmd/server/main.go b/server/cmd/server/main.go
@@ -10,7 +10,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 
-	"github.com/kube-tarian/kad/agent/pkg/logging"
+	"github.com/intelops/go-common/logging"
 	rpcapi "github.com/kube-tarian/kad/server/pkg/api"
 	"github.com/kube-tarian/kad/server/pkg/config"
 	iamclient "github.com/kube-tarian/kad/server/pkg/iam-client"

diff --git a/server/go.mod b/server/go.mod
@@ -9,7 +9,6 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1
 	github.com/intelops/go-common v1.0.20
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/kube-tarian/kad/agent v0.0.0-20221228201013-ed4f78e4b887
 	github.com/ory/client-go v1.1.49
 	github.com/pkg/errors v0.9.1
 	github.com/stargate/stargate-grpc-go-client v0.0.0-20220822130422-9a1c6261d4fa

diff --git a/server/go.sum b/server/go.sum
@@ -132,8 +132,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kube-tarian/kad/agent v0.0.0-20221228201013-ed4f78e4b887 h1:FeRTK1MtRnXVBuemQW+ZKCU1G2qrhJiL55Q5XJQvAYk=
-github.com/kube-tarian/kad/agent v0.0.0-20221228201013-ed4f78e4b887/go.mod h1:0I3LQVfFvWhsX+8J2TpHAfiIL+SY0lXZT5V6FvhrJLk=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=

diff --git a/server/pkg/agent/client.go b/server/pkg/agent/client.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kube-tarian/kad/agent/pkg/logging"
+	"github.com/intelops/go-common/logging"
 	"github.com/kube-tarian/kad/server/pkg/pb/agentpb"
 	"github.com/kube-tarian/kad/server/pkg/pb/captenpluginspb"
 	"github.com/kube-tarian/kad/server/pkg/pb/clusterpluginspb"

diff --git a/server/pkg/api/server.go b/server/pkg/api/server.go
@@ -5,7 +5,7 @@ import (
 	"encoding/base64"
 	"sync"
 
-	"github.com/kube-tarian/kad/agent/pkg/logging"
+	"github.com/intelops/go-common/logging"
 	"github.com/kube-tarian/kad/server/pkg/agent"
 	"github.com/kube-tarian/kad/server/pkg/config"
 	iamclient "github.com/kube-tarian/kad/server/pkg/iam-client"