02ffff8840
* Plumbing the custom timeouts from the engine to the providers
* Plumbing the CustomTimeouts through to the engine and adding test to show this
* Change the provider proto to include individual timeouts
* Plumbing the CustomTimeouts from the engine through to the Provider RPC interface
* Change how the CustomTimeouts are sent across RPC
These errors were spotted in testing. We can now see that the timeout
information is arriving in the RegisterResourceRequest
```
req=&pulumirpc.RegisterResourceRequest{
Type: "aws:s3/bucket:Bucket",
Name: "my-bucket",
Parent: "urn:pulumi:dev::aws-vpc::pulumi:pulumi:Stack::aws-vpc-dev",
Custom: true,
Object: &structpb.Struct{},
Protect: false,
Dependencies: nil,
Provider: "",
PropertyDependencies: {},
DeleteBeforeReplace: false,
Version: "",
IgnoreChanges: nil,
AcceptSecrets: true,
AdditionalSecretOutputs: nil,
Aliases: nil,
CustomTimeouts: &pulumirpc.RegisterResourceRequest_CustomTimeouts{
Create: 300,
Update: 400,
Delete: 500,
XXX_NoUnkeyedLiteral: struct {}{},
XXX_unrecognized: nil,
XXX_sizecache: 0,
},
XXX_NoUnkeyedLiteral: struct {}{},
XXX_unrecognized: nil,
XXX_sizecache: 0,
}
```
* Changing the design to use strings
* CHANGELOG entry to include the CustomTimeouts work
* Changing custom timeouts to be passed around the engine as converted value
We don't want to pass around strings - the user can provide it but we want
to make the engine aware of the timeout in seconds as a float64
72 lines
3.5 KiB
Go
72 lines
3.5 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 resource
|
|
|
|
import (
|
|
"github.com/pulumi/pulumi/pkg/tokens"
|
|
)
|
|
|
|
// Goal is a desired state for a resource object. Normally it represents a subset of the resource's state expressed by
|
|
// a program, however if Output is true, it represents a more complete, post-deployment view of the state.
|
|
type Goal struct {
|
|
Type tokens.Type // the type of resource.
|
|
Name tokens.QName // the name for the resource's URN.
|
|
Custom bool // true if this resource is custom, managed by a plugin.
|
|
Properties PropertyMap // the resource's property state.
|
|
Parent URN // an optional parent URN for this resource.
|
|
Protect bool // true to protect this resource from deletion.
|
|
Dependencies []URN // dependencies of this resource object.
|
|
Provider string // the provider to use for this resource.
|
|
InitErrors []string // errors encountered as we attempted to initialize the resource.
|
|
PropertyDependencies map[PropertyKey][]URN // the set of dependencies that affect each property.
|
|
DeleteBeforeReplace bool // true if this resource should be deleted prior to replacement.
|
|
IgnoreChanges []string // a list of property names to ignore during changes.
|
|
AdditionalSecretOutputs []PropertyKey // outputs that should always be treated as secrets.
|
|
Aliases []URN // additional URNs that should be aliased to this resource.
|
|
ID ID // the expected ID of the resource, if any.
|
|
CustomTimeouts CustomTimeouts // an optional config object for resource options
|
|
}
|
|
|
|
// NewGoal allocates a new resource goal state.
|
|
func NewGoal(t tokens.Type, name tokens.QName, custom bool, props PropertyMap,
|
|
parent URN, protect bool, dependencies []URN, provider string, initErrors []string,
|
|
propertyDependencies map[PropertyKey][]URN, deleteBeforeReplace bool, ignoreChanges []string,
|
|
additionalSecretOutputs []PropertyKey, aliases []URN, id ID, customTimeouts *CustomTimeouts) *Goal {
|
|
|
|
g := &Goal{
|
|
Type: t,
|
|
Name: name,
|
|
Custom: custom,
|
|
Properties: props,
|
|
Parent: parent,
|
|
Protect: protect,
|
|
Dependencies: dependencies,
|
|
Provider: provider,
|
|
InitErrors: initErrors,
|
|
PropertyDependencies: propertyDependencies,
|
|
DeleteBeforeReplace: deleteBeforeReplace,
|
|
IgnoreChanges: ignoreChanges,
|
|
AdditionalSecretOutputs: additionalSecretOutputs,
|
|
Aliases: aliases,
|
|
ID: id,
|
|
}
|
|
|
|
if customTimeouts != nil {
|
|
g.CustomTimeouts = *customTimeouts
|
|
}
|
|
|
|
return g
|
|
}
|