Don't render emoji on Windows. Fixes #159.

pulumi · Jul 13, 2019 · 73dd30b · 73dd30b
1 parent a8047e5
commit 73dd30b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## 0.25.3 (Unreleased)
 
+### Supported Kubernetes versions
+
+- v1.15.x
+- v1.14.x
+- v1.13.x
+
+### Bug fixes
+
+-   Don't render emoji on Windows. (https://github.com/pulumi/pulumi-kubernetes/pull/634)
+
 ## 0.25.2 (July 11, 2019)
 
 ### Supported Kubernetes versions
@@ -10,7 +20,7 @@
 
 ### Improvements
 
--   The Kubernetes provider can now communicate detailed information about the difference between a resource's 
+-   The Kubernetes provider can now communicate detailed information about the difference between a resource's
 desired and actual state during a Pulumi update. (https://github.com/pulumi/pulumi-kubernetes/pull/618).
 -   Refactor Pod await logic for easier testing and maintenance (https://github.com/pulumi/pulumi-kubernetes/pull/590).
 -   Update to client-go v12.0.0 (https://github.com/pulumi/pulumi-kubernetes/pull/621).
@@ -72,7 +82,7 @@ desired and actual state during a Pulumi update. (https://github.com/pulumi/pulu
 
 BREAKING: This release changes the behavior of the provider `namespace` flag introduced
 in `0.23.0`. Previously, this flag was treated as an override, which ignored namespace
-values set directly on resources. Now, the flag is a default, and will only set the 
+values set directly on resources. Now, the flag is a default, and will only set the
 namespace if one is not already set. If you have created resources using a provider
 with the `namespace` flag set, this change may cause these resources to be recreated
 on the next update.

diff --git a/pkg/await/apps_deployment.go b/pkg/await/apps_deployment.go
@@ -6,6 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/pulumi/pulumi/pkg/util/cmdutil"
+
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"github.com/pulumi/pulumi-kubernetes/pkg/await/states"
@@ -342,7 +344,8 @@ func (dia *deploymentInitAwaiter) checkAndLogStatus() bool {
 				return false
 			}
 
-			dia.config.logStatus(diag.Info, "✅ Deployment initialization complete")
+			dia.config.logStatus(diag.Info,
+				fmt.Sprintf("%s Deployment initialization complete", cmdutil.EmojiOr("✅", "")))
 			return true
 		}
 	} else {
@@ -351,7 +354,8 @@ func (dia *deploymentInitAwaiter) checkAndLogStatus() bool {
 				return false
 			}
 
-			dia.config.logStatus(diag.Info, "✅ Deployment initialization complete")
+			dia.config.logStatus(diag.Info,
+				fmt.Sprintf("%s Deployment initialization complete", cmdutil.EmojiOr("✅", "")))
 			return true
 		}
 	}

diff --git a/pkg/await/apps_statefulset.go b/pkg/await/apps_statefulset.go
@@ -5,6 +5,8 @@ import (
 	"reflect"
 	"time"
 
+	"github.com/pulumi/pulumi/pkg/util/cmdutil"
+
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"github.com/pulumi/pulumi-kubernetes/pkg/await/states"
@@ -258,7 +260,8 @@ func (sia *statefulsetInitAwaiter) await(
 // the provider.
 func (sia *statefulsetInitAwaiter) checkAndLogStatus() bool {
 	if sia.replicasReady && sia.revisionReady {
-		sia.config.logStatus(diag.Info, "✅ StatefulSet initialization complete")
+		sia.config.logStatus(diag.Info,
+			fmt.Sprintf("%s StatefulSet initialization complete", cmdutil.EmojiOr("✅", "")))
 		return true
 	}
 

diff --git a/pkg/await/core_service.go b/pkg/await/core_service.go
@@ -1,17 +1,20 @@
 package await
 
 import (
+	"fmt"
 	"reflect"
 	"time"
 
+	"github.com/pulumi/pulumi/pkg/util/cmdutil"
+
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"github.com/pulumi/pulumi-kubernetes/pkg/clients"
 	"github.com/pulumi/pulumi-kubernetes/pkg/kinds"
 	"github.com/pulumi/pulumi-kubernetes/pkg/metadata"
 	"github.com/pulumi/pulumi-kubernetes/pkg/openapi"
 	"github.com/pulumi/pulumi/pkg/diag"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -426,7 +429,8 @@ func (sia *serviceInitAwaiter) checkAndLogStatus(version serverVersion) bool {
 
 	success := sia.serviceReady && sia.endpointsSettled && sia.endpointsReady
 	if success {
-		sia.config.logStatus(diag.Info, "✅ Service initialization complete")
+		sia.config.logStatus(diag.Info,
+			fmt.Sprintf("%s Service initialization complete", cmdutil.EmojiOr("✅", "")))
 	} else if sia.endpointsSettled && sia.endpointsReady {
 		sia.config.logStatus(diag.Info, "[2/3] Attempting to allocate IP address to Service")
 	}

diff --git a/pkg/await/extensions_ingress.go b/pkg/await/extensions_ingress.go
@@ -6,6 +6,8 @@ import (
 	"reflect"
 	"time"
 
+	"github.com/pulumi/pulumi/pkg/util/cmdutil"
+
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"github.com/pulumi/pulumi-kubernetes/pkg/clients"
@@ -402,7 +404,8 @@ func (iia *ingressInitAwaiter) errorMessages() []string {
 func (iia *ingressInitAwaiter) checkAndLogStatus() bool {
 	success := iia.ingressReady && iia.checkIfEndpointsReady()
 	if success {
-		iia.config.logStatus(diag.Info, "✅ Ingress initialization complete")
+		iia.config.logStatus(diag.Info,
+			fmt.Sprintf("%s Ingress initialization complete", cmdutil.EmojiOr("✅", "")))
 	} else if iia.checkIfEndpointsReady() {
 		iia.config.logStatus(diag.Info, "[2/3] Waiting for update of .status.loadBalancer with hostname/IP")
 	}