move subs protos

wso2 · Jan 5, 2024 · c67f41c · c67f41c
1 parent ce1f429
commit c67f41c
Show file tree

Hide file tree

Showing 36 changed files with 1,845 additions and 100 deletions.
diff --git a/adapter/go.mod b/adapter/go.mod
@@ -88,6 +88,8 @@ require (
 
 replace github.com/wso2/apk/adapter => ../adapter
 
+replace github.com/wso2/apk/common-go-libs => ../common-go-libs
+
 require (
 	github.com/getkin/kin-openapi v0.107.0
 	github.com/ghodss/yaml v1.0.0

diff --git a/adapter/go.sum b/adapter/go.sum
@@ -170,8 +170,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/wso2/apk/common-go-libs v0.0.0-20231208100153-24bee7b4bd81 h1:Iobh0zi81XVNjC8dCckNWvr5VkpDwHlbJWq5jmOZtww=
-github.com/wso2/apk/common-go-libs v0.0.0-20231208100153-24bee7b4bd81/go.mod h1:fvkFU/8JJpx4Pem9srTjWmD3c89AKsyRpLyNPdQriDc=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=

diff --git a/adapter/pkg/discovery/protocol/cache/v3/resource.go b/adapter/pkg/discovery/protocol/cache/v3/resource.go
@@ -78,10 +78,6 @@ func GetResourceName(res envoy_types.Resource) string {
 		return "Config"
 	case *subscription.JWTIssuerList:
 		return "JWTIssuer"
-	case *subscription.Application:
-		return fmt.Sprint(v.Uuid)
-	case *subscription.Subscription:
-		return fmt.Sprint(v.Uuid)
 	case *subscription.JWTIssuer:
 		return fmt.Sprint(v.Name)
 	default:

diff --git a/common-controller/commoncontroller/common_controller.go b/common-controller/commoncontroller/common_controller.go
@@ -31,7 +31,6 @@ import (
 	discoveryv3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
 	envoy_cachev3 "github.com/envoyproxy/go-control-plane/pkg/cache/v3"
 	xdsv3 "github.com/envoyproxy/go-control-plane/pkg/server/v3"
-	apkmgt "github.com/wso2/apk/adapter/pkg/discovery/api/wso2/discovery/service/apkmgt"
 	"github.com/wso2/apk/adapter/pkg/health"
 	healthservice "github.com/wso2/apk/adapter/pkg/health/api/wso2/health/service"
 	"github.com/wso2/apk/adapter/pkg/logging"
@@ -41,6 +40,7 @@ import (
 	"github.com/wso2/apk/common-controller/internal/server"
 	utils "github.com/wso2/apk/common-controller/internal/utils"
 	xds "github.com/wso2/apk/common-controller/internal/xds"
+	apkmgt "github.com/wso2/apk/common-go-libs/pkg/discovery/api/wso2/discovery/service/apkmgt"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/keepalive"

diff --git a/common-controller/go.mod b/common-controller/go.mod
@@ -24,6 +24,8 @@ require (
 
 replace github.com/wso2/apk/adapter => ../adapter
 
+replace github.com/wso2/apk/common-go-libs => ../common-go-libs
+
 require (
 	github.com/bytedance/sonic v1.9.1 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
@@ -100,7 +102,7 @@ require (
 	google.golang.org/genproto v0.0.0-20230731193218-e0aa005b6bdf // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	google.golang.org/protobuf v1.31.0
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

diff --git a/common-controller/go.sum b/common-controller/go.sum
@@ -192,8 +192,6 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/wso2/apk/common-go-libs v0.0.0-20231208100153-24bee7b4bd81 h1:Iobh0zi81XVNjC8dCckNWvr5VkpDwHlbJWq5jmOZtww=
-github.com/wso2/apk/common-go-libs v0.0.0-20231208100153-24bee7b4bd81/go.mod h1:fvkFU/8JJpx4Pem9srTjWmD3c89AKsyRpLyNPdQriDc=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=

diff --git a/common-controller/internal/server/event_server.go b/common-controller/internal/server/event_server.go
@@ -1,9 +1,9 @@
 package server
 
 import (
-	apkmgt "github.com/wso2/apk/adapter/pkg/discovery/api/wso2/discovery/service/apkmgt"
 	"github.com/wso2/apk/common-controller/internal/loggers"
 	utils "github.com/wso2/apk/common-controller/internal/utils"
+	apkmgt "github.com/wso2/apk/common-go-libs/pkg/discovery/api/wso2/discovery/service/apkmgt"
 	"google.golang.org/grpc/metadata"
 )
 

diff --git a/common-controller/internal/utils/enforcer_connection_holder.go b/common-controller/internal/utils/enforcer_connection_holder.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	apkmgt "github.com/wso2/apk/adapter/pkg/discovery/api/wso2/discovery/service/apkmgt"
+	apkmgt "github.com/wso2/apk/common-go-libs/pkg/discovery/api/wso2/discovery/service/apkmgt"
 )
 
 var clientConnections = make(map[string]apkmgt.EventStreamService_StreamEventsServer)

diff --git a/common-controller/internal/utils/event_utils.go b/common-controller/internal/utils/event_utils.go
@@ -4,11 +4,11 @@ import (
 	time "time"
 
 	"github.com/google/uuid"
-	apkmgt "github.com/wso2/apk/adapter/pkg/discovery/api/wso2/discovery/service/apkmgt"
-	"github.com/wso2/apk/adapter/pkg/discovery/api/wso2/discovery/subscription"
 	"github.com/wso2/apk/common-controller/internal/loggers"
 	constants "github.com/wso2/apk/common-controller/internal/operator/constant"
 	cpv1alpha2 "github.com/wso2/apk/common-go-libs/apis/cp/v1alpha2"
+	apkmgt "github.com/wso2/apk/common-go-libs/pkg/discovery/api/wso2/discovery/service/apkmgt"
+	"github.com/wso2/apk/common-go-libs/pkg/discovery/api/wso2/discovery/subscription"
 )
 
 // SendAppDeletionEvent sends an application creation event to the enforcer

diff --git a/...o2/discovery/service/apkmgt/eventds.pb.go → ...o2/discovery/service/apkmgt/eventds.pb.go b/...o2/discovery/service/apkmgt/eventds.pb.go → ...o2/discovery/service/apkmgt/eventds.pb.go
diff --git a/.../discovery/subscription/application.pb.go → .../discovery/subscription/application.pb.go b/.../discovery/subscription/application.pb.go → .../discovery/subscription/application.pb.go
diff --git a/...ubscription/application_key_mapping.pb.go → ...ubscription/application_key_mapping.pb.go b/...ubscription/application_key_mapping.pb.go → ...ubscription/application_key_mapping.pb.go
diff --git a/...ery/subscription/applicationmapping.pb.go → ...ery/subscription/applicationmapping.pb.go b/...ery/subscription/applicationmapping.pb.go → ...ery/subscription/applicationmapping.pb.go
diff --git a/...i/wso2/discovery/subscription/event.pb.go → ...i/wso2/discovery/subscription/event.pb.go b/...i/wso2/discovery/subscription/event.pb.go → ...i/wso2/discovery/subscription/event.pb.go
diff --git a/...discovery/subscription/subscription.pb.go → ...discovery/subscription/subscription.pb.go b/...discovery/subscription/subscription.pb.go → ...discovery/subscription/subscription.pb.go