resolve part of test issues

pluralsh · Oct 20, 2023 · 92ab293 · 92ab293
1 parent bf9c207
commit 92ab293
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 1,952 deletions.
diff --git a/cmd/agentk/agentkapp/api_test.go b/cmd/agentk/agentkapp/api_test.go
diff --git a/cmd/kas/kasapp/agent_rpc_api_test.go b/cmd/kas/kasapp/agent_rpc_api_test.go
@@ -10,13 +10,11 @@ import (
 	"github.com/getsentry/sentry-go"
 	"github.com/stretchr/testify/assert"
 	"gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/internal/api"
-	gapi "gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/internal/gitlab/api"
 	"gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/internal/module/modserver"
 	"gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/internal/module/modshared"
 	"gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/internal/tool/cache"
 	"gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/internal/tool/errz"
 	"gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/internal/tool/testing/mock_cache"
-	"gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/internal/tool/testing/mock_gitlab"
 	"gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/internal/tool/testing/testhelpers"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/mock/gomock"
@@ -133,10 +131,6 @@ func setupAgentRpcApi(t *testing.T, statusCode int) (context.Context, *zap.Logge
 	hub := NewMockSentryHub(ctrl)
 	errCacher := mock_cache.NewMockErrCacher[api.AgentToken](ctrl)
 	ctx, traceId := testhelpers.CtxWithSpanContext(t)
-	gitLabClient := mock_gitlab.SetupClient(t, gapi.AgentInfoApiPath, func(w http.ResponseWriter, r *http.Request) {
-		testhelpers.AssertGetJsonRequestIsCorrect(t, r, traceId)
-		w.WriteHeader(statusCode)
-	})
 	sra := &serverRpcApi{
 		RpcApiStub: modshared.RpcApiStub{
 			Logger:    log,
@@ -150,9 +144,8 @@ func setupAgentRpcApi(t *testing.T, statusCode int) (context.Context, *zap.Logge
 	sra.sentryHub = hub
 
 	rpcApi := &serverAgentRpcApi{
-		RpcApi:       sra,
-		Token:        testhelpers.AgentkToken,
-		GitLabClient: gitLabClient,
+		RpcApi: sra,
+		Token:  testhelpers.AgentkToken,
 		AgentInfoCache: cache.NewWithError[api.AgentToken, *api.AgentInfo](0, 0, errCacher,
 			trace.NewNoopTracerProvider().Tracer(kasTracerName),
 			func(err error) bool { return false }), // no cache!