-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Ransom Williams <rwilliams@oneconcern.com>
- Loading branch information
Showing
5 changed files
with
423 additions
and
14 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| // Copyright © 2018 One Concern | ||
|
|
||
| package cmd | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "log" | ||
| "text/template" | ||
|
|
||
| "github.com/oneconcern/datamon/pkg/core" | ||
| "github.com/oneconcern/datamon/pkg/storage/gcs" | ||
| "github.com/oneconcern/datamon/pkg/storage/localfs" | ||
|
|
||
| "github.com/spf13/afero" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| var bundleDiffCmd = &cobra.Command{ | ||
| Use: "diff", | ||
| Short: "Diff a downloaded bundle with a remote bundle.", | ||
| Long: "Diff a downloaded bundle with a remote bundle. " + | ||
| "--destination is a location previously passed to the `bundle download` command.", | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| const listLineTemplateString = `{{.Type}} , {{.Name}} , {{with .Additional}}{{.Size}} , {{.Hash}}{{end}} , {{with .Existing}}{{.Size}} , {{.Hash}}{{end}}` | ||
| listLineTemplate := template.Must(template.New("list line").Parse(listLineTemplateString)) | ||
|
|
||
| sourceStore, err := gcs.New(params.repo.MetadataBucket, config.Credential) | ||
| if err != nil { | ||
| logFatalln(err) | ||
| } | ||
| blobStore, err := gcs.New(params.repo.BlobBucket, config.Credential) | ||
| if err != nil { | ||
| logFatalln(err) | ||
| } | ||
| path, err := sanitizePath(params.bundle.DataPath) | ||
| if err != nil { | ||
| logFatalln("Failed path validation: " + err.Error()) | ||
| } | ||
| fs := afero.NewBasePathFs(afero.NewOsFs(), path+"/") | ||
| destinationStore := localfs.New(fs) | ||
|
|
||
| err = setLatestOrLabelledBundle(sourceStore) | ||
| if err != nil { | ||
| logFatalln(err) | ||
| } | ||
|
|
||
| localBundle := core.New(core.NewBDescriptor(), | ||
| core.ConsumableStore(destinationStore), | ||
| ) | ||
| remoteBundle := core.New(core.NewBDescriptor(), | ||
| core.Repo(params.repo.RepoName), | ||
| core.MetaStore(sourceStore), | ||
| core.BlobStore(blobStore), | ||
| core.BundleID(params.bundle.ID), | ||
| ) | ||
|
|
||
| if err = core.PublishMetadata(context.Background(), localBundle); err != nil { | ||
| logFatalln(err) | ||
| } | ||
|
|
||
| if err = core.PublishMetadata(context.Background(), remoteBundle); err != nil { | ||
| logFatalln(err) | ||
| } | ||
|
|
||
| diff, err := core.Diff(localBundle, remoteBundle) | ||
| if err != nil { | ||
| logFatalln(err) | ||
| } | ||
|
|
||
| if len(diff.Entries) == 0 { | ||
| log.Println("empty diff") | ||
| } else { | ||
| for _, de := range diff.Entries { | ||
| var buf bytes.Buffer | ||
| err := listLineTemplate.Execute(&buf, de) | ||
| if err != nil { | ||
| log.Println("executing template:", err) | ||
| } | ||
| log.Println(buf.String()) | ||
| } | ||
| } | ||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
|
|
||
| // Source | ||
| requiredFlags := []string{addRepoNameOptionFlag(bundleDiffCmd)} | ||
|
|
||
| // Destination | ||
| requiredFlags = append(requiredFlags, addDataPathFlag(bundleDiffCmd)) | ||
|
|
||
| // Bundle to download | ||
| addBundleFlag(bundleDiffCmd) | ||
| // Blob bucket | ||
| addBlobBucket(bundleDiffCmd) | ||
| addBucketNameFlag(bundleDiffCmd) | ||
|
|
||
| addLabelNameFlag(bundleDiffCmd) | ||
|
|
||
| for _, flag := range requiredFlags { | ||
| err := bundleDiffCmd.MarkFlagRequired(flag) | ||
| if err != nil { | ||
| logFatalln(err) | ||
| } | ||
| } | ||
|
|
||
| bundleCmd.AddCommand(bundleDiffCmd) | ||
| } |
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,81 @@ | ||
| // Copyright © 2018 One Concern | ||
|
|
||
| package core | ||
|
|
||
| import ( | ||
| "github.com/oneconcern/datamon/pkg/model" | ||
| ) | ||
|
|
||
| const ( | ||
| DiffEntryTypeAdd = iota | ||
| DiffEntryTypeDel | ||
| DiffEntryTypeDif | ||
| ) | ||
|
|
||
| type DiffEntryType uint | ||
|
|
||
| func (det DiffEntryType) String() string { | ||
| diffEntryStrings := map[DiffEntryType]string{ | ||
| DiffEntryTypeAdd: "A", | ||
| DiffEntryTypeDel: "D", | ||
| DiffEntryTypeDif: "U", | ||
| } | ||
| return diffEntryStrings[det] | ||
| } | ||
|
|
||
| type DiffEntry struct { | ||
| Type DiffEntryType | ||
| // could use a method rather than storing Name in order to curb memory use | ||
| Name string | ||
| Existing model.BundleEntry | ||
| Additional model.BundleEntry | ||
| } | ||
|
|
||
| type BundleDiff struct { | ||
| Entries []DiffEntry | ||
| } | ||
|
|
||
| func diffBundles(bundleExisting *Bundle, bundleAdditional *Bundle) (BundleDiff, error) { | ||
| diffEntries := make([]DiffEntry, 0) | ||
| bundleEntriesExisting := make(map[string]model.BundleEntry, len(bundleExisting.BundleEntries)) | ||
| for _, bundleEntry := range bundleExisting.BundleEntries { | ||
| bundleEntriesExisting[bundleEntry.NameWithPath] = bundleEntry | ||
| } | ||
| bundleEntriesAdditional := make(map[string]model.BundleEntry, len(bundleAdditional.BundleEntries)) | ||
| for _, bundleEntry := range bundleAdditional.BundleEntries { | ||
| bundleEntriesAdditional[bundleEntry.NameWithPath] = bundleEntry | ||
| } | ||
|
|
||
| for nameWithPath, bundleEntryExisting := range bundleEntriesExisting { | ||
| bundleEntryAdditional, ok := bundleEntriesAdditional[nameWithPath] | ||
| if ok { | ||
| if bundleEntryAdditional.Hash != bundleEntryExisting.Hash { | ||
| diffEntries = append(diffEntries, DiffEntry{ | ||
| Type: DiffEntryTypeDif, | ||
| Name: nameWithPath, | ||
| Existing: bundleEntryExisting, | ||
| Additional: bundleEntryAdditional, | ||
| }) | ||
| } | ||
| } else { | ||
| diffEntries = append(diffEntries, DiffEntry{ | ||
| Type: DiffEntryTypeDel, | ||
| Name: nameWithPath, | ||
| Existing: bundleEntryExisting, | ||
| }) | ||
| } | ||
| } | ||
| for nameWithPath, bundleEntryAdditional := range bundleEntriesAdditional { | ||
| _, ok := bundleEntriesExisting[nameWithPath] | ||
| if !ok { | ||
| diffEntries = append(diffEntries, DiffEntry{ | ||
| Type: DiffEntryTypeAdd, | ||
| Name: nameWithPath, | ||
| Additional: bundleEntryAdditional, | ||
| }) | ||
| } | ||
| } | ||
| return BundleDiff{ | ||
| Entries: diffEntries, | ||
| }, nil | ||
| } |
Oops, something went wrong.