Skip to content
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

chore(serverless_jobs): rename id to job_definition_id and id to job_run_id #1936

Merged
merged 1 commit into from
Nov 28, 2023
Merged

chore(serverless_jobs): rename id to job_definition_id and id to job_run_id #1936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 26 additions & 26 deletions api/jobs/v1alpha1/jobs_sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,23 +218,23 @@ type DeleteJobDefinitionRequest struct {
// Region: region to target. If none is passed will use default region from the config.
Region scw.Region `json:"-"`

ID string `json:"-"`
JobDefinitionID string `json:"-"`
}

// GetJobDefinitionRequest: get job definition request.
type GetJobDefinitionRequest struct {
// Region: region to target. If none is passed will use default region from the config.
Region scw.Region `json:"-"`

ID string `json:"-"`
JobDefinitionID string `json:"-"`
}

// GetJobRunRequest: get job run request.
type GetJobRunRequest struct {
// Region: region to target. If none is passed will use default region from the config.
Region scw.Region `json:"-"`

ID string `json:"-"`
JobRunID string `json:"-"`
}

// GetServiceInfoRequest: get service info request.
Expand Down Expand Up @@ -296,7 +296,7 @@ type ListJobRunsRequest struct {
// OrderBy: default value: created_at_asc
OrderBy ListJobRunsRequestOrderBy `json:"-"`

ID *string `json:"-"`
JobDefinitionID *string `json:"-"`

ProjectID *string `json:"-"`
}
Expand Down Expand Up @@ -332,23 +332,23 @@ type StartJobDefinitionRequest struct {
// Region: region to target. If none is passed will use default region from the config.
Region scw.Region `json:"-"`

ID string `json:"-"`
JobDefinitionID string `json:"-"`
}

// StopJobRunRequest: stop job run request.
type StopJobRunRequest struct {
// Region: region to target. If none is passed will use default region from the config.
Region scw.Region `json:"-"`

ID string `json:"-"`
JobRunID string `json:"-"`
}

