Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add toolregistry client as DeploymentService member #5228

Merged
merged 2 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions pkg/app/pipedv1/plugin/kubernetes/deployment/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,26 @@
"google.golang.org/grpc"
)

type toolRegistry interface {
InstallTool(ctx context.Context, name, version string) (path string, err error)
}

type DeploymentService struct {
deployment.UnimplementedDeploymentServiceServer

RegexPool *regexpool.Pool
Logger *zap.Logger
RegexPool *regexpool.Pool
Logger *zap.Logger
ToolRegistry toolRegistry
}

// NewDeploymentService creates a new planService.
func NewDeploymentService(
logger *zap.Logger,
) *DeploymentService {
return &DeploymentService{
RegexPool: regexpool.DefaultPool(),
Logger: logger.Named("planner"),
RegexPool: regexpool.DefaultPool(),
Logger: logger.Named("planner"),
ToolRegistry: nil, // TODO: set the tool registry

Check warning on line 47 in pkg/app/pipedv1/plugin/kubernetes/deployment/server.go

View check run for this annotation

Codecov / codecov/patch

pkg/app/pipedv1/plugin/kubernetes/deployment/server.go#L45-L47

Added lines #L45 - L47 were not covered by tests
}
}

Expand Down
38 changes: 38 additions & 0 deletions pkg/app/pipedv1/plugin/toolregistry/toolregistry.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Copyright 2024 The PipeCD Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package toolregistry

import (
"context"

"github.com/pipe-cd/pipecd/pkg/app/pipedv1/cmd/piped/service"
)

type ToolRegistry struct {
client service.PluginServiceClient
}

func (r *ToolRegistry) InstallTool(ctx context.Context, name, version string) (path string, err error) {
res, err := r.client.InstallTool(ctx, &service.InstallToolRequest{
Name: name,
Version: version,
})

if err != nil {
return "", err
}

Check warning on line 35 in pkg/app/pipedv1/plugin/toolregistry/toolregistry.go

View check run for this annotation

Codecov / codecov/patch

pkg/app/pipedv1/plugin/toolregistry/toolregistry.go#L27-L35

Added lines #L27 - L35 were not covered by tests

return res.GetInstalledPath(), nil

Check warning on line 37 in pkg/app/pipedv1/plugin/toolregistry/toolregistry.go

View check run for this annotation

Codecov / codecov/patch

pkg/app/pipedv1/plugin/toolregistry/toolregistry.go#L37

Added line #L37 was not covered by tests
}
Loading