mirror of
https://github.com/podman-container-tools/podman.git
synced 2026-08-05 16:35:45 +00:00
8f6a0243f4
First, make podman diff accept optionally a second argument. This allows the user to specify a second image/container to compare the first with. If it is not set the parent layer will be used as before. Second, podman container diff should only use containers and podman image diff should only use images. Previously, podman container diff would use the image when both an image and container with this name exists. To make this work two new parameters have been added to the api. If they are not used the previous behaviour is used. The same applies to the bindings. Fixes #10649 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
79 lines
2.1 KiB
Go
79 lines
2.1 KiB
Go
package diff
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/containers/common/pkg/report"
|
|
"github.com/containers/podman/v3/cmd/podman/registry"
|
|
"github.com/containers/podman/v3/pkg/domain/entities"
|
|
"github.com/docker/docker/pkg/archive"
|
|
"github.com/pkg/errors"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
func Diff(cmd *cobra.Command, args []string, options entities.DiffOptions) error {
|
|
results, err := registry.ContainerEngine().Diff(registry.GetContext(), args, options)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
switch {
|
|
case report.IsJSON(options.Format):
|
|
return changesToJSON(results)
|
|
case options.Format == "":
|
|
return changesToTable(results)
|
|
default:
|
|
return errors.New("only supported value for '--format' is 'json'")
|
|
}
|
|
}
|
|
|
|
type ChangesReportJSON struct {
|
|
Changed []string `json:"changed,omitempty"`
|
|
Added []string `json:"added,omitempty"`
|
|
Deleted []string `json:"deleted,omitempty"`
|
|
}
|
|
|
|
func changesToJSON(diffs *entities.DiffReport) error {
|
|
body := ChangesReportJSON{}
|
|
for _, row := range diffs.Changes {
|
|
switch row.Kind {
|
|
case archive.ChangeAdd:
|
|
body.Added = append(body.Added, row.Path)
|
|
case archive.ChangeDelete:
|
|
body.Deleted = append(body.Deleted, row.Path)
|
|
case archive.ChangeModify:
|
|
body.Changed = append(body.Changed, row.Path)
|
|
default:
|
|
return errors.Errorf("output kind %q not recognized", row.Kind)
|
|
}
|
|
}
|
|
|
|
// Pull in configured json library
|
|
enc := json.NewEncoder(os.Stdout)
|
|
enc.SetIndent("", " ")
|
|
return enc.Encode(body)
|
|
}
|
|
|
|
func changesToTable(diffs *entities.DiffReport) error {
|
|
for _, row := range diffs.Changes {
|
|
fmt.Fprintln(os.Stdout, row.String())
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// IDOrLatestArgs used to validate a nameOrId was provided or the "--latest" flag
|
|
func ValidateContainerDiffArgs(cmd *cobra.Command, args []string) error {
|
|
given, _ := cmd.Flags().GetBool("latest")
|
|
if len(args) > 0 && !given {
|
|
return cobra.RangeArgs(1, 2)(cmd, args)
|
|
}
|
|
if len(args) > 0 && given {
|
|
return errors.New("--latest and containers cannot be used together")
|
|
}
|
|
if len(args) == 0 && !given {
|
|
return errors.Errorf("%q requires a name, id, or the \"--latest\" flag", cmd.CommandPath())
|
|
}
|
|
return nil
|
|
}
|