move GetDomains function, return GetDomainsResponse

Signed-off-by: zychen5186 <[email protected]>

flyteadmin/pkg/manager/impl/project_manager.go

@@ -42,20 +42,6 @@ func (m *ProjectManager) CreateProject(ctx context.Context, request admin.Projec
 	return &admin.ProjectRegisterResponse{}, nil
 }
 
-func (m *ProjectManager) GetDomains(ctx context.Context, request admin.GetDomainRequest) *admin.Domains {
-	configDomains := m.config.ApplicationConfiguration().GetDomainsConfig()
-	var domains = make([]*admin.Domain, len(*configDomains))
-	for index, configDomain := range *configDomains {
-		domains[index] = &admin.Domain{
-			Id:   configDomain.ID,
-			Name: configDomain.Name,
-		}
-	}
-	return &admin.Domains{
-		Domains: domains,
-	}
-}
-
 func (m *ProjectManager) ListProjects(ctx context.Context, request admin.ProjectListRequest) (*admin.Projects, error) {
 	spec := util.FilterSpec{
 		RequestFilters: request.Filters,
@@ -141,6 +127,20 @@ func (m *ProjectManager) GetProject(ctx context.Context, request admin.ProjectGe
 	return &projectResponse, nil
 }
 
+func (m *ProjectManager) GetDomains(ctx context.Context, request admin.GetDomainRequest) *admin.GetDomainsResponse {
+	configDomains := m.config.ApplicationConfiguration().GetDomainsConfig()
+	var domains = make([]*admin.Domain, len(*configDomains))
+	for index, configDomain := range *configDomains {
+		domains[index] = &admin.Domain{
+			Id:   configDomain.ID,
+			Name: configDomain.Name,
+		}
+	}
+	return &admin.GetDomainsResponse{
+		Domains: domains,
+	}
+}
+
 func NewProjectManager(db repoInterfaces.Repository, config runtimeInterfaces.Configuration) interfaces.ProjectInterface {
 	return &ProjectManager{
 		db:     db,

flyteadmin/pkg/manager/interfaces/project.go

@@ -8,9 +8,9 @@ import (
 
 // Interface for managing projects (and domains).
 type ProjectInterface interface {
-	GetDomains(ctx context.Context, request admin.GetDomainRequest) *admin.Domains
 	CreateProject(ctx context.Context, request admin.ProjectRegisterRequest) (*admin.ProjectRegisterResponse, error)
 	ListProjects(ctx context.Context, request admin.ProjectListRequest) (*admin.Projects, error)
 	UpdateProject(ctx context.Context, request admin.Project) (*admin.ProjectUpdateResponse, error)
 	GetProject(ctx context.Context, request admin.ProjectGetRequest) (*admin.Project, error)
+	GetDomains(ctx context.Context, request admin.GetDomainRequest) *admin.GetDomainsResponse
 }

flyteadmin/pkg/manager/mocks/project.go

@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-type GetDomainsFunc func(ctx context.Context, request admin.GetDomainRequest) *admin.Domains
+type GetDomainsFunc func(ctx context.Context, request admin.GetDomainRequest) *admin.GetDomainsResponse
 type CreateProjectFunc func(ctx context.Context, request admin.ProjectRegisterRequest) (*admin.ProjectRegisterResponse, error)
 type ListProjectFunc func(ctx context.Context, request admin.ProjectListRequest) (*admin.Projects, error)
 type UpdateProjectFunc func(ctx context.Context, request admin.Project) (*admin.ProjectUpdateResponse, error)
@@ -24,7 +24,7 @@ func (m *MockProjectManager) SetCreateProject(createProjectFunc CreateProjectFun
 	m.createProjectFunc = createProjectFunc
 }
 
-func (m *MockProjectManager) GetDomains(ctx context.Context, request admin.GetDomainRequest) *admin.Domains {
+func (m *MockProjectManager) GetDomains(ctx context.Context, request admin.GetDomainRequest) *admin.GetDomainsResponse {
 	if m.getDomainsFunc != nil {
 		return m.getDomainsFunc(ctx, request)
 	}

flyteadmin/pkg/rpc/adminservice/project.go

@@ -28,12 +28,12 @@ func (m *AdminService) RegisterProject(ctx context.Context, request *admin.Proje
 	return response, nil
 }
 
-func (m *AdminService) GetDomains(ctx context.Context, request *admin.GetDomainRequest) (*admin.Domains, error) {
+func (m *AdminService) GetDomains(ctx context.Context, request *admin.GetDomainRequest) (*admin.GetDomainsResponse, error) {
 	defer m.interceptPanic(ctx, request)
 	if request == nil {
 		return nil, status.Errorf(codes.InvalidArgument, "Incorrect request, nil requests not allowed")
 	}
-	var response *admin.Domains
+	var response *admin.GetDomainsResponse
 	m.Metrics.domainEndpointMetrics.get.Time(func() {
 		response = m.ProjectManager.GetDomains(ctx, *request)
 	})