feat(web): specify pipeline target branch

.github/workflows/deploy_external.yaml

@@ -5,7 +5,7 @@ on:
     workflows:
       - 'product_builder'
     branches:
-      - 'develop'
+      - 'feat/release-candidate'
     types:
       - completed
 permissions:

.github/workflows/product_builder.yaml

@@ -69,9 +69,9 @@ jobs:
       crux: ${{ steps.filter.outputs.crux }}
       cruxui: ${{ steps.filter.outputs.cruxui }}
       kratos: ${{ steps.filter.outputs.kratos }}
-      tag: ${{ steps.settag.outputs.tag }}
+      tag: "0.15.0-rc" # ${{ steps.settag.outputs.tag }}
       extratag: ${{ steps.settag.outputs.extratag }}
-      version: ${{ steps.settag.outputs.version }}
+      version: "0.15.0-rc" # ${{ steps.settag.outputs.version }}
       minorversion: ${{ steps.settag.outputs.minorversion }}
       release: ${{ steps.release.outputs.release }}
     steps:
@@ -669,11 +669,10 @@ jobs:
     defaults:
       run:
         working-directory: ${{ env.GOLANG_WORKING_DIRECTORY }}
-    needs: [gather_changes, e2e]
+    needs: [gather_changes, go_build]
     if: |
       always() &&
       (github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_type == 'tag') &&
-      needs.e2e.result == 'success' &&
       needs.go_build.result == 'success' &&
       (needs.crux_build.result == 'success' || needs.crux_build.result == 'skipped') &&
       (needs.crux-ui_build.result == 'success' || needs.crux-ui_build.result == 'skipped') &&
@@ -735,16 +734,16 @@ jobs:
     container:
       image: ghcr.io/dyrector-io/dyrectorio/builder-images/signer:2
     needs: [gather_changes, go_push]
-    if: |
-      always() &&
-      (github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_type == 'tag') &&
-      needs.e2e.result == 'success' &&
-      needs.go_build.result == 'success' &&
-      (needs.crux_build.result == 'success' || needs.crux_build.result == 'skipped') &&
-      (needs.crux-ui_build.result == 'success' || needs.crux-ui_build.result == 'skipped') &&
-      (needs.kratos_build.result == 'success' || needs.kratos_build.result == 'skipped') &&
-      needs.conventional_commits.result == 'success' &&
-      needs.gather_changes.result == 'success' && needs.go_push.result == 'success'
+    # if: |
+    #   always() &&
+    #   (github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_type == 'tag') &&
+    #   needs.e2e.result == 'success' &&
+    #   needs.go_build.result == 'success' &&
+    #   (needs.crux_build.result == 'success' || needs.crux_build.result == 'skipped') &&
+    #   (needs.crux-ui_build.result == 'success' || needs.crux-ui_build.result == 'skipped') &&
+    #   (needs.kratos_build.result == 'success' || needs.kratos_build.result == 'skipped') &&
+    #   needs.conventional_commits.result == 'success' &&
+    #   needs.gather_changes.result == 'success' && needs.go_push.result == 'success'
     environment: Workflow - Protected
     steps:
       - name: Login to GHCR
@@ -800,11 +799,10 @@ jobs:
     runs-on: ubuntu-22.04
     container:
       image: ghcr.io/dyrector-io/dyrectorio/builder-images/signer:2
-    needs: [crux_build, e2e, gather_changes]
+    needs: [crux_build, gather_changes]
     if: |
       always() &&
       (github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_type == 'tag') &&
-      needs.e2e.result == 'success' &&
       (needs.go_build.result == 'success' || needs.go_build.result == 'skipped') &&
       needs.crux_build.result == 'success' &&
       (needs.crux-ui_build.result == 'success' || needs.crux-ui_build.result == 'skipped') &&
@@ -863,11 +861,10 @@ jobs:
     runs-on: ubuntu-22.04
     container:
       image: ghcr.io/dyrector-io/dyrectorio/builder-images/signer:2
-    needs: [crux-ui_build, e2e, gather_changes]
+    needs: [crux-ui_build, gather_changes]
     if: |
       always() &&
       (github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_type == 'tag') &&
-      needs.e2e.result == 'success' &&
       (needs.go_build.result == 'success' || needs.go_build.result == 'skipped') &&
       (needs.crux_build.result == 'success' || needs.crux_build.result == 'skipped') &&
       needs.crux-ui_build.result == 'success' &&
@@ -926,11 +923,10 @@ jobs:
     runs-on: ubuntu-22.04
     container:
       image: ghcr.io/dyrector-io/dyrectorio/builder-images/signer:2
-    needs: [kratos_build, e2e, gather_changes]
+    needs: [kratos_build, gather_changes]
     if: |
       always() &&
       (github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_type == 'tag') &&
-      needs.e2e.result == 'success' &&
       (needs.go_build.result == 'success' || needs.go_build.result == 'skipped') &&
       (needs.crux_build.result == 'success' || needs.crux_build.result == 'skipped') &&
       (needs.crux-ui_build.result == 'success' || needs.crux-ui_build.result == 'skipped') &&

