Skip to content

Unify baseConfig logic for apps.Config across app and project config #225

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

Open
pawelkuc wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Unify baseConfig logic for apps.Config across app and project config #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc8ddc1
feat: unify baseConfig logic for apps.Config across app and project c…
pawelkuc Apr 16, 2025
adae8a0
feat: remove local job validation logic in favor of webhook-based CRD…
pawelkuc May 6, 2025
3f3c3f1
fix: inject ApplicationKongVars in TestProjectConfigFlags to define d…
pawelkuc May 6, 2025
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
22 changes: 0 additions & 22 deletions api/validation/config.go
View file
Open in desktop

This file was deleted.

106 changes: 54 additions & 52 deletions create/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,26 @@ const logPrintTimeout = 10 * time.Second
// update/application.go.
type applicationCmd struct {
resourceCmd
baseConfig
Git gitConfig `embed:"" prefix:"git-"`
Size *string `help:"Size of the app (defaults to \"${app_default_size}\")." placeholder:"${app_default_size}"`
Port *int32 `help:"Port the app is listening on (defaults to ${app_default_port})." placeholder:"${app_default_port}"`
Replicas *int32 `help:"Amount of replicas of the running app (defaults to ${app_default_replicas})." placeholder:"${app_default_replicas}"`
Hosts []string `help:"Host names where the app can be accessed. If empty, the app will just be accessible on a generated host name on the deploio.app domain."`
BasicAuth *bool `help:"Enable/Disable basic authentication for the app (defaults to ${app_default_basic_auth})." placeholder:"${app_default_basic_auth}"`
Env map[string]string `help:"Environment variables which are passed to the app at runtime."`
BuildEnv map[string]string `help:"Environment variables which are passed to the app build process."`
DeployJob deployJob `embed:"" prefix:"deploy-job-"`
WorkerJob workerJob `embed:"" prefix:"worker-job-"`
ScheduledJob scheduledJob `embed:"" prefix:"scheduled-job-"`
GitInformationServiceURL string `help:"URL of the git information service." default:"https://git-info.deplo.io" env:"GIT_INFORMATION_SERVICE_URL" hidden:""`
SkipRepoAccessCheck bool `help:"Skip the git repository access check" default:"false"`
Debug bool `help:"Enable debug messages" default:"false"`
Language string `help:"${app_language_help} Possible values: ${enum}" enum:"ruby,php,python,golang,nodejs,static," default:""`
DockerfileBuild dockerfileBuild `embed:""`
}
type baseConfig struct {
Size *string `help:"Size of the app (defaults to \"${app_default_size}\")." placeholder:"${app_default_size}"`
Port *int32 `help:"Port the app is listening on (defaults to ${app_default_port})." placeholder:"${app_default_port}"`
Replicas *int32 `help:"Amount of replicas of the running app (defaults to ${app_default_replicas})." placeholder:"${app_default_replicas}"`
BasicAuth *bool `help:"Enable/Disable basic authentication for the app (defaults to ${app_default_basic_auth})." placeholder:"${app_default_basic_auth}"`
Env map[string]string `help:"Environment variables which are passed to the app at runtime."`
DeployJob deployJob `embed:"" prefix:"deploy-job-"`
WorkerJob workerJob `embed:"" prefix:"worker-job-"`
ScheduledJob scheduledJob `embed:"" prefix:"scheduled-job-"`
}

type gitConfig struct {
URL string `required:"" help:"URL to the Git repository containing the app source. Both HTTPS and SSH formats are supported."`
Expand Down Expand Up @@ -174,15 +177,6 @@ func (app *applicationCmd) Run(ctx context.Context, client *api.Client) error {
}
}

if newApp.Spec.ForProvider.Config.DeployJob != nil {
configValidator := &validation.ConfigValidator{
Config: newApp.Spec.ForProvider.Config,
}
if err := configValidator.Validate(); err != nil {
return fmt.Errorf("error when validating application config: %w", err)
}
}

c := newCreator(client, newApp, strings.ToLower(apps.ApplicationKind))
appWaitCtx, cancel := context.WithTimeout(ctx, app.WaitTimeout)
defer cancel()
Expand Down Expand Up @@ -273,67 +267,75 @@ func spinnerMessage(msg, icon string, sleepTime time.Duration) error {
return spinner.Stop()
}

