diff --git a/api/v1alpha2/zz_generated.deepcopy.go b/api/v1alpha2/zz_generated.deepcopy.go index 6caa129b..887a9e42 100644 --- a/api/v1alpha2/zz_generated.deepcopy.go +++ b/api/v1alpha2/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/pkg/configuration/base/resources/probe.go b/pkg/configuration/base/resources/probe.go index f59c1534..f35b41d0 100644 --- a/pkg/configuration/base/resources/probe.go +++ b/pkg/configuration/base/resources/probe.go @@ -7,7 +7,7 @@ import ( func NewProbe(uri string, port string, scheme corev1.URIScheme, initialDelaySeconds, timeoutSeconds, failureThreshold int32) *corev1.Probe { return &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: uri, Port: intstr.FromString(port), diff --git a/pkg/configuration/base/resources/resources_test.go b/pkg/configuration/base/resources/resources_test.go index aa5f9c1b..893607d7 100644 --- a/pkg/configuration/base/resources/resources_test.go +++ b/pkg/configuration/base/resources/resources_test.go @@ -16,12 +16,12 @@ var jenkins = v1alpha2.Jenkins{ { Env: []corev1.EnvVar{}, ReadinessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{}, }, }, LivenessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{}, }, }, @@ -118,7 +118,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) { jenkins.Spec.Master.Containers[0].ReadinessProbe = &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/login", }, @@ -127,7 +127,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) { jenkins.Spec.Master.Containers[0].LivenessProbe = &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/login", }, @@ -148,7 +148,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) { jenkins.Spec.Master.Containers[0].ReadinessProbe = &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/login", }, @@ -157,7 +157,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) { jenkins.Spec.Master.Containers[0].LivenessProbe = &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/login", }, @@ -178,7 +178,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) { jenkins.Spec.Master.Containers[0].ReadinessProbe = &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/jenkins/login", }, @@ -187,7 +187,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) { jenkins.Spec.Master.Containers[0].LivenessProbe = &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/jenkins/login", }, @@ -205,7 +205,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) { jenkins.Spec.Master.Containers[0].ReadinessProbe = &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/jenkins/login", }, @@ -214,7 +214,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) { jenkins.Spec.Master.Containers[0].LivenessProbe = &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/jenkins/login", }, diff --git a/pkg/notifications/smtp/smtp_test.go b/pkg/notifications/smtp/smtp_test.go index fee09c92..c0cf9bd3 100644 --- a/pkg/notifications/smtp/smtp_test.go +++ b/pkg/notifications/smtp/smtp_test.go @@ -2,10 +2,9 @@ package smtp import ( "context" - "errors" + //"errors" "fmt" "io" - "io/ioutil" "mime/quotedprintable" "net" "regexp" @@ -57,18 +56,18 @@ type testServer struct { event event.Event } -// Login handles a login command with username and password. -func (bkd *testServer) Login(_ *smtp.ConnectionState, username, password string) (smtp.Session, error) { - if username != testSMTPUsername || password != testSMTPPassword { - return nil, errors.New("invalid username or password") - } - return &testSession{event: bkd.event}, nil -} - -// AnonymousLogin requires clients to authenticate using SMTP AUTH before sending emails -func (bkd *testServer) AnonymousLogin(_ *smtp.ConnectionState) (smtp.Session, error) { - return nil, smtp.ErrAuthRequired -} +// TODO: @brokenpip3 fix me +//func (bkd *testServer) Login(_ *smtp.ConnectionState, username, password string) (smtp.Session, error) { +// if username != testSMTPUsername || password != testSMTPPassword { +// return nil, errors.New("invalid username or password") +// } +// return &testSession{event: bkd.event}, nil +//} +// +//// AnonymousLogin requires clients to authenticate using SMTP AUTH before sending emails +//func (bkd *testServer) AnonymousLogin(_ *smtp.ConnectionState) (smtp.Session, error) { +// return nil, smtp.ErrAuthRequired +//} // A Session is returned after successful login. type testSession struct { diff --git a/test/e2e/jenkins_test.go b/test/e2e/jenkins_test.go index 1543c465..efe12bf6 100644 --- a/test/e2e/jenkins_test.go +++ b/test/e2e/jenkins_test.go @@ -75,7 +75,7 @@ func createJenkinsCRSafeRestart(name, namespace string, seedJob *[]v1alpha2.Seed }, }, ReadinessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/login", Port: intstr.FromString("http"), @@ -89,7 +89,7 @@ func createJenkinsCRSafeRestart(name, namespace string, seedJob *[]v1alpha2.Seed PeriodSeconds: int32(10), }, LivenessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/login", Port: intstr.FromString("http"), @@ -143,8 +143,8 @@ func createJenkinsCRSafeRestart(name, namespace string, seedJob *[]v1alpha2.Seed }, SeedJobs: seedJobs, Service: v1alpha2.Service{ - Type: corev1.ServiceTypeNodePort, - Port: constants.DefaultHTTPPortInt32, + Type: corev1.ServiceTypeNodePort, + Port: constants.DefaultHTTPPortInt32, NodePort: 30303, }, }, diff --git a/test/e2e/restorebackup_test.go b/test/e2e/restorebackup_test.go index cb895853..5454c3e4 100644 --- a/test/e2e/restorebackup_test.go +++ b/test/e2e/restorebackup_test.go @@ -117,7 +117,7 @@ func createJenkinsWithBackupAndRestoreConfigured(name, namespace string) *v1alph }, }, ReadinessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/login", Port: intstr.FromString("http"), @@ -131,7 +131,7 @@ func createJenkinsWithBackupAndRestoreConfigured(name, namespace string) *v1alph PeriodSeconds: int32(5), }, LivenessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/login", Port: intstr.FromString("http"), @@ -210,8 +210,8 @@ func createJenkinsWithBackupAndRestoreConfigured(name, namespace string) *v1alph }, }, Service: v1alpha2.Service{ - Type: corev1.ServiceTypeNodePort, - Port: constants.DefaultHTTPPortInt32, + Type: corev1.ServiceTypeNodePort, + Port: constants.DefaultHTTPPortInt32, NodePort: 30303, }, }, diff --git a/test/e2e/test_utility.go b/test/e2e/test_utility.go index 7b62003f..3a170752 100644 --- a/test/e2e/test_utility.go +++ b/test/e2e/test_utility.go @@ -97,7 +97,7 @@ func RenderJenkinsCR(name, namespace string, seedJob *[]v1alpha2.SeedJob, groovy }, }, ReadinessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/login", Port: intstr.FromString("http"), @@ -111,7 +111,7 @@ func RenderJenkinsCR(name, namespace string, seedJob *[]v1alpha2.SeedJob, groovy PeriodSeconds: int32(1), }, LivenessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/login", Port: intstr.FromString("http"), @@ -165,8 +165,8 @@ func RenderJenkinsCR(name, namespace string, seedJob *[]v1alpha2.SeedJob, groovy }, SeedJobs: seedJobs, Service: v1alpha2.Service{ - Type: corev1.ServiceTypeNodePort, - Port: constants.DefaultHTTPPortInt32, + Type: corev1.ServiceTypeNodePort, + Port: constants.DefaultHTTPPortInt32, NodePort: 30303, }, Roles: []rbacv1.RoleRef{ diff --git a/test/helm/suite_test.go b/test/helm/suite_test.go index 29f50ac0..2b70abac 100644 --- a/test/helm/suite_test.go +++ b/test/helm/suite_test.go @@ -43,7 +43,7 @@ var _ = BeforeSuite(func(done Done) { var err error // cfg is defined in this file globally. - cfg, err = testEnv.Start() + cfg, err := testEnv.Start() Expect(err).NotTo(HaveOccurred()) Expect(cfg).NotTo(BeNil())