golang/internal/grpc/grpc.go

@@ -78,6 +78,7 @@ type ClientLoop struct {
 
 type (
 	DeployFunc               func(context.Context, *dogger.DeploymentLogger, *v1.DeployImageRequest, *v1.VersionData) error
+	DeploySharedSecretsFunc  func(context.Context, string, map[string]string) error
 	WatchContainerStatusFunc func(context.Context, string, bool) (*ContainerStatusStream, error)
 	DeleteFunc               func(context.Context, string, string) error
 	SecretListFunc           func(context.Context, string, string) ([]string, error)
@@ -94,6 +95,7 @@ type (
 
 type WorkerFunctions struct {
 	Deploy               DeployFunc
+	DeploySharedSecrets  DeploySharedSecretsFunc
 	WatchContainerStatus WatchContainerStatusFunc
 	Delete               DeleteFunc
 	SecretList           SecretListFunc
@@ -186,7 +188,13 @@ func fetchCertificatesFromURL(ctx context.Context, addr string) (*x509.CertPool,
 func (cl *ClientLoop) grpcProcessCommand(command *agent.AgentCommand) {
 	switch {
 	case command.GetDeploy() != nil:
-		go executeVersionDeployRequest(cl.Ctx, command.GetDeploy(), cl.WorkerFuncs.Deploy, cl.AppConfig)
+		go executeDeployRequest(
+			cl.Ctx,
+			command.GetDeploy(),
+			cl.WorkerFuncs.Deploy,
+			cl.WorkerFuncs.DeploySharedSecrets,
+			cl.AppConfig,
+		)
 	case command.GetContainerState() != nil:
 		go executeWatchContainerStatus(cl.Ctx, command.GetContainerState(), cl.WorkerFuncs.WatchContainerStatus)
 	case command.GetContainerDelete() != nil:
@@ -455,9 +463,9 @@ func (cl *ClientLoop) handleGrpcTokenError(err error, token *config.ValidJWT) {
 	}
 }
 
-func executeVersionDeployRequest(
-	ctx context.Context, req *agent.VersionDeployRequest,
-	deploy DeployFunc, appConfig *config.CommonConfiguration,
+func executeDeployRequest(
+	ctx context.Context, req *agent.DeployRequest,
+	deploy DeployFunc, deploySecrets DeploySharedSecretsFunc, appConfig *config.CommonConfiguration,
 ) {
 	if deploy == nil {
 		log.Error().Msg("Deploy function not implemented")
@@ -486,10 +494,27 @@ func executeVersionDeployRequest(
 		return
 	}
 
-	failed := false
-	var deployStatus common.DeploymentStatus
+	deployStatus := common.DeploymentStatus_FAILED
+	defer func() {
+		dog.WriteDeploymentStatus(deployStatus)
+
+		err = statusStream.CloseSend()
+		if err != nil {
+			log.Error().Stack().Err(err).Str("deployment", req.Id).Msg("Status close error")
+		}
+	}()
+
+	if len(req.Secrets) > 0 {
+		dog.WriteInfo("Deploying secrets")
+		err = deploySecrets(ctx, req.Prefix, req.Secrets)
+		if err != nil {
+			dog.WriteError(err.Error())
+			return
+		}
+	}
+
 	for i := range req.Requests {
-		imageReq := mapper.MapDeployImage(req.Requests[i], appConfig)
+		imageReq := mapper.MapDeployImage(req.Prefix, req.Requests[i], appConfig)
 		dog.SetRequestID(imageReq.RequestID)
 
 		var versionData *v1.VersionData
@@ -498,24 +523,12 @@ func executeVersionDeployRequest(
 		}
 
 		if err = deploy(ctx, dog, imageReq, versionData); err != nil {
-			failed = true
 			dog.WriteError(err.Error())
+			return
 		}
 	}
 
-	if failed {
-		deployStatus = common.DeploymentStatus_FAILED
-	} else {
-		deployStatus = common.DeploymentStatus_SUCCESSFUL
-	}
-
-	dog.WriteDeploymentStatus(deployStatus)
-
-	err = statusStream.CloseSend()
-	if err != nil {
-		log.Error().Stack().Err(err).Str("deployment", req.Id).Msg("Status close error")
-		return
-	}
+	deployStatus = common.DeploymentStatus_SUCCESSFUL
 }
 
 func streamContainerStatus(
@@ -636,13 +649,10 @@ func executeDeleteMultipleContainers(
 	req *common.DeleteContainersRequest,
 	deleteFn DeleteContainersFunc,
 ) *AgentGrpcError {
-	var prefix, name string
-	if req.GetContainer() != nil {
-		prefix = req.GetContainer().Prefix
-		name = req.GetContainer().Name
-	} else {
-		prefix = req.GetPrefix()
-		name = ""
+	prefix, name, err := mapper.MapContainerOrPrefixToPrefixName(req.Target)
+	if err != nil {
+		log.Error().Err(err).Msg("Failed to delete multiple containers")
+		return agentError(ctx, err)
 	}
 
 	ctx = metadata.AppendToOutgoingContext(ctx, "dyo-container-prefix", prefix, "dyo-container-name", name)
@@ -653,7 +663,7 @@ func executeDeleteMultipleContainers(
 
 	log.Info().Msg("Deleting multiple containers")
 
-	err := deleteFn(ctx, req)
+	err = deleteFn(ctx, req)
 	if err != nil {
 		log.Error().Stack().Err(err).Msg("Failed to delete multiple containers")
 		return agentError(ctx, err)
@@ -741,8 +751,15 @@ func executeSecretList(
 	listFunc SecretListFunc,
 	appConfig *config.CommonConfiguration,
 ) *AgentGrpcError {
-	prefix := command.Container.Prefix
-	name := command.Container.Name
+	var prefix string
+	name := ""
+
+	if command.Target.GetContainer() != nil {
+		prefix = command.Target.GetContainer().Prefix
+		name = command.Target.GetContainer().Name
+	} else {
+		prefix = command.Target.GetPrefix()
+	}
 
 	ctx = metadata.AppendToOutgoingContext(ctx, "dyo-container-prefix", prefix, "dyo-container-name", name)
 
@@ -765,10 +782,8 @@ func executeSecretList(
 	}
 
 	resp := &common.ListSecretsResponse{
-		Prefix:    prefix,
-		Name:      name,
+		Target:    command.Target,
 		PublicKey: publicKey,
-		HasKeys:   keys != nil,
 		Keys:      keys,
 	}
 

golang/internal/mapper/grpc.go

@@ -1,6 +1,7 @@
 package mapper
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -25,33 +26,18 @@ import (
 	corev1 "k8s.io/api/core/v1"
 )
 
-func mapInstanceConfig(in *agent.InstanceConfig) v1.InstanceConfig {
-	instanceConfig := v1.InstanceConfig{
-		ContainerPreName:  in.Prefix,
-		Name:              in.Prefix,
-		SharedEnvironment: map[string]string{},
-	}
-
-	if in.RepositoryPrefix != nil {
-		instanceConfig.RepositoryPreName = *in.RepositoryPrefix
-	}
-
-	if in.MountPath != nil {
-		instanceConfig.MountPath = *in.MountPath
-	}
+var ErrNoTargetContainerOrPrefix = errors.New("no target container or prefix")
 
-	if in.Environment != nil {
-		instanceConfig.Environment = in.Environment
-	}
-
-	return instanceConfig
-}
-
-func MapDeployImage(req *agent.DeployRequest, appConfig *config.CommonConfiguration) *v1.DeployImageRequest {
+func MapDeployImage(prefix string, req *agent.DeployWorkloadRequest, appConfig *config.CommonConfiguration) *v1.DeployImageRequest {
 	res := &v1.DeployImageRequest{
-		RequestID:       req.Id,
-		InstanceConfig:  mapInstanceConfig(req.InstanceConfig),
-		ContainerConfig: mapContainerConfig(req),
+		RequestID: req.Id,
+		InstanceConfig: v1.InstanceConfig{
+			UseSharedEnvs:     false,
+			Environment:       map[string]string{},
+			SharedEnvironment: map[string]string{},
+			ContainerPreName:  prefix,
+		},
+		ContainerConfig: mapContainerConfig(prefix, req),
 		ImageName:       req.ImageName,
 		Tag:             req.Tag,
 		Registry:        req.Registry,
@@ -68,22 +54,18 @@ func MapDeployImage(req *agent.DeployRequest, appConfig *config.CommonConfigurat
 
 	v1.SetDeploymentDefaults(res, appConfig)
 
-	if req.RuntimeConfig != nil {
-		res.RuntimeConfig = v1.Base64JSONBytes(*req.RuntimeConfig)
-	}
-
 	if req.Registry != nil {
 		res.Registry = req.Registry
 	}
 	return res
 }
 
-func mapContainerConfig(in *agent.DeployRequest) v1.ContainerConfig {
+func mapContainerConfig(prefix string, in *agent.DeployWorkloadRequest) v1.ContainerConfig {
 	cc := in.Common
 
 	containerConfig := v1.ContainerConfig{
 		Container:        cc.Name,
-		ContainerPreName: in.InstanceConfig.Prefix,
+		ContainerPreName: prefix,
 		Ports:            MapPorts(cc.Ports),
 		PortRanges:       mapPortRanges(cc.PortRanges),
 		Volumes:          mapVolumes(cc.Volumes),
@@ -692,3 +674,19 @@ func MapDockerContainerEventToContainerState(event string) common.ContainerState
 		return common.ContainerState_CONTAINER_STATE_UNSPECIFIED
 	}
 }
+
+func MapContainerOrPrefixToPrefixName(target *common.ContainerOrPrefix) (prefix, name string, err error) {
+	if target == nil {
+		return "", "", ErrNoTargetContainerOrPrefix
+	}
+
+	if target.GetContainer() != nil {
+		return target.GetContainer().GetPrefix(), target.GetContainer().Name, nil
+	}
+
+	if target.GetPrefix() == "" {
+		return "", "", ErrNoTargetContainerOrPrefix
+	}
+
+	return target.GetPrefix(), "", nil
+}