Merge pull request #7902 from radeksm/bugfix/7792

sort styles constant and style' map - continuation of bugfix/7792

pkg/minikube/out/style.go

@@ -49,79 +49,79 @@ type style struct {
 // styles is a map of style name to style struct
 // For consistency, ensure that emojis added render with the same width across platforms.
 var styles = map[StyleEnum]style{
+	Celebration:   {Prefix: "🎉  "},
+	Check:         {Prefix: "✅  "},
+	Command:       {Prefix: "    ▪ ", LowPrefix: lowIndent}, // Indented bullet
+	Conflict:      {Prefix: "💥  ", LowPrefix: lowWarning},
+	Confused:      {Prefix: "😕  "},
+	Deleted:       {Prefix: "💀  "},
+	Documentation: {Prefix: "📘  "},
 	Empty:         {Prefix: "", LowPrefix: ""},
-	Happy:         {Prefix: "😄  "},
-	SuccessType:   {Prefix: "✅  "},
 	FailureType:   {Prefix: "❌  "},
-	Conflict:      {Prefix: "💥  ", LowPrefix: lowWarning},
 	FatalType:     {Prefix: "💣  ", LowPrefix: lowError},
+	Happy:         {Prefix: "😄  "},
+	Issue:         {Prefix: "    ▪ ", LowPrefix: lowIndent}, // Indented bullet
+	Issues:        {Prefix: "⁉️   "},
+	Launch:        {Prefix: "🚀  "},
+	LogEntry:      {Prefix: "    "}, // Indent
+	New:           {Prefix: "🆕  "},
 	Notice:        {Prefix: "📌  "},
-	Ready:         {Prefix: "🏄  "},
-	Running:       {Prefix: "🏃  "},
+	Option:        {Prefix: "    ▪ ", LowPrefix: lowIndent}, // Indented bullet
+	Pause:         {Prefix: "⏸️  "},
 	Provisioning:  {Prefix: "🌱  "},
+	Ready:         {Prefix: "🏄  "},
 	Restarting:    {Prefix: "🔄  "},
-	Stopping:      {Prefix: "✋  "},
-	Stopped:       {Prefix: "🛑  "},
-	Warning:       {Prefix: "❗  ", LowPrefix: lowWarning},
-	Waiting:       {Prefix: "⌛  "},
-	Usage:         {Prefix: "💡  "},
-	Launch:        {Prefix: "🚀  "},
+	Running:       {Prefix: "🏃  "},
 	Sad:           {Prefix: "😿  "},
-	ThumbsUp:      {Prefix: "👍  "},
+	Shrug:         {Prefix: "🤷  "},
+	Sparkle:       {Prefix: "✨  "},
+	Stopped:       {Prefix: "🛑  "},
+	Stopping:      {Prefix: "✋  "},
+	SuccessType:   {Prefix: "✅  "},
 	ThumbsDown:    {Prefix: "👎  "},
-	Option:        {Prefix: "    ▪ ", LowPrefix: lowIndent}, // Indented bullet
-	Command:       {Prefix: "    ▪ ", LowPrefix: lowIndent}, // Indented bullet
-	LogEntry:      {Prefix: "    "},                         // Indent
-	Deleted:       {Prefix: "💀  "},
+	ThumbsUp:      {Prefix: "👍  "},
+	Unpause:       {Prefix: "⏯️  "},
 	URL:           {Prefix: "👉  ", LowPrefix: lowIndent},
-	Documentation: {Prefix: "📘  "},
-	Issues:        {Prefix: "⁉️   "},
-	Issue:         {Prefix: "    ▪ ", LowPrefix: lowIndent}, // Indented bullet
-	Check:         {Prefix: "✅  "},
-	Celebration:   {Prefix: "🎉  "},
+	Usage:         {Prefix: "💡  "},
+	Waiting:       {Prefix: "⌛  "},
+	Warning:       {Prefix: "❗  ", LowPrefix: lowWarning},
 	Workaround:    {Prefix: "👉  ", LowPrefix: lowIndent},
-	Sparkle:       {Prefix: "✨  "},
-	Pause:         {Prefix: "⏸️  "},
-	Unpause:       {Prefix: "⏯️  "},
-	Confused:      {Prefix: "😕  "},
-	Shrug:         {Prefix: "🤷  "},
-	New:           {Prefix: "🆕  "},
 
 	// Specialized purpose styles
-	ISODownload:      {Prefix: "💿  "},
-	FileDownload:     {Prefix: "💾  "},
+	AddonDisable:     {Prefix: "🌑  "},
+	AddonEnable:      {Prefix: "🌟  "},
 	Caching:          {Prefix: "🤹  "},
-	StartingVM:       {Prefix: "🔥  "},
-	StartingNone:     {Prefix: "🤹  "},
-	Provisioner:      {Prefix: "ℹ️  "},
-	Resetting:        {Prefix: "🔄  "},
-	DeletingHost:     {Prefix: "🔥  "},
-	Copying:          {Prefix: "✨  "},
-	Connectivity:     {Prefix: "📶  "},
-	Internet:         {Prefix: "🌐  "},
-	Mounting:         {Prefix: "📁  "},
 	Celebrate:        {Prefix: "🎉  "},
+	Connectivity:     {Prefix: "📶  "},
+	Containerd:       {Prefix: "📦  "},
 	ContainerRuntime: {Prefix: "🎁  "},
-	Docker:           {Prefix: "🐳  "},
+	Copying:          {Prefix: "✨  "},
 	CRIO:             {Prefix: "🎁  "}, // This should be a snow-flake, but the emoji has a strange width on macOS
-	Containerd:       {Prefix: "📦  "},
-	Permissions:      {Prefix: "🔑  "},
+	DeletingHost:     {Prefix: "🔥  "},
+	Docker:           {Prefix: "🐳  "},
+	DryRun:           {Prefix: "🌵  "},
+	Embarrassed:      {Prefix: "🤦  ", LowPrefix: lowWarning},
 	Enabling:         {Prefix: "🔌  "},
-	Shutdown:         {Prefix: "🛑  "},
-	Pulling:          {Prefix: "🚜  "},
+	FileDownload:     {Prefix: "💾  "},
+	Fileserver:       {Prefix: "🚀  ", OmitNewline: true},
 	HealthCheck:      {Prefix: "🔎  "},
-	Verifying:        {Prefix: "🤔  "},
-	VerifyingNoLine:  {Prefix: "🤔  ", OmitNewline: true},
+	Internet:         {Prefix: "🌐  "},
+	ISODownload:      {Prefix: "💿  "},
 	Kubectl:          {Prefix: "💗  "},
 	Meh:              {Prefix: "🙄  ", LowPrefix: lowWarning},
-	Embarrassed:      {Prefix: "🤦  ", LowPrefix: lowWarning},
+	Mounting:         {Prefix: "📁  "},
+	MountOptions:     {Prefix: "💾  "},
+	Permissions:      {Prefix: "🔑  "},
+	Provisioner:      {Prefix: "ℹ️  "},
+	Pulling:          {Prefix: "🚜  "},
+	Resetting:        {Prefix: "🔄  "},
+	Shutdown:         {Prefix: "🛑  "},
+	StartingNone:     {Prefix: "🤹  "},
+	StartingVM:       {Prefix: "🔥  "},
 	Tip:              {Prefix: "💡  "},
 	Unmount:          {Prefix: "🔥  "},
-	MountOptions:     {Prefix: "💾  "},
-	Fileserver:       {Prefix: "🚀  ", OmitNewline: true},
-	DryRun:           {Prefix: "🌵  "},
-	AddonEnable:      {Prefix: "🌟  "},
-	AddonDisable:     {Prefix: "🌑  "},
+	VerifyingNoLine:  {Prefix: "🤔  ", OmitNewline: true},
+	Verifying:        {Prefix: "🤔  "},
 }
 
 // Add a prefix to a string

pkg/minikube/out/style_enum.go

@@ -21,76 +21,76 @@ type StyleEnum int
 
 // All the Style constants available
 const (
-	Happy StyleEnum = iota
-	SuccessType
-	FailureType
+	AddonDisable StyleEnum = iota
+	AddonEnable
+	Caching
+	Celebrate
 	Celebration
-	Conflict
-	FatalType
-	Notice
-	Ready
-	Running
-	Provisioning
-	Restarting
-	Stopping
-	Stopped
-	Warning
-	Waiting
-	WaitingPods
-	Usage
-	Launch
-	Sad
-	ThumbsUp
-	ThumbsDown
-	Option
-	Command
-	LogEntry
-	Deleted
-	URL
-	Documentation
-	Issues
-	Issue
 	Check
-	ISODownload
-	FileDownload
-	Caching
-	StartingVM
-	StartingNone
-	Provisioner
-	Resetting
-	DeletingHost
-	Copying
-	Connectivity
+	Command
+	Conflict
 	Confused
-	Internet
-	Mounting
-	Celebrate
+	Connectivity
+	Containerd
 	ContainerRuntime
-	Docker
+	Copying
 	CRIO
-	Containerd
-	Permissions
+	Deleted
+	DeletingHost
+	Docker
+	Documentation
+	DryRun
+	Embarrassed
+	Empty
 	Enabling
-	Shutdown
-	Pulling
+	FailureType
+	FatalType
+	FileDownload
+	Fileserver
+	Happy
 	HealthCheck
-	Verifying
-	VerifyingNoLine
+	Internet
+	ISODownload
+	Issue
+	Issues
 	Kubectl
+	Launch
+	LogEntry
 	Meh
-	Embarrassed
-	Tip
-	Unmount
+	Mounting
 	MountOptions
-	Fileserver
-	Empty
-	Workaround
-	Sparkle
+	New
+	Notice
+	Option
 	Pause
-	Unpause
-	DryRun
-	AddonEnable
-	AddonDisable
+	Permissions
+	Provisioner
+	Provisioning
+	Pulling
+	Ready
+	Resetting
+	Restarting
+	Running
+	Sad
 	Shrug
-	New
+	Shutdown
+	Sparkle
+	StartingNone
+	StartingVM
+	Stopped
+	Stopping
+	SuccessType
+	ThumbsDown
+	ThumbsUp
+	Tip
+	Unmount
+	Unpause
+	URL
+	Usage
+	Verifying
+	VerifyingNoLine
+	Waiting
+	WaitingPods
+	Warning
+	Workaround
 )