Skip to content

Fix file and edge errors #67

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix file and edge errors #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3852b74
Set null edge fields to empty string prior to update or create
savfaire May 4, 2023
6c7b120
Ensure fileMeta fields contain data and fileMeta represents a file
savfaire May 4, 2023
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
25 changes: 17 additions & 8 deletions models/bucketSetFiles/bucketSetFiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,25 @@ func PullFiles(systemInfo *types.System_meta, client *cb.DevClient, bucketSetNam
return err
}

fileContents, err := client.ReadBucketSetFile(systemInfo.Key, bucketSetName, fileMeta.BucketName, fileMeta.RelativeName)
if err != nil {
return err
}
//the fileMeta structure contains entries for folders. These cause the client.ReadBucketSetFile API call to fail with an error:
//
//[ERROR] Failed to pull all bucket set files. map[error:map[detail:storage: object doesn't exist id:5a65c441-e7f1-47bc-8e07-753ea81dc9e2
// line:clearblade/bucket_sets/api.go:171 message:storage: object doesn't exist] statusCode:500]
//
//We therefore need to ensure we are dealing with a file (size > 0).
//
//We need to ensure all other fields are not empty to avoid a panic: panic: interface conversion: interface {} is nil, not string
if bucketSetName != "" && fileMeta.BucketName != "" && fileMeta.RelativeName != "" && fileMeta.Size > 0 {
fileContents, err := client.ReadBucketSetFile(systemInfo.Key, bucketSetName, fileMeta.BucketName, fileMeta.RelativeName)
if err != nil {
return err
}

err = writeBucketSetFile(bucketSetName, fileMeta, fileContents)
if err != nil {
return err
err = writeBucketSetFile(bucketSetName, fileMeta, fileContents)
if err != nil {
return err
}
}

}

return nil
Expand Down
20 changes: 18 additions & 2 deletions push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2057,7 +2057,15 @@ func updateEdge(systemKey string, edge map[string]interface{}, client *cb.DevCli
for columnName, value := range edge {
switch strings.ToLower(columnName) {
case "system_key", "system_secret", "token", "description", "location", "mac_address", "policy_name", "resolver_func", "sync_edge_tables", "last_seen_version":
originalColumns[columnName] = value

//We need to make sure there are valid values in the JSON to prevent an error when creating or updating edges:
//
//[[message:Create Edge: Bad type for key 'resolver_func'] statusCode:500]
if value == nil || value == "null" {
originalColumns[columnName] = ""
} else {
originalColumns[columnName] = value
}
break
default:
customColumns[columnName] = value
Expand Down Expand Up @@ -2547,7 +2555,15 @@ func createEdge(systemKey, name string, edge map[string]interface{}, client *cb.
for columnName, value := range edge {
switch strings.ToLower(columnName) {
case "system_key", "system_secret", "token", "description", "location", "mac_address", "policy_name", "resolver_func", "sync_edge_tables", "last_seen_version":
originalColumns[columnName] = value
//We need to make sure there are valid values in the JSON to prevent an error when creating or updating edges:
//
//[[message:Create Edge: Bad type for key 'resolver_func'] statusCode:500]
if value == nil || value == "null" {
originalColumns[columnName] = ""
} else {
originalColumns[columnName] = value
}
break
default:
if value != nil {
customColumns[columnName] = value
Expand Down