From 70aef4838baabc834aacf51d5816f9e631d852cb Mon Sep 17 00:00:00 2001 From: antoniaklja Date: Thu, 27 Dec 2018 20:22:53 +0100 Subject: [PATCH] Refactoring, additional tests and update README.md --- README.md | 1 + .../jenkins/configuration/user/validate.go | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a404085e..ce3f6e57 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,7 @@ User configuration: * ~~user reconciliation loop with CR validation~~ * ~~configure seed jobs and deploy keys~~ * ~~e2e tests for seed jobs~~ +* configure Jenkins authorization (via configuration as a code plugin or groovy scripts) * backup and restore for Jenkins jobs running as standalone job * trigger backup job before pod deletion using preStop k8s hooks * verify Jenkins configuration events diff --git a/pkg/controller/jenkins/configuration/user/validate.go b/pkg/controller/jenkins/configuration/user/validate.go index 2d7ed6e1..edc60ec4 100644 --- a/pkg/controller/jenkins/configuration/user/validate.go +++ b/pkg/controller/jenkins/configuration/user/validate.go @@ -2,21 +2,25 @@ package user import ( "context" - "fmt" - "strings" - - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/log" - "crypto/x509" "encoding/pem" + "fmt" + virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/VirtusLab/jenkins-operator/pkg/log" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + "strings" ) // Validate validates Jenkins CR Spec section func (r *ReconcileUserConfiguration) Validate(jenkins *virtuslabv1alpha1.Jenkins) bool { - // validate jenkins.Spec.SeedJobs + if !r.validateSeedJobs(jenkins) { + return false + } + return true +} + +func (r *ReconcileUserConfiguration) validateSeedJobs(jenkins *virtuslabv1alpha1.Jenkins) bool { if jenkins.Spec.SeedJobs != nil { for _, seedJob := range jenkins.Spec.SeedJobs { logger := r.logger.WithValues("seedJob", fmt.Sprintf("%+v", seedJob)).V(log.VWarn)