From e1d6d74985db4b9d01638aeb810840975af675d7 Mon Sep 17 00:00:00 2001 From: Patrick Zheng Date: Mon, 9 Oct 2023 10:27:28 +0800 Subject: [PATCH] fixed trust policy import Signed-off-by: Patrick Zheng --- cmd/notation/policy/import.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/cmd/notation/policy/import.go b/cmd/notation/policy/import.go index adeee4f70..d4d360514 100644 --- a/cmd/notation/policy/import.go +++ b/cmd/notation/policy/import.go @@ -53,21 +53,6 @@ Example - Import trust policy configuration from a file: } func runImport(command *cobra.Command, opts importOpts) error { - // optional confirmation - if !opts.force { - if _, err := trustpolicy.LoadDocument(); err == nil { - confirmed, err := cmdutil.AskForConfirmation(os.Stdin, "Existing trust policy configuration found, do you want to overwrite it?", opts.force) - if err != nil { - return err - } - if !confirmed { - return nil - } - } - } else { - fmt.Fprintln(os.Stderr, "Warning: existing trust policy configuration file will be overwritten") - } - // read configuration policyJSON, err := os.ReadFile(opts.filePath) if err != nil { @@ -83,6 +68,21 @@ func runImport(command *cobra.Command, opts importOpts) error { return fmt.Errorf("failed to validate trust policy: %w", err) } + // optional confirmation + if !opts.force { + if _, err := trustpolicy.LoadDocument(); err == nil { + confirmed, err := cmdutil.AskForConfirmation(os.Stdin, "Existing trust policy configuration found, do you want to overwrite it?", opts.force) + if err != nil { + return err + } + if !confirmed { + return nil + } + } + } else { + fmt.Fprintln(os.Stderr, "Warning: existing trust policy configuration file will be overwritten") + } + // write policyPath, err := dir.ConfigFS().SysPath(dir.PathTrustPolicy) if err != nil {