This commit reverts most of #1853 and replaces it with functionally identical logic, using the notion of status message-specific sinks. In other words, where the original commit implemented ephemeral status messages by adding an `isStatus` parameter to most of the logging methdos in pulumi/pulumi, this implements ephemeral status messages as a parallel logging sink, which emits _only_ ephemeral status messages. The original commit message in that PR was: > Allow log events to be marked "status" events > > This commit will introduce a field, IsStatus to LogRequest. A "status" > logging event will be displayed in the Info column of the main > display, but will not be printed out at the end, when resource > operations complete. > > For example, for complex resource initialization, we'd like to display > a series of intermediate results: [1/4] Service object created, for > example. We'd like these to appear in the Info column, but not at the > end, where they are not helpful to the user.
91 lines
2.7 KiB
Go
91 lines
2.7 KiB
Go
// Copyright 2016-2018, Pulumi Corporation.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package provider
|
|
|
|
import (
|
|
"golang.org/x/net/context"
|
|
"google.golang.org/grpc"
|
|
|
|
"github.com/pulumi/pulumi/pkg/diag"
|
|
"github.com/pulumi/pulumi/pkg/resource"
|
|
"github.com/pulumi/pulumi/pkg/util/contract"
|
|
"github.com/pulumi/pulumi/pkg/util/rpcutil"
|
|
lumirpc "github.com/pulumi/pulumi/sdk/proto/go"
|
|
)
|
|
|
|
// HostClient is a client interface into the host's engine RPC interface.
|
|
type HostClient struct {
|
|
conn *grpc.ClientConn
|
|
client lumirpc.EngineClient
|
|
}
|
|
|
|
// NewHostClient dials the target address, connects over gRPC, and returns a client interface.
|
|
func NewHostClient(addr string) (*HostClient, error) {
|
|
conn, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithUnaryInterceptor(
|
|
rpcutil.OpenTracingClientInterceptor(),
|
|
))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &HostClient{
|
|
conn: conn,
|
|
client: lumirpc.NewEngineClient(conn),
|
|
}, nil
|
|
}
|
|
|
|
// Close closes and renders the connection and client unusable.
|
|
func (host *HostClient) Close() error {
|
|
return host.conn.Close()
|
|
}
|
|
|
|
func (host *HostClient) log(
|
|
context context.Context, sev diag.Severity, urn resource.URN, msg string, ephemeral bool,
|
|
) error {
|
|
var rpcsev lumirpc.LogSeverity
|
|
switch sev {
|
|
case diag.Debug:
|
|
rpcsev = lumirpc.LogSeverity_DEBUG
|
|
case diag.Info:
|
|
rpcsev = lumirpc.LogSeverity_INFO
|
|
case diag.Warning:
|
|
rpcsev = lumirpc.LogSeverity_WARNING
|
|
case diag.Error:
|
|
rpcsev = lumirpc.LogSeverity_ERROR
|
|
default:
|
|
contract.Failf("Unrecognized log severity type: %v", sev)
|
|
}
|
|
_, err := host.client.Log(context, &lumirpc.LogRequest{
|
|
Severity: rpcsev,
|
|
Message: msg,
|
|
Urn: string(urn),
|
|
Ephemeral: ephemeral,
|
|
})
|
|
return err
|
|
}
|
|
|
|
// Log logs a global message, including errors and warnings.
|
|
func (host *HostClient) Log(
|
|
context context.Context, sev diag.Severity, urn resource.URN, msg string,
|
|
) error {
|
|
return host.log(context, sev, urn, msg, false)
|
|
}
|
|
|
|
// LogStatus logs a global status message, including errors and warnings. Status messages will
|
|
// appear in the `Info` column of the progress display, but not in the final output.
|
|
func (host *HostClient) LogStatus(
|
|
context context.Context, sev diag.Severity, urn resource.URN, msg string,
|
|
) error {
|
|
return host.log(context, sev, urn, msg, true)
|
|
}
|