Skip to content

Commit 576bbb3

Browse files
committed
flags should be checked before podman login
1 parent faff755 commit 576bbb3

3 files changed

Lines changed: 17 additions & 18 deletions

File tree

mgradm/cmd/install/podman/utils.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ func installForPodman(
3838
if err != nil {
3939
return err
4040
}
41+
flags.ServerFlags.CheckParameters()
42+
flags.Installation.CheckParameters(cmd, "podman")
43+
if _, err := exec.LookPath("podman"); err != nil {
44+
return errors.New(L("install podman before running this command"))
45+
}
4146

4247
authFile, cleaner, err := shared_podman.PodmanLogin(hostData, flags.Installation.SCC, flags.Image)
4348
if err != nil {
@@ -51,12 +56,6 @@ func installForPodman(
5156
)
5257
}
5358

54-
flags.ServerFlags.CheckParameters()
55-
flags.Installation.CheckParameters(cmd, "podman")
56-
if _, err := exec.LookPath("podman"); err != nil {
57-
return errors.New(L("install podman before running this command"))
58-
}
59-
6059
fqdn, err := utils.GetFqdn(args)
6160
if err != nil {
6261
return err

mgradm/cmd/migrate/podman/utils.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ func migrateToPodman(
3030
return err
3131
}
3232

33-
authFile, cleaner, err := podman_utils.PodmanLogin(hostData, flags.Installation.SCC, flags.Image)
34-
if err != nil {
35-
return utils.Errorf(err, L("failed to login to registry.suse.com"))
36-
}
37-
defer cleaner()
38-
3933
flags.ServerFlags.CheckParameters()
4034
flags.Installation.CheckUpgradeParameters(cmd, "podman")
4135
if _, err := exec.LookPath("podman"); err != nil {
4236
return errors.New(L("install podman before running this command"))
4337
}
4438

39+
authFile, cleaner, err := podman_utils.PodmanLogin(hostData, flags.Installation.SCC, flags.Image)
40+
if err != nil {
41+
return utils.Errorf(err, L("failed to login to registry.suse.com"))
42+
}
43+
defer cleaner()
44+
4545
return podman.Migrate(
4646
systemd, authFile,
4747
flags.Image.Registry,

mgradm/cmd/upgrade/podman/utils.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ func upgradePodman(_ *types.GlobalFlags, flags *podmanUpgradeFlags, cmd *cobra.C
2424
return err
2525
}
2626

27-
authFile, cleaner, err := shared_podman.PodmanLogin(hostData, flags.Installation.SCC, flags.Image)
28-
if err != nil {
29-
return utils.Errorf(err, L("failed to login to registry.suse.com"))
30-
}
31-
defer cleaner()
32-
3327
flags.ServerFlags.CheckParameters()
3428
flags.Installation.CheckUpgradeParameters(cmd, "podman")
3529
if _, err := exec.LookPath("podman"); err != nil {
3630
return errors.New(L("install podman before running this command"))
3731
}
3832

33+
authFile, cleaner, err := shared_podman.PodmanLogin(hostData, flags.Installation.SCC, flags.Image)
34+
if err != nil {
35+
return utils.Errorf(err, L("failed to login to registry.suse.com"))
36+
}
37+
defer cleaner()
38+
3939
return podman.Upgrade(
4040
systemd, authFile,
4141
flags.Image.Registry,

0 commit comments

Comments
 (0)