REALMC-10362: Update CLI to handle data_sources dirs with just rules or just schemas/relationships #267
Conversation
malexandert
force-pushed
the
REALMC-10362
branch
2 times, most recently
from
b1578f5
to
92457a0
Compare
malexandert
force-pushed
the
REALMC-10362
branch
from
92457a0
to
c2717e2
Compare
|
|
||
| rulePath := filepath.Join(collPath, FileRules.String()) | ||
| if _, err := os.Stat(rulePath); err != nil { |
There was a problem hiding this comment.
[opt] could we use Stat() to check the file paths to see if the conditions for a valid data source folder are met before parsing them? up to you, I'm not sure how much of a performance improvement this would be
There was a problem hiding this comment.
the parseJSON call below (L#305) actually starts with an os.Stat call and returns early if the path doesn't exist, so your optimization is already built in here
i think the existing code just took the route of calling os.Stat ahead of parseJSON just to be clear about the intent for skipping directories without rules.json files present (rather than rely on a rule == nil check)
malexandert
changed the title
|
|
||
| rulePath := filepath.Join(collPath, FileRules.String()) | ||
| if _, err := os.Stat(rulePath); err != nil { |
There was a problem hiding this comment.
the parseJSON call below (L#305) actually starts with an os.Stat call and returns early if the path doesn't exist, so your optimization is already built in here
i think the existing code just took the route of calling os.Stat ahead of parseJSON just to be clear about the intent for skipping directories without rules.json files present (rather than rely on a rule == nil check)
internal/local/structure_v2.go
Outdated
| return err | ||
|
|
||
| schema := rule[NameSchema] | ||
| if schema != nil { |
There was a problem hiding this comment.
let's use the if schema, ok := rule[NameSchema]; ok { syntax here (we avoided it previously b/c we always wanted to replace nil with map[string]interface{}{} which i suppose is no longer the case)
internal/local/structure_v2.go
Outdated
|
|
||
| schema := rule[NameSchema] | ||
| if schema != nil { | ||
| dataSchema, err := MarshalJSON(schema) |
There was a problem hiding this comment.
[meganit/naming] could in theory tighten the scope of this named var to just data now that we're in this okSchema closure
…or just schemas/relationships (10gen#267)
JIRA: https://jira.mongodb.org/browse/REALMC-10362
Essentially doing a similar thing to this PR. After this PR, pushing, pulling, and diffing an app should work in cases where:
data_sources/<data_source>/<database>/<collection>) contains solely arules.jsonfileschema.jsonandrelationships.jsonfilesThis change was necessary because, as part of Schema Separation, an app is allowed to have a rule without an associated schema and vice versa