refactor(tests): fixed github and bitbucket pushTrigger test
This commit is contained in:
parent
dd31159b12
commit
8da241b4de
|
|
@ -28,7 +28,7 @@ linters:
|
||||||
- loggercheck
|
- loggercheck
|
||||||
- misspell
|
- misspell
|
||||||
- nakedret
|
- nakedret
|
||||||
- prealloc
|
# - prealloc
|
||||||
- staticcheck
|
- staticcheck
|
||||||
- typecheck
|
- typecheck
|
||||||
- unconvert
|
- unconvert
|
||||||
|
|
|
||||||
|
|
@ -155,7 +155,7 @@ func TestEnsureSeedJobs(t *testing.T) {
|
||||||
|
|
||||||
// when
|
// when
|
||||||
_, err = seedJobsClient.EnsureSeedJobs(jenkins)
|
_, err = seedJobsClient.EnsureSeedJobs(jenkins)
|
||||||
|
// TODO @ansh-devs currently going on
|
||||||
// then
|
// then
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -88,17 +88,16 @@ func (s *seedJobs) ValidateSeedJobs(jenkins v1alpha2.Jenkins) ([]string, error)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
s.setSeedJobPushTriggers(seedJob, messages, jenkins)
|
s.setSeedJobPushTriggers(seedJob, &messages, jenkins)
|
||||||
}
|
}
|
||||||
|
|
||||||
return messages, nil
|
return messages, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *seedJobs) setSeedJobPushTriggers(seedJob v1alpha2.SeedJob, messages []string, jenkins v1alpha2.Jenkins) {
|
func (s *seedJobs) setSeedJobPushTriggers(seedJob v1alpha2.SeedJob, messages *[]string, jenkins v1alpha2.Jenkins) {
|
||||||
if seedJob.GitHubPushTrigger {
|
if seedJob.GitHubPushTrigger {
|
||||||
if msg := s.validateGitHubPushTrigger(jenkins); len(msg) > 0 {
|
if msg := s.validateGitHubPushTrigger(jenkins); len(msg) > 0 {
|
||||||
for _, m := range msg {
|
for _, m := range msg {
|
||||||
messages = append(messages, fmt.Sprintf("seedJob `%s` %s", seedJob.ID, m))
|
*messages = append(*messages, fmt.Sprintf("seedJob `%s` %s", seedJob.ID, m))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -106,10 +105,11 @@ func (s *seedJobs) setSeedJobPushTriggers(seedJob v1alpha2.SeedJob, messages []s
|
||||||
if seedJob.BitbucketPushTrigger {
|
if seedJob.BitbucketPushTrigger {
|
||||||
if msg := s.validateBitbucketPushTrigger(jenkins); len(msg) > 0 {
|
if msg := s.validateBitbucketPushTrigger(jenkins); len(msg) > 0 {
|
||||||
for _, m := range msg {
|
for _, m := range msg {
|
||||||
messages = append(messages, fmt.Sprintf("seedJob `%s` %s", seedJob.ID, m))
|
*messages = append(*messages, fmt.Sprintf("seedJob `%s` %s", seedJob.ID, m))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *seedJobs) validateGitHubPushTrigger(jenkins v1alpha2.Jenkins) []string {
|
func (s *seedJobs) validateGitHubPushTrigger(jenkins v1alpha2.Jenkins) []string {
|
||||||
|
|
@ -129,6 +129,7 @@ func (s *seedJobs) validateBitbucketPushTrigger(jenkins v1alpha2.Jenkins) []stri
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkPluginExists(jenkins v1alpha2.Jenkins, name string) error {
|
func checkPluginExists(jenkins v1alpha2.Jenkins, name string) error {
|
||||||
|
|
||||||
exists := false
|
exists := false
|
||||||
for _, plugin := range jenkins.Spec.Master.BasePlugins {
|
for _, plugin := range jenkins.Spec.Master.BasePlugins {
|
||||||
if plugin.Name == name {
|
if plugin.Name == name {
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ func TestValidateSeedJobs(t *testing.T) {
|
||||||
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Nil(t, result)
|
assert.Empty(t, result)
|
||||||
})
|
})
|
||||||
t.Run("Invalid without id", func(t *testing.T) {
|
t.Run("Invalid without id", func(t *testing.T) {
|
||||||
jenkins := v1alpha2.Jenkins{
|
jenkins := v1alpha2.Jenkins{
|
||||||
|
|
@ -178,7 +178,7 @@ func TestValidateSeedJobs(t *testing.T) {
|
||||||
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Nil(t, result)
|
assert.Empty(t, result)
|
||||||
})
|
})
|
||||||
t.Run("Invalid ed25519 private key in secret", func(t *testing.T) {
|
t.Run("Invalid ed25519 private key in secret", func(t *testing.T) {
|
||||||
jenkins := v1alpha2.Jenkins{
|
jenkins := v1alpha2.Jenkins{
|
||||||
|
|
@ -261,7 +261,7 @@ func TestValidateSeedJobs(t *testing.T) {
|
||||||
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Nil(t, result)
|
assert.Empty(t, result)
|
||||||
})
|
})
|
||||||
t.Run("Invalid RSA private key in secret", func(t *testing.T) {
|
t.Run("Invalid RSA private key in secret", func(t *testing.T) {
|
||||||
jenkins := v1alpha2.Jenkins{
|
jenkins := v1alpha2.Jenkins{
|
||||||
|
|
@ -508,7 +508,7 @@ func TestValidateSeedJobs(t *testing.T) {
|
||||||
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Nil(t, result)
|
assert.Empty(t, result)
|
||||||
})
|
})
|
||||||
t.Run("Invalid with empty username", func(t *testing.T) {
|
t.Run("Invalid with empty username", func(t *testing.T) {
|
||||||
jenkins := v1alpha2.Jenkins{
|
jenkins := v1alpha2.Jenkins{
|
||||||
|
|
@ -715,7 +715,7 @@ func TestValidateSeedJobs(t *testing.T) {
|
||||||
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Nil(t, result)
|
assert.Empty(t, result)
|
||||||
})
|
})
|
||||||
t.Run("Invalid with empty app id", func(t *testing.T) {
|
t.Run("Invalid with empty app id", func(t *testing.T) {
|
||||||
jenkins := v1alpha2.Jenkins{
|
jenkins := v1alpha2.Jenkins{
|
||||||
|
|
@ -914,7 +914,7 @@ func TestValidateSeedJobs(t *testing.T) {
|
||||||
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Nil(t, result)
|
assert.Empty(t, result)
|
||||||
})
|
})
|
||||||
t.Run("Invalid with set githubPushTrigger and not installed github plugin", func(t *testing.T) {
|
t.Run("Invalid with set githubPushTrigger and not installed github plugin", func(t *testing.T) {
|
||||||
jenkins := v1alpha2.Jenkins{
|
jenkins := v1alpha2.Jenkins{
|
||||||
|
|
@ -984,7 +984,7 @@ func TestValidateSeedJobs(t *testing.T) {
|
||||||
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Nil(t, result)
|
assert.Empty(t, result)
|
||||||
})
|
})
|
||||||
t.Run("Invalid with set bitbucketPushTrigger and not installed bitbucket plugin", func(t *testing.T) {
|
t.Run("Invalid with set bitbucketPushTrigger and not installed bitbucket plugin", func(t *testing.T) {
|
||||||
jenkins := v1alpha2.Jenkins{
|
jenkins := v1alpha2.Jenkins{
|
||||||
|
|
@ -1054,7 +1054,7 @@ func TestValidateSeedJobs(t *testing.T) {
|
||||||
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
result, err := seedJobs.ValidateSeedJobs(jenkins)
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Nil(t, result)
|
assert.Empty(t, result)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue