maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Enable resource reference feature by default (#5905)

Browse source 
* Enable resource reference feature by default

Unless the PULUMI_DISABLE_RESOURCE_REFERENCES flag
is explicitly set to a truthy value, the resource reference feature is now
enabled by default.

* Set AcceptResources in the language SDKs

This can be disabled by setting the `PULUMI_DISABLE_RESOURCE_REFERENCES` environment variable to a truthy value.

Co-authored-by: Justin Van Patten <jvp@justinvp.com>
This commit is contained in:
Levi Blackstone 2020-12-10 11:21:05 -07:00 committed by GitHub
parent 918615f072
commit 4d48ee0517
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 59 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -13,6 +13,9 @@ CHANGELOG
a resource references another resources that's been registered with `registerResourceModule`.
[#5914](https://github.com/pulumi/pulumi/pull/5914)
- Enable resource reference feature by default.
[#5905](https://github.com/pulumi/pulumi/pull/5905)
## 2.15.4 (2020-12-08)
- Fix a problem where `pulumi import` could panic on an import error due to missing error message.

7
pkg/resource/deploy/source_eval.go
View file

@ -531,7 +531,12 @@ func (rm *resmon) SupportsFeature(ctx context.Context,
case "secrets":
hasSupport = true
case "resourceReferences":
hasSupport = cmdutil.IsTruthy(os.Getenv("PULUMI_EXPERIMENTAL_RESOURCE_REFERENCES"))
hasSupport = true
// Allow the resource reference feature to be disabled by explicitly setting an env var.
if v, ok := os.LookupEnv("PULUMI_DISABLE_RESOURCE_REFERENCES"); ok && cmdutil.IsTruthy(v) {
hasSupport = false
}
}
logging.V(5).Infof("ResourceMonitor.SupportsFeature(id: %s) = %t", req.Id, hasSupport)

4
sdk/dotnet/Pulumi/Deployment/Deployment.cs
View file

@ -49,6 +49,10 @@ namespace Pulumi
internal static IDeploymentInternal InternalInstance
=> Instance.Internal;
private static readonly bool _disableResourceReferences =
Environment.GetEnvironmentVariable("PULUMI_DISABLE_RESOURCE_REFERENCES") == "1" ||
string.Equals(Environment.GetEnvironmentVariable("PULUMI_DISABLE_RESOURCE_REFERENCES"), "TRUE", StringComparison.OrdinalIgnoreCase);
private readonly string _projectName;
private readonly string _stackName;
private readonly bool _isDryRun;

1
sdk/dotnet/Pulumi/Deployment/Deployment_Invoke.cs
View file

@ -54,6 +54,7 @@ namespace Pulumi
Provider = provider ?? "",
Version = options?.Version ?? "",
Args = serialized,
AcceptResources = !_disableResourceReferences,
});
if (result.Failures.Count > 0)

1
sdk/dotnet/Pulumi/Deployment/Deployment_ReadResource.cs
View file

@ -37,6 +37,7 @@ namespace Pulumi
Properties = prepareResult.SerializedProps,
Version = options?.Version ?? "",
AcceptSecrets = true,
AcceptResources = !_disableResourceReferences,
};
request.Dependencies.AddRange(prepareResult.AllDirectDependencyURNs);

1
sdk/dotnet/Pulumi/Deployment/Deployment_RegisterResource.cs
View file

@ -78,6 +78,7 @@ namespace Pulumi
Version = options.Version ?? "",
ImportId = customOpts?.ImportId ?? "",
AcceptSecrets = true,
AcceptResources = !_disableResourceReferences,
DeleteBeforeReplace = deleteBeforeReplace ?? false,
DeleteBeforeReplaceDefined = deleteBeforeReplace != null,
CustomTimeouts = new RegisterResourceRequest.Types.CustomTimeouts

12
sdk/go/common/resource/plugin/provider_plugin.go
View file

