Skip to content

fix: use service instead of repo to get encrypted pod envs #100

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
axadrn merged 1 commit into from
Dec 27, 2025
Merged

fix: use service instead of repo to get encrypted pod envs #100

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
2 changes: 1 addition & 1 deletion internal/server/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func New(cfg *config.Config) (*App, error) {
podEnvVarService := service.NewPodEnvVarService(podEnvVarRepo, encryptor)
podDomainService := service.NewPodDomainService(podDomainRepo)
gitTokenService := service.NewGitTokenService(gitTokenRepo, encryptor)
deployService := service.NewDeployService(podRepo, podDomainRepo, podEnvVarRepo, gitTokenService, dockerService)
deployService := service.NewDeployService(podRepo, podDomainRepo, podEnvVarService, gitTokenService, dockerService)
traefikService := service.NewTraefikService(serverSettingsRepo, cfg.TraefikConfigDir, cfg.IsDevelopment())

return &App{
Expand Down
34 changes: 17 additions & 17 deletions internal/server/service/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
)

type DeployService struct {
podRepo repo.PodRepoInterface
podDomainRepo repo.PodDomainRepoInterface
podEnvVarRepo repo.PodEnvVarRepoInterface
gitTokenService GitTokenServiceInterface
docker *docker.DockerService
podRepo repo.PodRepoInterface
podDomainRepo repo.PodDomainRepoInterface
podEnvVarService PodEnvVarServiceInterface
gitTokenService GitTokenServiceInterface
docker *docker.DockerService

// Build logs storage (simple)
buildLogsMu sync.RWMutex
Expand All @@ -29,18 +29,18 @@ type DeployService struct {
func NewDeployService(
podRepo *repo.PodRepo,
podDomainRepo *repo.PodDomainRepo,
podEnvVarRepo *repo.PodEnvVarRepo,
podEnvVarService PodEnvVarServiceInterface,
gitTokenService *GitTokenService,
docker *docker.DockerService,
) *DeployService {
return &DeployService{
podRepo: podRepo,
podDomainRepo: podDomainRepo,
podEnvVarRepo: podEnvVarRepo,
gitTokenService: gitTokenService,
docker: docker,
buildLogs: make(map[string][]string),
deploying: make(map[string]bool),
podRepo: podRepo,
podDomainRepo: podDomainRepo,
podEnvVarService: podEnvVarService,
gitTokenService: gitTokenService,
docker: docker,
buildLogs: make(map[string][]string),
deploying: make(map[string]bool),
}
}

Expand Down Expand Up @@ -166,8 +166,8 @@ func (s *DeployService) Deploy(ctx context.Context, podID string) error {
s.appendBuildLog(podID, fmt.Sprintf("Domain: %s (port %d)", d.Domain, d.Port))
}

// Get env vars
envVars, err := s.podEnvVarRepo.EnvVarsByPod(podID)
// Get env vars (decrypted via service)
envVars, err := s.podEnvVarService.EnvVarsByPod(podID)
if err != nil {
pod.Status = "failed"
s.podRepo.Update(*pod)
Expand Down Expand Up @@ -324,8 +324,8 @@ func (s *DeployService) Restart(ctx context.Context, podID string) error {
})
}

// 4. Get env vars
envVars, err := s.podEnvVarRepo.EnvVarsByPod(podID)
// 4. Get env vars (decrypted via service)
envVars, err := s.podEnvVarService.EnvVarsByPod(podID)
if err != nil {
return fmt.Errorf("failed to get env vars: %w", err)
}
Expand Down