Skip to content

Revert "Revert "Add feature to show piped config on web console (#3673)"" #3722

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.

Sign up for GitHub

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

Merged
khanhtc1202 merged 1 commit into from
Jun 3, 2022
Merged

Revert "Revert "Add feature to show piped config on web console (#3673)"" #3722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 13 additions & 1 deletion pkg/app/piped/cmd/piped/piped.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
"golang.org/x/sync/errgroup"
secretmanagerpb "google.golang.org/genproto/googleapis/cloud/secretmanager/v1"
"google.golang.org/grpc/credentials"
"sigs.k8s.io/yaml"

"github.com/pipe-cd/pipecd/pkg/admin"
"github.com/pipe-cd/pipecd/pkg/app/piped/apistore/analysisresultstore"
Expand Down Expand Up @@ -624,14 +625,25 @@ func (p *piped) sendPipedMeta(ctx context.Context, client pipedservice.Client, c
})
}

cloneCfg, err := cfg.Clone()
if err != nil {
return err
}

cloneCfg.Mask()
maskedCfg, err := yaml.Marshal(cloneCfg)
if err != nil {
return err
}

var (
req = &pipedservice.ReportPipedMetaRequest{
Version: version.Get().Version,
Config: string(maskedCfg),
Repositories: repos,
CloudProviders: make([]*model.Piped_CloudProvider, 0, len(cfg.CloudProviders)),
}
retry = pipedservice.NewRetry(5)
err error
)

// Configure the list of specified cloud providers.
Expand Down
3 changes: 2 additions & 1 deletion pkg/app/server/grpcapi/piped_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ type pipedApiDeploymentChainStore interface {

type pipedApiPipedStore interface {
Get(ctx context.Context, id string) (*model.Piped, error)
UpdateMetadata(ctx context.Context, id, version string, cps []*model.Piped_CloudProvider, repos []*model.ApplicationGitRepository, se *model.Piped_SecretEncryption, startedAt int64) error
UpdateMetadata(ctx context.Context, id, version, config string, cps []*model.Piped_CloudProvider, repos []*model.ApplicationGitRepository, se *model.Piped_SecretEncryption, startedAt int64) error
}

type pipedApiEventStore interface {
Expand Down Expand Up @@ -175,6 +175,7 @@ func (a *PipedAPI) ReportPipedMeta(ctx context.Context, req *pipedservice.Report
ctx,
pipedID,
req.Version,
req.Config,
req.CloudProviders,
req.Repositories,
req.SecretEncryption,
Expand Down
1,540 changes: 775 additions & 765 deletions pkg/app/server/service/pipedservice/service.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/app/server/service/pipedservice/service.pb.validate.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkg/app/server/service/pipedservice/service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ message ReportPipedMetaRequest {
repeated model.Piped.CloudProvider cloud_providers = 2;
repeated model.ApplicationGitRepository repositories = 3;
model.Piped.SecretEncryption secret_encryption = 4;
string config = 5;
}

message ReportPipedMetaResponse {
Expand Down
Loading