check install date is set

canonical · Nov 14, 2024 · cf0ddec · cf0ddec
1 parent dee0603
commit cf0ddec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/k8s/cmd/k8s/k8s_bootstrap.go b/src/k8s/cmd/k8s/k8s_bootstrap.go
@@ -60,7 +60,7 @@ func newBootstrapCmd(env cmdutil.ExecutionEnvironment) *cobra.Command {
 				env.Exit(1)
 				return
 			}
-			if microk8sInfo.StatusCode == 200 && !microk8sInfo.Result.InstallDate.IsZero() {
+			if microk8sInfo.StatusCode == 200 && microk8sInfo.HasInstallDate() {
 				cmd.PrintErrln("Error: microk8s snap is installed. Please remove it using the following command and try again:\n\n  sudo snap remove microk8s")
 				env.Exit(1)
 				return

diff --git a/src/k8s/pkg/client/snapd/snap_info.go b/src/k8s/pkg/client/snapd/snap_info.go
@@ -35,3 +35,7 @@ func (c *Client) GetSnapInfo(snap string) (*SnapInfoResponse, error) {
 
 	return &snapInfoResponse, nil
 }
+
+func (s SnapInfoResponse) HasInstallDate() bool {
+	return !s.Result.InstallDate.IsZero()
+}