- Notifications
You must be signed in to change notification settings - Fork928
Stevenmasley/tfparse to preview#18650
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Draft
Emyrk wants to merge2 commits intomainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Draft
Changes fromall commits
Commits
Show all changes
2 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
19 changes: 19 additions & 0 deletionsarchive/fs/zip.go
This file contains hidden or 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,19 @@ | ||
| package archivefs | ||
| import ( | ||
| "archive/zip" | ||
| "io" | ||
| "io/fs" | ||
| "github.com/spf13/afero" | ||
| "github.com/spf13/afero/zipfs" | ||
| ) | ||
| // FromZipReader creates a read-only in-memory FS | ||
| func FromZipReader(r io.ReaderAt, size int64) (fs.FS, error) { | ||
| zr, err := zip.NewReader(r, size) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return afero.NewIOFS(zipfs.New(zr)), nil | ||
| } |
46 changes: 33 additions & 13 deletionscoderd/templateversions.go
This file contains hidden or 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
4 changes: 3 additions & 1 deletiongo.mod
This file contains hidden or 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
4 changes: 2 additions & 2 deletionsgo.sum
This file contains hidden or 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
41 changes: 22 additions & 19 deletionsprovisioner/terraform/parse.go
This file contains hidden or 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
99 changes: 99 additions & 0 deletionsprovisioner/terraform/tfparse/previewtags.go
This file contains hidden or 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,99 @@ | ||
| package tfparse | ||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "io/fs" | ||
| "github.com/hashicorp/hcl/v2" | ||
| "github.com/coder/coder/v2/codersdk" | ||
| "github.com/coder/preview" | ||
| previewtypes "github.com/coder/preview/types" | ||
| ) | ||
| type Parsed struct { | ||
| output *preview.Output | ||
| } | ||
| // | ||
| //// TODO: Maybe swap workdir with an fs.FS interface? | ||
| //func New(files fs.FS, opt ...Option) (*Parser, hcl.Diagnostics) { | ||
| //return &Parser{ | ||
| //logger: slog.Logger{}, | ||
| //workdir: files, | ||
| //}, nil | ||
| //} | ||
| func New(ctx context.Context, workdir fs.FS, input preview.Input) (*preview.Output, hcl.Diagnostics) { | ||
| output, diags := preview.Preview(ctx, input, workdir) | ||
| if diags.HasErrors() { | ||
| return nil, diags | ||
| } | ||
| return output, nil | ||
| } | ||
| func TagValidationResponse(tag previewtypes.Tag) codersdk.ValidationError { | ||
| name := tag.KeyString() | ||
| if name == previewtypes.UnknownStringValue { | ||
| name = "unknown" | ||
| } | ||
| const ( | ||
| key = "key" | ||
| value = "value" | ||
| ) | ||
| diagErr := "Invalid tag %s: %s" | ||
| if tag.Key.ValueDiags.HasErrors() { | ||
| return codersdk.ValidationError{ | ||
| Field: name, | ||
| Detail: fmt.Sprintf(diagErr, key, tag.Key.ValueDiags.Error()), | ||
| } | ||
| } | ||
| if tag.Value.ValueDiags.HasErrors() { | ||
| return codersdk.ValidationError{ | ||
| Field: name, | ||
| Detail: fmt.Sprintf(diagErr, value, tag.Value.ValueDiags.Error()), | ||
| } | ||
| } | ||
| // TODO: It would be really nice to pull out the variable references to help identify the source of | ||
| // the unknown or invalid tag. | ||
| unknownErr := "Tag %s is not known, it likely refers to a variable that is not set or has no default." | ||
| if !tag.Key.IsKnown() { | ||
| return codersdk.ValidationError{ | ||
| Field: name, | ||
| Detail: fmt.Sprintf(unknownErr, key), | ||
| } | ||
| } | ||
| if !tag.Value.IsKnown() { | ||
| return codersdk.ValidationError{ | ||
| Field: name, | ||
| Detail: fmt.Sprintf(unknownErr, value), | ||
| } | ||
| } | ||
| invalidErr := "Tag %s is not valid, it must be a non-null string value." | ||
| if !tag.Key.Valid() { | ||
| return codersdk.ValidationError{ | ||
| Field: name, | ||
| Detail: fmt.Sprintf(invalidErr, key), | ||
| } | ||
| } | ||
| if !tag.Value.Valid() { | ||
| return codersdk.ValidationError{ | ||
| Field: name, | ||
| Detail: fmt.Sprintf(invalidErr, value), | ||
| } | ||
| } | ||
| return codersdk.ValidationError{ | ||
| Field: name, | ||
| Detail: fmt.Sprintf("Tag is invalid for some unknown reason. Please check the tag's value and key."), | ||
| } | ||
| } |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.