func (app *applicationCmd) config() apps.Config {
var deployJob *apps.DeployJob

if len(app.DeployJob.Command) != 0 && len(app.DeployJob.Name) != 0 {
deployJob = &apps.DeployJob{
func (job deployJob) applyUpdates(cfg *apps.Config) {
if len(job.Command) != 0 && len(job.Name) != 0 {
deployJob := &apps.DeployJob{
Job: apps.Job{
Name: app.DeployJob.Name,
Command: app.DeployJob.Command,
Name: job.Name,
Command: job.Command,
},
FiniteJob: apps.FiniteJob{
Retries: ptr.To(app.DeployJob.Retries),
Timeout: &metav1.Duration{Duration: app.DeployJob.Timeout},
Retries: ptr.To(job.Retries),
Timeout: &metav1.Duration{Duration: job.Timeout},
},
}
cfg.DeployJob = deployJob
}
}

config := apps.Config{
EnableBasicAuth: app.BasicAuth,
Env: util.EnvVarsFromMap(app.Env),
DeployJob: deployJob,
}

if len(app.WorkerJob.Command) != 0 && len(app.WorkerJob.Name) != 0 {
func (job workerJob) applyUpdates(config *apps.Config) {
if len(job.Command) != 0 && len(job.Name) != 0 {
workerJob := apps.WorkerJob{
Job: apps.Job{
Name: app.WorkerJob.Name,
Command: app.WorkerJob.Command,
Name: job.Name,
Command: job.Command,
},
}
if app.WorkerJob.Size != nil {
workerJob.Size = ptr.To(apps.ApplicationSize(*app.WorkerJob.Size))
if job.Size != nil {
workerJob.Size = ptr.To(apps.ApplicationSize(*job.Size))
}
config.WorkerJobs = append(config.WorkerJobs, workerJob)
}
}

if len(app.ScheduledJob.Command) != 0 && len(app.ScheduledJob.Name) != 0 && len(app.ScheduledJob.Schedule) != 0 {
func (job scheduledJob) applyUpdates(config *apps.Config) {
if len(job.Command) != 0 && len(job.Name) != 0 && len(job.Schedule) != 0 {
scheduledJob := apps.ScheduledJob{
FiniteJob: apps.FiniteJob{
Retries: &app.ScheduledJob.Retries,
Timeout: &metav1.Duration{Duration: app.ScheduledJob.Timeout},
Retries: &job.Retries,
Timeout: &metav1.Duration{Duration: job.Timeout},
},
Job: apps.Job{
Name: app.ScheduledJob.Name,
Command: app.ScheduledJob.Command,
Name: job.Name,
Command: job.Command,
},
Schedule: app.ScheduledJob.Schedule,
Schedule: job.Schedule,
}
if app.ScheduledJob.Size != nil {
scheduledJob.Size = ptr.To(apps.ApplicationSize(*app.ScheduledJob.Size))
if job.Size != nil {
scheduledJob.Size = ptr.To(apps.ApplicationSize(*job.Size))
}
config.ScheduledJobs = append(config.ScheduledJobs, scheduledJob)
}
}

func newConfig(bc baseConfig) apps.Config {
config := apps.Config{
EnableBasicAuth: bc.BasicAuth,
Env: util.EnvVarsFromMap(bc.Env),
}

bc.DeployJob.applyUpdates(&config)
bc.WorkerJob.applyUpdates(&config)
bc.ScheduledJob.applyUpdates(&config)

if app.Size != nil {
config.Size = apps.ApplicationSize(*app.Size)
if bc.Size != nil {
config.Size = apps.ApplicationSize(*bc.Size)
}
if app.Port != nil {
config.Port = app.Port
if bc.Port != nil {
config.Port = bc.Port
}
if app.Replicas != nil {
config.Replicas = app.Replicas
if bc.Replicas != nil {
config.Replicas = bc.Replicas
}
return config
}
Expand All @@ -357,7 +359,7 @@ func (app *applicationCmd) newApplication(project string) *apps.Application {
},
},
Hosts: app.Hosts,
Config: app.config(),
Config: newConfig(app.baseConfig),
BuildEnv: util.EnvVarsFromMap(app.BuildEnv),
DockerfileBuild: apps.DockerfileBuild{
Enabled: app.DockerfileBuild.Enabled,
Expand Down
Loading