Initial working commit #136
Merged
Conversation
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
|
Only remaining question is what to call the I thought about Open to thoughts/suggestion. |
mclacore
approved these changes
Jul 12, 2024
| @@ -107,8 +106,7 @@ func getDescription(t *templatecache.TemplateData) error { | |||
| var ignoredTemplateDirs = map[string]bool{"alpha": true} | |||
|
|
|||
| func getTemplate(t *templatecache.TemplateData) error { | |||
| var fs = afero.NewOsFs() | |||
| cache, _ := templatecache.NewBundleTemplateCache(templatecache.GithubTemplatesFetcher, fs) | |||
| cache, _ := templatecache.NewBundleTemplateCache(templatecache.GithubTemplatesFetcher) | |||
There was a problem hiding this comment.
there's a lint recommendation below, won't allow me to comment on it
pkg/bundle/write_schemas.go
Outdated
| @@ -39,7 +38,7 @@ func (b *Bundle) WriteSchemas(buildPath string, fs afero.Fs) error { | |||
|
|
|||
| filepath := fmt.Sprintf("/schema-%s.json", task.label) | |||
|
|
|||
| err = afero.WriteFile(fs, path.Join(buildPath, filepath), content, 0755) | |||
| err = os.WriteFile(path.Join(buildPath, filepath), content, 0755) | |||
There was a problem hiding this comment.
would change perms to 0600 or add lint exclusion like //nolint:gosec to L17
| writePath := "." | ||
| testDir := t.TempDir() | ||
| rootTemplateDir := path.Join(testDir, "/home/md-cloud") | ||
| writePath := testDir |
There was a problem hiding this comment.
would look nicer to remove L20 and replace all writePath to testDir, or replace testDir with writePath
pkg/server/bundle/bundle.go
Outdated
| @@ -302,7 +300,7 @@ func (h *Handler) postConnections(w http.ResponseWriter, r *http.Request) { | |||
| return | |||
| } | |||
|
|
|||
| err = afero.WriteFile(h.fs, path.Join(h.bundleDir, "src", bundle.ConnsFile), bytes, 0755) | |||
| err = os.WriteFile(path.Join(h.bundleDir, "src", bundle.ConnsFile), bytes, 0755) | |||
There was a problem hiding this comment.
same comment about lint as above
pkg/terraform/generate_files.go
Outdated
| @@ -83,7 +83,7 @@ func generateTfVarsFiles(buildPath, stepPath string, b *bundle.Bundle, fs afero. | |||
| } | |||
|
|
|||
| filePath := fmt.Sprintf("/_%s_variables.tf.json", task.label) | |||
| err = afero.WriteFile(fs, path.Join(buildPath, stepPath, filePath), content, 0755) | |||
| err = os.WriteFile(path.Join(buildPath, stepPath, filePath), content, 0755) | |||
| emptyConnections := checkEmptySchema(b.Connections) | ||
|
|
||
| if emptyConnections { | ||
| err := afero.WriteFile(fs, path, []byte("{}"), 0755) | ||
| err := os.WriteFile(path, []byte("{}"), 0755) |
| @@ -40,7 +40,7 @@ func transpileConnectionVarFile(path string, b *bundle.Bundle, fs afero.Fs) erro | |||
| return err | |||
| } | |||
|
|
|||
| err = afero.WriteFile(fs, path, bytes, 0755) | |||
| err = os.WriteFile(path, bytes, 0755) | |||
| emptyParams := checkEmptySchema(b.Params) | ||
|
|
||
| if emptyParams { | ||
| err := afero.WriteFile(fs, path, []byte("{}"), 0755) | ||
| err := os.WriteFile(path, []byte("{}"), 0755) |
| @@ -59,7 +59,7 @@ func transpileAndWriteDevParams(path string, b *bundle.Bundle, fs afero.Fs) erro | |||
| return err | |||
| } | |||
|
|
|||
| err = afero.WriteFile(fs, path, bytes, 0755) | |||
| err = os.WriteFile(path, bytes, 0755) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pretty simple change that touched a lot of files. Pulling out the
aferomockfilesystem stuff. It was useful in testing, but some of our dependencies (airlock) perform filesystem access which makes it very difficult to maintain. There was really only 3 categories of changes here:aferofilesystem calls (ReadFile,WriteFile, etc) to their corresponding functions inosorfilepathTempDir.