// UpdateJobDefinitionRequest: update job definition request.
type UpdateJobDefinitionRequest struct {
// Region: region to target. If none is passed will use default region from the config.
Region scw.Region `json:"-"`

ID string `json:"-"`
JobDefinitionID string `json:"-"`

Name *string `json:"name,omitempty"`

Expand Down Expand Up @@ -463,13 +463,13 @@ func (s *API) GetJobDefinition(req *GetJobDefinitionRequest, opts ...scw.Request
return nil, errors.New("field Region cannot be empty in request")
}

if fmt.Sprint(req.ID) == "" {
return nil, errors.New("field ID cannot be empty in request")
if fmt.Sprint(req.JobDefinitionID) == "" {
return nil, errors.New("field JobDefinitionID cannot be empty in request")
}

scwReq := &scw.ScalewayRequest{
Method: "GET",
Path: "/serverless-jobs/v1alpha1/regions/" + fmt.Sprint(req.Region) + "/job-definitions/" + fmt.Sprint(req.ID) + "",
Path: "/serverless-jobs/v1alpha1/regions/" + fmt.Sprint(req.Region) + "/job-definitions/" + fmt.Sprint(req.JobDefinitionID) + "",
}

var resp JobDefinition
Expand Down Expand Up @@ -533,13 +533,13 @@ func (s *API) UpdateJobDefinition(req *UpdateJobDefinitionRequest, opts ...scw.R
return nil, errors.New("field Region cannot be empty in request")
}

if fmt.Sprint(req.ID) == "" {
return nil, errors.New("field ID cannot be empty in request")
if fmt.Sprint(req.JobDefinitionID) == "" {
return nil, errors.New("field JobDefinitionID cannot be empty in request")
}

scwReq := &scw.ScalewayRequest{
Method: "PATCH",
Path: "/serverless-jobs/v1alpha1/regions/" + fmt.Sprint(req.Region) + "/job-definitions/" + fmt.Sprint(req.ID) + "",
Path: "/serverless-jobs/v1alpha1/regions/" + fmt.Sprint(req.Region) + "/job-definitions/" + fmt.Sprint(req.JobDefinitionID) + "",
}

err = scwReq.SetBody(req)
Expand Down Expand Up @@ -569,13 +569,13 @@ func (s *API) DeleteJobDefinition(req *DeleteJobDefinitionRequest, opts ...scw.R
return errors.New("field Region cannot be empty in request")
}

if fmt.Sprint(req.ID) == "" {
return errors.New("field ID cannot be empty in request")
if fmt.Sprint(req.JobDefinitionID) == "" {
return errors.New("field JobDefinitionID cannot be empty in request")
}

scwReq := &scw.ScalewayRequest{
Method: "DELETE",
Path: "/serverless-jobs/v1alpha1/regions/" + fmt.Sprint(req.Region) + "/job-definitions/" + fmt.Sprint(req.ID) + "",
Path: "/serverless-jobs/v1alpha1/regions/" + fmt.Sprint(req.Region) + "/job-definitions/" + fmt.Sprint(req.JobDefinitionID) + "",
}

err = s.client.Do(scwReq, nil, opts...)
Expand All @@ -598,13 +598,13 @@ func (s *API) StartJobDefinition(req *StartJobDefinitionRequest, opts ...scw.Req
return nil, errors.New("field Region cannot be empty in request")
}

if fmt.Sprint(req.ID) == "" {
return nil, errors.New("field ID cannot be empty in request")
if fmt.Sprint(req.JobDefinitionID) == "" {
return nil, errors.New("field JobDefinitionID cannot be empty in request")
}

scwReq := &scw.ScalewayRequest{
Method: "POST",
Path: "/serverless-jobs/v1alpha1/regions/" + fmt.Sprint(req.Region) + "/job-definitions/" + fmt.Sprint(req.ID) + "/start",
Path: "/serverless-jobs/v1alpha1/regions/" + fmt.Sprint(req.Region) + "/job-definitions/" + fmt.Sprint(req.JobDefinitionID) + "/start",
}

err = scwReq.SetBody(req)
Expand Down Expand Up @@ -634,13 +634,13 @@ func (s *API) GetJobRun(req *GetJobRunRequest, opts ...scw.RequestOption) (*JobR
return nil, errors.New("field Region cannot be empty in request")
}

if fmt.Sprint(req.ID) == "" {
return nil, errors.New("field ID cannot be empty in request")
if fmt.Sprint(req.JobRunID) == "" {
return nil, errors.New("field JobRunID cannot be empty in request")
}

scwReq := &scw.ScalewayRequest{
Method: "GET",
Path: "/serverless-jobs/v1alpha1/regions/" + fmt.Sprint(req.Region) + "/job-runs/" + fmt.Sprint(req.ID) + "",
Path: "/serverless-jobs/v1alpha1/regions/" + fmt.Sprint(req.Region) + "/job-runs/" + fmt.Sprint(req.JobRunID) + "",
}

var resp JobRun
Expand All @@ -665,13 +665,13 @@ func (s *API) StopJobRun(req *StopJobRunRequest, opts ...scw.RequestOption) (*Jo
return nil, errors.New("field Region cannot be empty in request")
}

if fmt.Sprint(req.ID) == "" {
return nil, errors.New("field ID cannot be empty in request")
if fmt.Sprint(req.JobRunID) == "" {
return nil, errors.New("field JobRunID cannot be empty in request")
}

scwReq := &scw.ScalewayRequest{
Method: "POST",
Path: "/serverless-jobs/v1alpha1/regions/" + fmt.Sprint(req.Region) + "/job-runs/" + fmt.Sprint(req.ID) + "/stop",
Path: "/serverless-jobs/v1alpha1/regions/" + fmt.Sprint(req.Region) + "/job-runs/" + fmt.Sprint(req.JobRunID) + "/stop",
}

err = scwReq.SetBody(req)
Expand Down Expand Up @@ -706,7 +706,7 @@ func (s *API) ListJobRuns(req *ListJobRunsRequest, opts ...scw.RequestOption) (*
parameter.AddToQuery(query, "page", req.Page)
parameter.AddToQuery(query, "page_size", req.PageSize)
parameter.AddToQuery(query, "order_by", req.OrderBy)
parameter.AddToQuery(query, "id", req.ID)
parameter.AddToQuery(query, "job_definition_id", req.JobDefinitionID)
parameter.AddToQuery(query, "project_id", req.ProjectID)

if fmt.Sprint(req.Region) == "" {
Expand Down
Loading