public_git/kubernetes-operator
1
0
Fork 0
mirror of https://github.com/jenkinsci/kubernetes-operator.git synced 2026-10-03 14:44:23 +02:00
Code Issues Releases Wiki Activity

update to go 1.22 and operator-sdk 1.35 (#1094)

Browse Source 
Co-authored-by: brokenpip3 <brokenpip3@gmail.com>
Co-authored-by: Ansh Garhewal <me@anshdevs.in>
Co-authored-by: xmbhasin <xmbhasin@users.noreply.github.com>
This commit is contained in:
Manish Bhasin
2025-03-30 16:37:15 +02:00
committed by GitHub
co-authored by brokenpip3 Ansh Garhewal xmbhasin
parent 1ec83b9de9
commit 9c09db8031
83 changed files with 3759 additions and 3879 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/client/jenkins.go
+49 -44
View File
@@ -2,8 +2,9 @@ package client
import (
"bytes"
"context"
"fmt"
"io/ioutil"
"io"
"net/http"
"net/http/cookiejar"
"strings"
@@ -20,41 +21,41 @@ var (
// Jenkins defines Jenkins API.
type Jenkins interface {
GenerateToken(userName, tokenName string) (*UserToken, error)
Info() (*gojenkins.ExecutorResponse, error)
SafeRestart() error
CreateNode(name string, numExecutors int, description string, remoteFS string, label string, options ...interface{}) (*gojenkins.Node, error)
DeleteNode(name string) (bool, error)
CreateFolder(name string, parents ...string) (*gojenkins.Folder, error)
CreateJobInFolder(config string, jobName string, parentIDs ...string) (*gojenkins.Job, error)
CreateJob(config string, options ...interface{}) (*gojenkins.Job, error)
Info(ctx context.Context) (*gojenkins.ExecutorResponse, error)
SafeRestart(ctx context.Context) error
CreateNode(ctx context.Context, name string, numExecutors int, description string, remoteFS string, label string, options ...interface{}) (*gojenkins.Node, error)
DeleteNode(ctx context.Context, name string) (bool, error)
CreateFolder(ctx context.Context, name string, parents ...string) (*gojenkins.Folder, error)
CreateJobInFolder(ctx context.Context, config string, jobName string, parentIDs ...string) (*gojenkins.Job, error)
CreateJob(ctx context.Context, config string, options ...interface{}) (*gojenkins.Job, error)
CreateOrUpdateJob(config, jobName string) (*gojenkins.Job, bool, error)
RenameJob(job string, name string) *gojenkins.Job
CopyJob(copyFrom string, newName string) (*gojenkins.Job, error)
DeleteJob(name string) (bool, error)
BuildJob(name string, options ...interface{}) (int64, error)
GetNode(name string) (*gojenkins.Node, error)
GetLabel(name string) (*gojenkins.Label, error)
RenameJob(ctx context.Context, job string, name string) *gojenkins.Job
CopyJob(ctx context.Context, copyFrom string, newName string) (*gojenkins.Job, error)
CreateView(ctx context.Context, name string, viewType string) (*gojenkins.View, error)
DeleteJob(ctx context.Context, name string) (bool, error)
BuildJob(ctx context.Context, name string, options map[string]string) (int64, error)
GetNode(ctx context.Context, name string) (*gojenkins.Node, error)
GetLabel(ctx context.Context, name string) (*gojenkins.Label, error)
GetBuild(jobName string, number int64) (*gojenkins.Build, error)
GetJob(id string, parentIDs ...string) (*gojenkins.Job, error)
GetSubJob(parentID string, childID string) (*gojenkins.Job, error)
GetFolder(id string, parents ...string) (*gojenkins.Folder, error)
GetAllNodes() ([]*gojenkins.Node, error)
GetAllBuildIds(job string) ([]gojenkins.JobBuild, error)
GetAllJobNames() ([]gojenkins.InnerJob, error)
GetAllJobs() ([]*gojenkins.Job, error)
GetQueue() (*gojenkins.Queue, error)
GetJob(ctx context.Context, id string, parentIDs ...string) (*gojenkins.Job, error)
GetSubJob(ctx context.Context, parentID string, childID string) (*gojenkins.Job, error)
GetFolder(ctx context.Context, id string, parents ...string) (*gojenkins.Folder, error)
GetAllNodes(ctx context.Context) ([]*gojenkins.Node, error)
GetAllBuildIds(ctx context.Context, job string) ([]gojenkins.JobBuild, error)
GetAllJobNames(context.Context) ([]gojenkins.InnerJob, error)
GetAllJobs(context.Context) ([]*gojenkins.Job, error)
GetQueue(context.Context) (*gojenkins.Queue, error)
GetQueueUrl() string
GetQueueItem(id int64) (*gojenkins.Task, error)
GetArtifactData(id string) (*gojenkins.FingerPrintResponse, error)
GetQueueItem(ctx context.Context, id int64) (*gojenkins.Task, error)
GetArtifactData(ctx context.Context, id string) (*gojenkins.FingerPrintResponse, error)
GetPlugins(depth int) (*gojenkins.Plugins, error)
UninstallPlugin(name string) error
HasPlugin(name string) (*gojenkins.Plugin, error)
InstallPlugin(name string, version string) error
ValidateFingerPrint(id string) (bool, error)
GetView(name string) (*gojenkins.View, error)
GetAllViews() ([]*gojenkins.View, error)
CreateView(name string, viewType string) (*gojenkins.View, error)
Poll() (int, error)
UninstallPlugin(ctx context.Context, name string) error
HasPlugin(ctx context.Context, name string) (*gojenkins.Plugin, error)
InstallPlugin(ctx context.Context, name string, version string) error
ValidateFingerPrint(ctx context.Context, id string) (bool, error)
GetView(ctx context.Context, name string) (*gojenkins.View, error)
GetAllViews(context.Context) ([]*gojenkins.View, error)
Poll(ctx context.Context) (int, error)
ExecuteScript(groovyScript string) (logs string, err error)
GetNodeSecret(name string) (string, error)
}
@@ -90,16 +91,15 @@ func (t *setBearerToken) RoundTrip(r *http.Request) (*http.Response, error) {
// CreateOrUpdateJob creates or updates a job from config.
func (jenkins *jenkins) CreateOrUpdateJob(config, jobName string) (job *gojenkins.Job, created bool, err error) {
// create or update
job, err = jenkins.GetJob(jobName)
job, err = jenkins.GetJob(context.TODO(), jobName)
if isNotFoundError(err) {
job, err = jenkins.CreateJob(config, jobName)
created = true
job, err = jenkins.CreateJob(context.TODO(), config, jobName)
return job, true, errors.WithStack(err)
} else if err != nil {
return job, false, errors.WithStack(err)
}
err = job.UpdateConfig(config)
err = job.UpdateConfig(context.TODO(), config)
return job, false, errors.WithStack(err)
}
@@ -144,9 +144,10 @@ func NewBearerTokenAuthorization(url, token string) (Jenkins, error) {
}
func newClient(url, userName, passwordOrToken string) (Jenkins, error) {
if strings.HasSuffix(url, "/") {
url = url[:len(url)-1]
}
// if strings.HasSuffix(url, "/") {
// url = url[:len(url)-1]
url = strings.TrimSuffix(url, "/")
// }
jenkinsClient := &jenkins{}
jenkinsClient.Server = url
@@ -174,11 +175,11 @@ func newClient(url, userName, passwordOrToken string) (Jenkins, error) {
Client: httpClient,
BasicAuth: basicAuth,
}
if _, err := jenkinsClient.Init(); err != nil {
if _, err := jenkinsClient.Init(context.TODO()); err != nil {
return nil, errors.Wrap(err, "couldn't init Jenkins API client")
}
status, err := jenkinsClient.Poll()
status, err := jenkinsClient.Poll(context.TODO())
if err != nil {
return nil, errors.Wrap(err, "couldn't poll data from Jenkins API")
}
@@ -213,9 +214,13 @@ func (jenkins *jenkins) GetNodeSecret(name string) (string, error) {
if err != nil {
return "", err
}
defer resp.Body.Close()
defer func() {
if cerr := resp.Body.Close(); cerr != nil && err == nil {
err = cerr
}
}()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return "", err
}
@@ -231,7 +236,7 @@ func (jenkins *jenkins) GetNodeSecret(name string) (string, error) {
// You can supply depth parameter, to limit how much data is returned.
func (jenkins *jenkins) GetPlugins(depth int) (*gojenkins.Plugins, error) {
p := gojenkins.Plugins{Jenkins: &jenkins.Jenkins, Raw: new(gojenkins.PluginResponse), Base: "/pluginManager", Depth: depth}
statusCode, err := p.Poll()
statusCode, err := p.Poll(context.TODO())
if err != nil {
return nil, err
}
pkg/client/job.go
+3 -2
View File
@@ -1,13 +1,14 @@
package client
import (
"context"
"net/url"
"github.com/bndr/gojenkins"
)
func (jenkins *jenkins) GetBuild(jobName string, number int64) (*gojenkins.Build, error) {
job, err := jenkins.GetJob(jobName)
job, err := jenkins.GetJob(context.TODO(), jobName)
if err != nil {
return nil, err
}
@@ -21,7 +22,7 @@ func (jenkins *jenkins) GetBuild(jobName string, number int64) (*gojenkins.Build
job.Raw.URL = jobURL.RequestURI()
// workaround end
build, err := job.GetBuild(number)
build, err := job.GetBuild(context.TODO(), number)
if err != nil {
return nil, err
pkg/client/mockgen.go
+393 -395
View File
File diff suppressed because it is too large Load Diff
pkg/client/script.go
+7 -4
View File
@@ -2,6 +2,7 @@ package client
import (
"bytes"
"context"
"fmt"
"net/http"
"net/url"
@@ -9,6 +10,7 @@ import (
"time"
"github.com/bndr/gojenkins"
"github.com/jenkinsci/kubernetes-operator/pkg/log"
"github.com/pkg/errors"
)
@@ -38,18 +40,19 @@ func (jenkins *jenkins) executeScript(script string, verifier string) (string, e
data.Set("script", fullScript)
ar := gojenkins.NewAPIRequest("POST", "/scriptText", bytes.NewBufferString(data.Encode()))
if err := jenkins.Requester.SetCrumb(ar); err != nil {
if err := jenkins.Requester.SetCrumb(context.TODO(), ar); err != nil {
return output, err
}
ar.SetHeader("Content-Type", "application/x-www-form-urlencoded")
ar.Suffix = ""
r, err := jenkins.Requester.Do(ar, &output, nil)
r, err := jenkins.Requester.Do(context.TODO(), ar, &output, nil)
if err != nil {
return "", errors.Wrapf(err, "couldn't execute groovy script, logs '%s'", output)
}
defer r.Body.Close()
if err := r.Body.Close(); err != nil {
log.Log.Error(err, "failed to close jenkins.executeScript.Requester")
}
if r.StatusCode != http.StatusOK {
return output, errors.Errorf("invalid status code '%d', logs '%s'", r.StatusCode, output)
}
pkg/client/script_test.go
-1
View File
@@ -35,7 +35,6 @@ func Test_ExecuteScript(t *testing.T) {
Client: client,
BasicAuth: &gojenkins.BasicAuth{Username: "unused", Password: "unused"},
}
logs, err := jenkinsClient.executeScript(script, verifier)
assert.NoError(t, err, logs)
})
pkg/client/token.go
+11 -3
View File
@@ -1,9 +1,11 @@
package client
import (
"context"
"fmt"
"net/http"
"github.com/jenkinsci/kubernetes-operator/pkg/log"
"github.com/pkg/errors"
)
@@ -34,12 +36,18 @@ func (jenkins *jenkins) GenerateToken(userName, tokenName string) (*UserToken, e
base: fmt.Sprintf("/user/%s/descriptorByName/jenkins.security.ApiTokenProperty/generateNewToken", userName)}
endpoint := token.base
data := map[string]string{"newTokenName": tokenName}
r, err := jenkins.Requester.Post(endpoint, nil, token.raw, data)
r, err := jenkins.Requester.Post(context.TODO(), endpoint, nil, token.raw, data)
if err != nil {
return nil, errors.Wrap(err, "couldn't generate API token")
}
defer r.Body.Close()
defer func() {
if err := r.Body.Close(); err != nil {
log.Log.Error(err, "failed to close http response body")
}
}()
if err := r.Body.Close(); err != nil {
log.Log.Error(err, "failed to close jenkins.GenerateToken.Requester")
}
if r.StatusCode == http.StatusOK {
if token.raw.Status == "ok" {
return token, nil