@ -1155,7 +1155,11 @@ func (p *provider) Invoke(tok tokens.ModuleMember, args resource.PropertyMap) (r
return nil, nil, err
}
resp, err := client.Invoke(p.ctx.Request(), &pulumirpc.InvokeRequest{Tok: string(tok), Args: margs})
resp, err := client.Invoke(p.ctx.Request(), &pulumirpc.InvokeRequest{
Tok: string(tok),
Args: margs,
AcceptResources: p.acceptResources,
})
if err != nil {
rpcError := rpcerror.Convert(err)
logging.V(7).Infof("%s failed: %v", label, rpcError.Message())
@ -1216,7 +1220,11 @@ func (p *provider) StreamInvoke(
}
streamClient, err := client.StreamInvoke(
p.ctx.Request(), &pulumirpc.InvokeRequest{Tok: string(tok), Args: margs})
p.ctx.Request(), &pulumirpc.InvokeRequest{
Tok: string(tok),
Args: margs,
AcceptResources: p.acceptResources,
})
if err != nil {
rpcError := rpcerror.Convert(err)
logging.V(7).Infof("%s failed: %v", label, rpcError.Message())

15
sdk/go/pulumi/context.go
View file

@ -20,6 +20,7 @@ import (
"context"
"errors"
"fmt"
"os"
"reflect"
"sort"
"strings"
@ -29,6 +30,7 @@ import (
multierror "github.com/hashicorp/go-multierror"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil"
@ -36,6 +38,8 @@ import (
"google.golang.org/grpc"
)
var disableResourceReferences = cmdutil.IsTruthy(os.Getenv("PULUMI_DISABLE_RESOURCE_REFERENCES"))
// Context handles registration of resources and exposes metadata about the current deployment context.
type Context struct {
ctx context.Context
@ -219,10 +223,11 @@ func (ctx *Context) Invoke(tok string, args interface{}, result interface{}, opt
// Now, invoke the RPC to the provider synchronously.
logging.V(9).Infof("Invoke(%s, #args=%d): RPC call being made synchronously", tok, len(resolvedArgsMap))
resp, err := ctx.monitor.Invoke(ctx.ctx, &pulumirpc.InvokeRequest{
Tok: tok,
Args: rpcArgs,
Provider: providerRef,
Version: options.Version,
Tok: tok,
Args: rpcArgs,
Provider: providerRef,
Version: options.Version,
AcceptResources: !disableResourceReferences,
})
if err != nil {
logging.V(9).Infof("Invoke(%s, ...): error: %v", tok, err)
@ -367,6 +372,7 @@ func (ctx *Context) ReadResource(
Id: string(idToRead),
Aliases: inputs.aliases,
AcceptSecrets: true,
AcceptResources: !disableResourceReferences,
AdditionalSecretOutputs: inputs.additionalSecretOutputs,
})
if err != nil {
@ -556,6 +562,7 @@ func (ctx *Context) registerResource(
IgnoreChanges: inputs.ignoreChanges,
Aliases: inputs.aliases,
AcceptSecrets: true,
AcceptResources: !disableResourceReferences,
AdditionalSecretOutputs: inputs.additionalSecretOutputs,
Version: inputs.version,
Remote: remote,

1
sdk/nodejs/runtime/invoke.ts
View file

@ -203,6 +203,7 @@ function createInvokeRequest(tok: string, serialized: any, provider: string | un
req.setArgs(obj);
req.setProvider(provider);
req.setVersion(opts.version || "");
req.setAcceptresources(!utils.disableResourceReferences);
return req;
}

2
sdk/nodejs/runtime/resource.ts
View file

@ -216,6 +216,7 @@ export function readResource(res: Resource, t: string, name: string, props: Inpu
req.setDependenciesList(Array.from(resop.allDirectDependencyURNs));
req.setVersion(opts.version || "");
req.setAcceptsecrets(true);
req.setAcceptresources(!utils.disableResourceReferences);
req.setAdditionalsecretoutputsList((<any>opts).additionalSecretOutputs || []);
// Now run the operation, serializing the invocation if necessary.
@ -305,6 +306,7 @@ export function registerResource(res: Resource, t: string, name: string, custom:
req.setIgnorechangesList(opts.ignoreChanges || []);
req.setVersion(opts.version || "");
req.setAcceptsecrets(true);
req.setAcceptresources(!utils.disableResourceReferences);
req.setAdditionalsecretoutputsList((<any>opts).additionalSecretOutputs || []);
req.setAliasesList(resop.aliases);
req.setImportid(resop.import || "");

5
sdk/nodejs/utils.ts
View file

@ -57,3 +57,8 @@ export function values(obj: object): any[] {
export function union<T>(set1: Set<T>, set2: Set<T>) {
return new Set([...set1, ...set2]);
}
/** @internal */
export const disableResourceReferences: boolean =
process.env.PULUMI_DISABLE_RESOURCE_REFERENCES === "1" ||
(process.env.PULUMI_DISABLE_RESOURCE_REFERENCES ?? "").toUpperCase() === "TRUE";

10
sdk/python/lib/pulumi/runtime/invoke.py
View file

@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import asyncio
import os
import sys
from typing import Any, Awaitable, Optional, TYPE_CHECKING
import grpc
@ -94,8 +95,15 @@ def invoke(tok: str, props: 'Inputs', opts: Optional[InvokeOptions] = None, typ:
monitor = get_monitor()
inputs = await rpc.serialize_properties(props, {})
version = opts.version or ""
accept_resources = not (os.getenv("PULUMI_DISABLE_RESOURCE_REFERENCES", "").upper() in {"TRUE", "1"})
log.debug(f"Invoking function prepared: tok={tok}")
req = provider_pb2.InvokeRequest(tok=tok, args=inputs, provider=provider_ref, version=version)
req = provider_pb2.InvokeRequest(
tok=tok,
args=inputs,
provider=provider_ref,
version=version,
acceptResources=accept_resources,
)
def do_invoke():
try:

5
sdk/python/lib/pulumi/runtime/resource.py
View file

@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import asyncio
import os
import sys
import traceback
@ -282,6 +283,7 @@ def read_resource(res: 'CustomResource', ty: str, name: str, props: 'Inputs', op
additional_secret_outputs = map(
res.translate_input_property, opts.additional_secret_outputs)
accept_resources = not (os.getenv("PULUMI_DISABLE_RESOURCE_REFERENCES", "").upper() in {"TRUE", "1"})
req = resource_pb2.ReadResourceRequest(
type=ty,
name=name,
@ -292,6 +294,7 @@ def read_resource(res: 'CustomResource', ty: str, name: str, props: 'Inputs', op
dependencies=resolver.dependencies,
version=opts.version or "",
acceptSecrets=True,
acceptResources=accept_resources,
additionalSecretOutputs=additional_secret_outputs,
)
@ -416,6 +419,7 @@ def register_resource(res: 'Resource',
else:
raise Exception("Expected custom_timeouts to be a CustomTimeouts object")
accept_resources = not (os.getenv("PULUMI_DISABLE_RESOURCE_REFERENCES", "").upper() in {"TRUE", "1"})
req = resource_pb2.RegisterResourceRequest(
type=ty,
name=name,
@ -431,6 +435,7 @@ def register_resource(res: 'Resource',
ignoreChanges=ignore_changes,
version=opts.version or "",
acceptSecrets=True,
acceptResources=accept_resources,
additionalSecretOutputs=additional_secret_outputs,
importId=opts.import_,
customTimeouts=custom_timeouts,