github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-28 07:37:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1928 from mtrmac/inspect-duplicated

Browse Source 
Avoid duplicated code in `skopeo inspect`
This commit is contained in:
Valentin Rothberg 2023-02-28 09:14:18 +01:00 committed by GitHub
commit a1c9655cff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/skopeo/inspect.go
View File

@ -72,8 +72,6 @@ func (opts *inspectOptions) run(args []string, stdout io.Writer) (retErr error)
rawManifest []byte rawManifest []byte
src types.ImageSource src types.ImageSource
imgInspect *types.ImageInspectInfo imgInspect *types.ImageInspectInfo
rpt *report.Formatter
data []any
) )
ctx, cancel := opts.global.commandTimeoutContext() ctx, cancel := opts.global.commandTimeoutContext()
defer cancel() defer cancel()
@ -150,22 +148,7 @@ func (opts *inspectOptions) run(args []string, stdout io.Writer) (retErr error)
}, opts.retryOpts); err != nil { }, opts.retryOpts); err != nil {
return fmt.Errorf("Error reading OCI-formatted configuration data: %w", err) return fmt.Errorf("Error reading OCI-formatted configuration data: %w", err)
} }
if report.IsJSON(opts.format) || opts.format == "" { if err := opts.writeOutput(stdout, config); err != nil {
var out []byte
out, err = json.MarshalIndent(config, "", " ")
if err == nil {
fmt.Fprintf(stdout, "%s\n", string(out))
}
} else {
rpt, err = report.New(stdout, "skopeo inspect").Parse(report.OriginUser, opts.format)
if err != nil {
return err
}
defer rpt.Flush()
data = append(data, config)
err = rpt.Execute(data)
}
if err != nil {
return fmt.Errorf("Error writing OCI-formatted configuration data to standard output: %w", err) return fmt.Errorf("Error writing OCI-formatted configuration data to standard output: %w", err)
} }
return nil return nil
@ -231,19 +214,23 @@ func (opts *inspectOptions) run(args []string, stdout io.Writer) (retErr error)
logrus.Warnf("Registry disallows tag list retrieval; skipping") logrus.Warnf("Registry disallows tag list retrieval; skipping")
} }
} }
return opts.writeOutput(stdout, outputData)
}
// writeOutput writes data depending on opts.format to stdout
func (opts *inspectOptions) writeOutput(stdout io.Writer, data any) error {
if report.IsJSON(opts.format) || opts.format == "" { if report.IsJSON(opts.format) || opts.format == "" {
out, err := json.MarshalIndent(outputData, "", " ") out, err := json.MarshalIndent(data, "", " ")
if err == nil { if err == nil {
fmt.Fprintf(stdout, "%s\n", string(out)) fmt.Fprintf(stdout, "%s\n", string(out))
} }
return err return err
} }
rpt, err = report.New(stdout, "skopeo inspect").Parse(report.OriginUser, opts.format) rpt, err := report.New(stdout, "skopeo inspect").Parse(report.OriginUser, opts.format)
if err != nil { if err != nil {
return err return err
} }
defer rpt.Flush() defer rpt.Flush()
data = append(data, outputData) return rpt.Execute([]any{data})
return rpt.Execute(data)
} }