db99092334
This change implements `mapper.Encode` "for real" (that is, in a way
that isn't a complete embarrassment). It uses the obvious reflection
trickery to encode a tagged struct and its values as a JSON-like
in-memory map and collection of keyed values.
During this, I took the opportunity to also clean up a few other things
that had been bugging me. Namely, the presence of `mapper.Object` was
always error prone, since it isn't a true "typedef" in the sence that
it carries extra RTTI. Instead of doing that, let's just use the real
`map[string]interface{}` "JSON-map-like" object type. Even better, we
no longer require resource providers to deal with the mapper
infrastructure. Instead, the `Check` function can simply return an
array of errors. It's still best practice to return field-specific errors
to facilitate better diagnostics, but it's no longer required; and I've
added `resource.NewFieldError` to eliminate the need to import mapper.
As of this change, we can also consistently emit RPC structs with `lumi`
tags, rather than `lumi` tags on the way in and `json` on the way out.
This completes pulumi/lumi#183.
59 lines
2.3 KiB
Go
59 lines
2.3 KiB
Go
// Licensed to Pulumi Corporation ("Pulumi") under one or more
|
|
// contributor license agreements. See the NOTICE file distributed with
|
|
// this work for additional information regarding copyright ownership.
|
|
// Pulumi licenses this file to You 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 resource
|
|
|
|
import (
|
|
"reflect"
|
|
|
|
"github.com/pulumi/lumi/pkg/util/mapper"
|
|
"github.com/pulumi/lumi/sdk/go/pkg/lumirpc"
|
|
)
|
|
|
|
// NewCheckError creates a new error pertaining to a resource. Note that it just turns around and defers to
|
|
// the same mapping infrastructure used for serialization and deserialization, but it presents a nicer interface.
|
|
func NewCheckError(errs []error) error {
|
|
return mapper.NewMappingError(errs)
|
|
}
|
|
|
|
// NewFieldError creates a new error pertaining to a resource's field. Note that it just turns around and defers to
|
|
// the same mapping infrastructure used for serialization and deserialization, but it presents a nicer interface.
|
|
func NewFieldError(ty reflect.Type, fld string, err error) error {
|
|
return mapper.NewFieldError(ty, fld, err)
|
|
}
|
|
|
|
// NewCheckResponse produces a response with property validation failures from the given array of mapper failures.
|
|
func NewCheckResponse(err error) *lumirpc.CheckResponse {
|
|
var failures []*lumirpc.CheckFailure
|
|
if err != nil {
|
|
switch e := err.(type) {
|
|
case mapper.MappingError:
|
|
for _, failure := range e.Failures() {
|
|
switch f := failure.(type) {
|
|
case mapper.FieldError:
|
|
failures = append(failures, &lumirpc.CheckFailure{
|
|
Property: f.Field(),
|
|
Reason: f.Reason(),
|
|
})
|
|
default:
|
|
failures = append(failures, &lumirpc.CheckFailure{Reason: f.Error()})
|
|
}
|
|
}
|
|
default:
|
|
failures = append(failures, &lumirpc.CheckFailure{Reason: e.Error()})
|
|
}
|
|
}
|
|
return &lumirpc.CheckResponse{Failures: failures}
|
|
}
|