Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* refactor workspace builds Signed-off-by: Spike Curtis <spike@coder.com> * make gen Signed-off-by: Spike Curtis <spike@coder.com> * Remove ParameterResolver from typescript Signed-off-by: Spike Curtis <spike@coder.com> * rename conversion -> database/db2sdk Signed-off-by: Spike Curtis <spike@coder.com> * tests for db2sdk Signed-off-by: Spike Curtis <spike@coder.com> * Tests for ParameterResolver Signed-off-by: Spike Curtis <spike@coder.com> * wsbuilder tests Signed-off-by: Spike Curtis <spike@coder.com> * Move parameter validation tests to richparameters_test.go Signed-off-by: Spike Curtis <spike@coder.com> * Fix CI generation; rename mock->dbmock Signed-off-by: Spike Curtis <spike@coder.com> * Fix test imports Signed-off-by: Spike Curtis <spike@coder.com> --------- Signed-off-by: Spike Curtis <spike@coder.com>
- Loading branch information
1 parent
622456f
commit cd416c8
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| // Package db2sdk provides common conversion routines from database types to codersdk types | ||
| package db2sdk | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "time" | ||
|
|
||
| "github.com/coder/coder/coderd/database" | ||
| "github.com/coder/coder/coderd/parameter" | ||
| "github.com/coder/coder/codersdk" | ||
| "github.com/coder/coder/provisionersdk/proto" | ||
| ) | ||
|
|
||
| func WorkspaceBuildParameters(params []database.WorkspaceBuildParameter) []codersdk.WorkspaceBuildParameter { | ||
| out := make([]codersdk.WorkspaceBuildParameter, len(params)) | ||
| for i, p := range params { | ||
| out[i] = WorkspaceBuildParameter(p) | ||
| } | ||
| return out | ||
| } | ||
|
|
||
| func WorkspaceBuildParameter(p database.WorkspaceBuildParameter) codersdk.WorkspaceBuildParameter { | ||
| return codersdk.WorkspaceBuildParameter{ | ||
| Name: p.Name, | ||
| Value: p.Value, | ||
| } | ||
| } | ||
|
|
||
| func TemplateVersionParameter(param database.TemplateVersionParameter) (codersdk.TemplateVersionParameter, error) { | ||
| var protoOptions []*proto.RichParameterOption | ||
| err := json.Unmarshal(param.Options, &protoOptions) | ||
| if err != nil { | ||
| return codersdk.TemplateVersionParameter{}, err | ||
| } | ||
| options := make([]codersdk.TemplateVersionParameterOption, 0) | ||
| for _, option := range protoOptions { | ||
| options = append(options, codersdk.TemplateVersionParameterOption{ | ||
| Name: option.Name, | ||
| Description: option.Description, | ||
| Value: option.Value, | ||
| Icon: option.Icon, | ||
| }) | ||
| } | ||
|
|
||
| descriptionPlaintext, err := parameter.Plaintext(param.Description) | ||
| if err != nil { | ||
| return codersdk.TemplateVersionParameter{}, err | ||
| } | ||
| return codersdk.TemplateVersionParameter{ | ||
| Name: param.Name, | ||
| DisplayName: param.DisplayName, | ||
| Description: param.Description, | ||
| DescriptionPlaintext: descriptionPlaintext, | ||
| Type: param.Type, | ||
| Mutable: param.Mutable, | ||
| DefaultValue: param.DefaultValue, | ||
| Icon: param.Icon, | ||
| Options: options, | ||
| ValidationRegex: param.ValidationRegex, | ||
| ValidationMin: param.ValidationMin, | ||
| ValidationMax: param.ValidationMax, | ||
| ValidationError: param.ValidationError, | ||
| ValidationMonotonic: codersdk.ValidationMonotonicOrder(param.ValidationMonotonic), | ||
| Required: param.Required, | ||
| LegacyVariableName: param.LegacyVariableName, | ||
| }, nil | ||
| } | ||
|
|
||
| func Parameters(params []database.ParameterValue) []codersdk.Parameter { | ||
| out := make([]codersdk.Parameter, len(params)) | ||
| for i, p := range params { | ||
| out[i] = Parameter(p) | ||
| } | ||
| return out | ||
| } | ||
|
|
||
| func Parameter(parameterValue database.ParameterValue) codersdk.Parameter { | ||
| return codersdk.Parameter{ | ||
| ID: parameterValue.ID, | ||
| CreatedAt: parameterValue.CreatedAt, | ||
| UpdatedAt: parameterValue.UpdatedAt, | ||
| Scope: codersdk.ParameterScope(parameterValue.Scope), | ||
| ScopeID: parameterValue.ScopeID, | ||
| Name: parameterValue.Name, | ||
| SourceScheme: codersdk.ParameterSourceScheme(parameterValue.SourceScheme), | ||
| DestinationScheme: codersdk.ParameterDestinationScheme(parameterValue.DestinationScheme), | ||
| SourceValue: parameterValue.SourceValue, | ||
| } | ||
| } | ||
|
|
||
| func ProvisionerJobStatus(provisionerJob database.ProvisionerJob) codersdk.ProvisionerJobStatus { | ||
| switch { | ||
| case provisionerJob.CanceledAt.Valid: | ||
| if !provisionerJob.CompletedAt.Valid { | ||
| return codersdk.ProvisionerJobCanceling | ||
| } | ||
| if provisionerJob.Error.String == "" { | ||
| return codersdk.ProvisionerJobCanceled | ||
| } | ||
| return codersdk.ProvisionerJobFailed | ||
| case !provisionerJob.StartedAt.Valid: | ||
| return codersdk.ProvisionerJobPending | ||
| case provisionerJob.CompletedAt.Valid: | ||
| if provisionerJob.Error.String == "" { | ||
| return codersdk.ProvisionerJobSucceeded | ||
| } | ||
| return codersdk.ProvisionerJobFailed | ||
| case database.Now().Sub(provisionerJob.UpdatedAt) > 30*time.Second: | ||
| return codersdk.ProvisionerJobFailed | ||
| default: | ||
| return codersdk.ProvisionerJobRunning | ||
| } | ||
| } |
Oops, something went wrong.
cli/templatedelete_test.go