upd

castai · Sep 16, 2024 · fda8890 · fda8890
1 parent 379475e
commit fda8890
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 12 deletions.
diff --git a/e2e/setup.go b/e2e/setup.go
@@ -9,9 +9,9 @@ import (
 	"net/http"
 
 	"cloud-proxy/internal/e2etest"
+	cloudproxyv1alpha "cloud-proxy/proto/gen/proto/v1alpha"
 	compute "cloud.google.com/go/compute/apiv1"
 	container "cloud.google.com/go/container/apiv1"
-	cloudproxyv1alpha "github.com/castai/cloud-proxy/proto/gen/proto/v1alpha"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/api/option"
 	"google.golang.org/grpc"

diff --git a/go.mod b/go.mod
@@ -5,7 +5,6 @@ go 1.23.1
 require (
 	cloud.google.com/go/compute v1.28.0
 	cloud.google.com/go/container v1.39.0
-	github.com/castai/cloud-proxy v0.0.0-00010101000000-000000000000
 	github.com/golang/mock v1.6.0
 	github.com/google/uuid v1.6.0
 	github.com/samber/lo v1.47.0
@@ -64,5 +63,3 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace github.com/castai/cloud-proxy => ./
diff --git a/internal/castai/dummy/mock_cast.go b/internal/castai/dummy/mock_cast.go
@@ -1,8 +1,8 @@
 package dummy
 
 import (
+	cloudproxyv1alpha "cloud-proxy/proto/gen/proto/v1alpha"
 	"fmt"
-	cloudproxyv1alpha "github.com/castai/cloud-proxy/proto/gen/proto/v1alpha"
 	"io"
 	"log"
 	"net"

diff --git a/internal/e2etest/dispatcher.go b/internal/e2etest/dispatcher.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"sync"
 
-	cloudproxyv1alpha "github.com/castai/cloud-proxy/proto/gen/proto/v1alpha"
+	cloudproxyv1alpha "cloud-proxy/proto/gen/proto/v1alpha"
 )
 
 type Dispatcher struct {

diff --git a/internal/e2etest/roundtripper.go b/internal/e2etest/roundtripper.go
@@ -2,8 +2,8 @@ package e2etest
 
 import (
 	"bytes"
+	cloudproxyv1alpha "cloud-proxy/proto/gen/proto/v1alpha"
 	"fmt"
-	cloudproxyv1alpha "github.com/castai/cloud-proxy/proto/gen/proto/v1alpha"
 	"io"
 	"log"
 	"net/http"

diff --git a/internal/proxy/client.go b/internal/proxy/client.go
@@ -1,13 +1,13 @@
 //go:generate mockgen -package=mock_proxy -source $GOFILE -destination mock/$GOFILE .
-//go:generate mockgen -package=mock_proxy -destination mock/stream.go github.com/castai/cloud-proxy/proto/gen/proto/v1alpha CloudProxyAPI_StreamCloudProxyClient
+//go:generate mockgen -package=mock_proxy -destination mock/stream.go cloud-proxy/proto/gen/proto/v1alpha CloudProxyAPI_StreamCloudProxyClient
 
 package proxy
 
 import (
 	"bytes"
+	cloudproxyv1alpha "cloud-proxy/proto/gen/proto/v1alpha"
 	"context"
 	"fmt"
-	cloudproxyv1alpha "github.com/castai/cloud-proxy/proto/gen/proto/v1alpha"
 	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"

diff --git a/internal/proxy/client_test.go b/internal/proxy/client_test.go
@@ -3,9 +3,9 @@ package proxy
 import (
 	"bytes"
 	mock_proxy "cloud-proxy/internal/proxy/mock"
+	cloudproxyv1alpha "cloud-proxy/proto/gen/proto/v1alpha"
 	"context"
 	"fmt"
-	cloudproxyv1alpha "github.com/castai/cloud-proxy/proto/gen/proto/v1alpha"
 	"github.com/golang/mock/gomock"
 	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
@@ -457,6 +457,7 @@ func TestClient_run(t *testing.T) {
 				},
 			},
 			wantLastSeenUpdated: true,
+			wantErr:             true,
 		},
 	}
 	for _, tt := range tests {

diff --git a/internal/proxy/mock/stream.go b/internal/proxy/mock/stream.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"log"
     	"sync"
-    	cloudproxyv1alpha "github.com/castai/cloud-proxy/proto/gen/proto/v1alpha"
+    	cloudproxyv1alpha "cloud-proxy/proto/gen/proto/v1alpha"
     )
     type Dispatcher struct {
@@ Expand Down @@