fix: restore secrets fallback (#604)

Author: sbchaos

plugin/v1beta1/cli/client.go

@@ -105,6 +105,9 @@ func (m *GRPCClient) DefaultAssets(ctx context.Context, request models.DefaultAs
 }
 
 func (m *GRPCClient) CompileAssets(ctx context.Context, request models.CompileAssetsRequest) (*models.CompileAssetsResponse, error) {
+	_, span := base.Tracer.Start(ctx, "CompileAssets")
+	defer span.End()
+
 	var instanceData []*pb.InstanceSpecData
 	for _, inst := range request.InstanceData {
 		instanceData = append(instanceData, &pb.InstanceSpecData{

plugin/v1beta1/dependencyresolver/client.go

@@ -8,6 +8,7 @@ import (
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 	"google.golang.org/grpc/metadata"
 
+	v1 "github.com/odpf/optimus/api/handler/v1beta1"
 	pbp "github.com/odpf/optimus/api/proto/odpf/optimus/plugins/v1beta1"
 	"github.com/odpf/optimus/models"
 	"github.com/odpf/optimus/plugin/v1beta1/base"
@@ -46,6 +47,8 @@ func (m *GRPCClient) GenerateDestination(ctx context.Context, request models.Gen
 		Config:  cli.AdaptConfigsToProto(request.Config),
 		Assets:  cli.AdaptAssetsToProto(request.Assets),
 		Options: &pbp.PluginOptions{DryRun: request.DryRun},
+		// Fallback for secrets, please do not remove until secrets cleanup
+		Project: v1.ToProjectProtoWithSecret(request.Project, models.InstanceTypeTask, m.name),
 	}, grpc_retry.WithBackoff(grpc_retry.BackoffExponential(BackoffDuration)),
 		grpc_retry.WithMax(PluginGRPCMaxRetry))
 	if err != nil {
@@ -67,6 +70,8 @@ func (m *GRPCClient) GenerateDependencies(ctx context.Context, request models.Ge
 		Config:  cli.AdaptConfigsToProto(request.Config),
 		Assets:  cli.AdaptAssetsToProto(request.Assets),
 		Options: &pbp.PluginOptions{DryRun: request.DryRun},
+		// Fallback for secrets, please do not remove until secrets cleanup
+		Project: v1.ToProjectProtoWithSecret(request.Project, models.InstanceTypeTask, m.name),
 	}, grpc_retry.WithBackoff(grpc_retry.BackoffExponential(BackoffDuration)),
 		grpc_retry.WithMax(PluginGRPCMaxRetry))
 	if err != nil {

plugin/v1beta1/dependencyresolver/server.go

@@ -3,6 +3,7 @@ package dependencyresolver
 import (
 	"context"
 
+	v1 "github.com/odpf/optimus/api/handler/v1beta1"
 	pbp "github.com/odpf/optimus/api/proto/odpf/optimus/plugins/v1beta1"
 	"github.com/odpf/optimus/models"
 	"github.com/odpf/optimus/plugin/v1beta1/cli"
@@ -21,6 +22,8 @@ func (s *GRPCServer) GenerateDestination(ctx context.Context, req *pbp.GenerateD
 		Config:        cli.AdaptConfigsFromProto(req.Config),
 		Assets:        cli.AdaptAssetsFromProto(req.Assets),
 		PluginOptions: models.PluginOptions{DryRun: req.Options.DryRun},
+		// Fallback for secrets, please do not remove until secrets cleanup
+		Project: v1.FromProjectProtoWithSecrets(req.Project), // nolint:staticcheck
 	})
 	if err != nil {
 		return nil, err
@@ -33,6 +36,8 @@ func (s *GRPCServer) GenerateDependencies(ctx context.Context, req *pbp.Generate
 		Config:        cli.AdaptConfigsFromProto(req.Config),
 		Assets:        cli.AdaptAssetsFromProto(req.Assets),
 		PluginOptions: models.PluginOptions{DryRun: req.Options.DryRun},
+		// Fallback for secrets, please do not remove until secrets cleanup
+		Project: v1.FromProjectProtoWithSecrets(req.Project), // nolint:staticcheck
 	})
 	if err != nil {
 		return nil, err