Improve provider option propagation for component resources

provider/pkg/gen/_go-templates/helm/v3/chart.go

@@ -244,26 +244,23 @@ func NewChart(ctx *pulumi.Context,
 		},
 	})
 
-	var resourceOrInvokeOptions []pulumi.ResourceOrInvokeOption
-	for _, o := range opts {
-		if asResOrInv, ok := o.(pulumi.ResourceOrInvokeOption); ok {
-			resourceOrInvokeOptions = append(resourceOrInvokeOptions, asResOrInv)
-		}
-	}
 	opts = append(opts, aliases)
 	err := ctx.RegisterComponentResource("kubernetes:helm.sh/v3:Chart", name, chart, opts...)
 	if err != nil {
 		return nil, err
 	}
 
-	// Honor the resource name prefix if specified.
+	releaseName := name
 	if args.ResourcePrefix != "" {
-		name = args.ResourcePrefix + "-" + name
+		releaseName = args.ResourcePrefix + "-" + name
 	}
 
-	resourceOrInvokeOptions = append(resourceOrInvokeOptions, pulumi.Parent(chart))
+	parseOpts, err := yaml.GetChildOptions(chart, opts)
+	if err != nil {
+		return nil, err
+	}
 	resources := args.ToChartArgsOutput().ApplyT(func(args chartArgs) (map[string]pulumi.Resource, error) {
-		return parseChart(ctx, name, args, resourceOrInvokeOptions...)
+		return parseChart(ctx, releaseName, args, parseOpts...)
 	})
 	chart.Resources = resources
 
@@ -287,7 +284,7 @@ func NewChart(ctx *pulumi.Context,
 	return chart, nil
 }
 
-func parseChart(ctx *pulumi.Context, name string, args chartArgs, opts ...pulumi.ResourceOrInvokeOption,
+func parseChart(ctx *pulumi.Context, releaseName string, args chartArgs, opts ...pulumi.ResourceOption,
 ) (map[string]pulumi.Resource, error) {
 	type jsonOptsArgs struct {
 		chartArgs
@@ -296,19 +293,17 @@ func parseChart(ctx *pulumi.Context, name string, args chartArgs, opts ...pulumi
 	}
 	jsonOpts := jsonOptsArgs{
 		chartArgs:   args,
-		ReleaseName: name,
+		ReleaseName: releaseName,
 	}
 
 	b, err := json.Marshal(jsonOpts)
 	if err != nil {
 		return nil, err
 	}
 
-	var invokeOpts []pulumi.InvokeOption
-	var resourceOpts []pulumi.ResourceOption
-	for _, o := range opts {
-		invokeOpts = append(invokeOpts, o)
-		resourceOpts = append(resourceOpts, o)
+	invokeOpts, err := yaml.GetInvokeOptions(opts)
+	if err != nil {
+		return nil, err
 	}
 	objs, err := helmTemplate(ctx, string(b), invokeOpts...)
 	if err != nil {
@@ -320,7 +315,7 @@ func parseChart(ctx *pulumi.Context, name string, args chartArgs, opts ...pulumi
 		transformations = yaml.AddSkipAwaitTransformation(transformations)
 	}
 
-	resources, err := yaml.ParseYamlObjects(ctx, objs, transformations, args.ResourcePrefix, resourceOpts...)
+	resources, err := yaml.ParseYamlObjects(ctx, objs, transformations, args.ResourcePrefix, opts...)
 	if err != nil {
 		return nil, err
 	}

provider/pkg/gen/_go-templates/kustomize/directory.go

@@ -160,14 +160,12 @@ func NewDirectory(ctx *pulumi.Context,
 		return nil, err
 	}
 
-	// Honor the resource name prefix if specified.
-	if args.ResourcePrefix != "" {
-		name = args.ResourcePrefix + "-" + name
+	parseOpts, err := yaml.GetChildOptions(chart, opts)
+	if err != nil {
+		return nil, err
 	}
-
-	parseOpts := append(opts, pulumi.Parent(chart))
 	resources := args.ToDirectoryArgsOutput().ApplyT(func(args directoryArgs) (map[string]pulumi.Resource, error) {
-		return parseDirectory(ctx, name, args, parseOpts...)
+		return parseDirectory(ctx, args, parseOpts...)
 	})
 	chart.Resources = resources
 
@@ -182,7 +180,7 @@ func NewDirectory(ctx *pulumi.Context,
 	return chart, nil
 }
 
-func parseDirectory(ctx *pulumi.Context, name string, args directoryArgs, opts ...pulumi.ResourceOption,
+func parseDirectory(ctx *pulumi.Context, args directoryArgs, opts ...pulumi.ResourceOption,
 ) (map[string]pulumi.Resource, error) {
 	invokeArgs := struct {
 		Directory string `pulumi:"directory"`
@@ -191,14 +189,10 @@ func parseDirectory(ctx *pulumi.Context, name string, args directoryArgs, opts .
 		Result []map[string]interface{} `pulumi:"result"`
 	}
 
-	// Find options which are also Invoke options, and prepare them to pass to Invoke functions
-	var invokeOpts []pulumi.InvokeOption
-	for _, opt := range opts {
-		if invokeOpt, ok := opt.(pulumi.InvokeOption); ok {
-			invokeOpts = append(invokeOpts, invokeOpt)
-		}
+	invokeOpts, err := yaml.GetInvokeOptions(opts)
+	if err != nil {
+		return nil, err
 	}
-
 	if err := ctx.Invoke("kubernetes:kustomize:directory", &invokeArgs, &ret, invokeOpts...); err != nil {
 		return nil, errors.Wrap(err, "kustomize invoke failed")
 	}

provider/pkg/gen/_go-templates/yaml/configFile.go

@@ -151,23 +151,21 @@ func NewConfigFile(ctx *pulumi.Context,
 
 	// Now provision all child resources by parsing the YAML file.
 	if args != nil {
-		// Honor the resource name prefix if specified.
-		if args.ResourcePrefix != "" {
-			name = args.ResourcePrefix + "-" + name
-		}
-
 		transformations := args.Transformations
 		if args.SkipAwait {
 			transformations = AddSkipAwaitTransformation(transformations)
 		}
 
 		// Parse and decode the YAML files.
-		parseOpts := append(opts, pulumi.Parent(configFile))
+		parseOpts, err := GetChildOptions(configFile, opts)
+		if err != nil {
+			return nil, err
+		}
 		rs, err := parseDecodeYamlFiles(ctx, &ConfigGroupArgs{
 			Files:           []string{args.File},
-			Transformations: args.Transformations,
+			Transformations: transformations,
 			ResourcePrefix:  args.ResourcePrefix,
-		}, true, parseOpts...)
+		}, false, parseOpts...)
 		if err != nil {
 			return nil, err
 		}

provider/pkg/gen/_go-templates/yaml/configGroup.go

@@ -283,13 +283,11 @@ func NewConfigGroup(ctx *pulumi.Context,
 
 	// Now provision all child resources by parsing the YAML files.
 	if args != nil {
-		// Honor the resource name prefix if specified.
-		if args.ResourcePrefix != "" {
-			name = args.ResourcePrefix + "-" + name
-		}
-
 		// Parse and decode the YAML files.
-		parseOpts := append(opts, pulumi.Parent(configGroup))
+		parseOpts, err := GetChildOptions(configGroup, opts)
+		if err != nil {
+			return nil, err
+		}
 		rs, err := parseDecodeYamlFiles(ctx, args, true, parseOpts...)
 		if err != nil {
 			return nil, err

provider/pkg/gen/_go-templates/yaml/yaml.tmpl

@@ -34,6 +34,42 @@ import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
+func GetChildOptions(parent pulumi.Resource, opts []pulumi.ResourceOption) ([]pulumi.ResourceOption, error) {
+	snapshot, err := pulumi.NewResourceOptions(opts...)
+	if err != nil {
+		return nil, err
+	}
+	childOpts := []pulumi.ResourceOption{pulumi.Parent(parent)}
+	if snapshot.Version != "" {
+		childOpts = append(childOpts, pulumi.Version(snapshot.Version))
+	}
+	if snapshot.PluginDownloadURL != "" {
+		childOpts = append(childOpts, pulumi.PluginDownloadURL(snapshot.PluginDownloadURL))
+	}
+	return childOpts, nil
+}
+
+func GetInvokeOptions(opts []pulumi.ResourceOption) ([]pulumi.InvokeOption, error) {
+	snapshot, err := pulumi.NewResourceOptions(opts...)
+	if err != nil {
+		return nil, err
+	}
+	var invokeOpts []pulumi.InvokeOption
+	if snapshot.Parent != nil {
+		invokeOpts = append(invokeOpts, pulumi.Parent(snapshot.Parent))
+	}
+	if snapshot.Provider != nil {
+		invokeOpts = append(invokeOpts, pulumi.Provider(snapshot.Provider))
+	}
+	if snapshot.Version != "" {
+		invokeOpts = append(invokeOpts, pulumi.Version(snapshot.Version))
+	}
+	if snapshot.PluginDownloadURL != "" {
+		invokeOpts = append(invokeOpts, pulumi.PluginDownloadURL(snapshot.PluginDownloadURL))
+	}
+	return invokeOpts, nil
+}
+
 func parseDecodeYamlFiles(ctx *pulumi.Context, args *ConfigGroupArgs, glob bool, opts ...pulumi.ResourceOption,
 ) (map[string]pulumi.Resource, error) {
 
@@ -80,15 +116,11 @@ func parseDecodeYamlFiles(ctx *pulumi.Context, args *ConfigGroupArgs, glob bool,
 		}
 	}
 
-  // Find options which are also Invoke options, and prepare them to pass to Invoke functions
-	var invokeOpts []pulumi.InvokeOption
-	for _, opt := range opts {
-		if invokeOpt, ok := opt.(pulumi.InvokeOption); ok {
-			invokeOpts = append(invokeOpts, invokeOpt)
-		}
-	}
-
 	// Next parse all YAML documents into objects.
+	invokeOpts, err := GetInvokeOptions(opts)
+	if err != nil {
+		return nil, err
+	}
 	for _, yaml := range yamls {
 		// Parse the resulting YAML bytes and turn them into raw Kubernetes objects.
 		dec, err := yamlDecode(ctx, yaml, invokeOpts...)

provider/pkg/gen/dotnet-templates/helm/ChartBase.cs

@@ -139,7 +139,7 @@ protected ChartBase(string releaseName, Union<ChartArgs, LocalChartArgs> args, C
 
                     var yaml = ExecuteCommand("helm", flags);
                     return ParseTemplate(
-                        yaml, cfgBase.Transformations, cfgBase.ResourcePrefix, dependencies, cfgBase.Namespace, options?.Provider);
+                        yaml, cfgBase.Transformations, cfgBase.ResourcePrefix, dependencies, cfgBase.Namespace, options);
                 }
                 catch (Exception e)
                 {
@@ -261,20 +261,20 @@ private void Fetch(string chart, ChartFetchArgsUnwrap opts)
 
         private Output<ImmutableDictionary<string, KubernetesResource>> ParseTemplate(string text,
             List<TransformationAction> transformations, string? resourcePrefix, ImmutableHashSet<Pu.Resource> dependsOn,
-            string? defaultNamespace, Pu.ProviderResource provider)
+            string? defaultNamespace, ComponentResourceOptions? options)
         {
+            var childOpts = GetChildOptions(this, dependsOn.ToArray(), options);
+            var invokeOpts = GetInvokeOptions(childOpts);
             return Yaml.Invokes
-                .YamlDecode(new YamlDecodeArgs { Text = text, DefaultNamespace = defaultNamespace }, new InvokeOptions { Provider = provider })
+                .YamlDecode(new YamlDecodeArgs { Text = text, DefaultNamespace = defaultNamespace }, invokeOpts)
                 .Apply(objs =>
                 {
-                    var args = new ConfigGroupArgs
+                    return Parser.ParseYamlObjects(new ParseArgs
                     {
-                        ResourcePrefix = resourcePrefix,
                         Objs = objs,
-                        Transformations = transformations
-                    };
-                    var opts = new ComponentResourceOptions { Parent = this, DependsOn = dependsOn.ToArray(), Provider = provider };
-                    return Parser.Parse(args, opts);
+                        Transformations = transformations,
+                        ResourcePrefix = resourcePrefix
+                    }, childOpts);
                 });
         }
 

provider/pkg/gen/dotnet-templates/helm/v3/Chart.cs

@@ -359,23 +359,23 @@ private Output<ImmutableDictionary<string, KubernetesResource>> ParseTemplate(Un
             }
             jsonOptsString = JsonSerializer.Serialize(jsonOpts, serializeOptions);
 
+            var childOpts = GetChildOptions(this, dependsOn.ToArray(), options);
+            var invokeOpts = GetInvokeOptions(childOpts);
             return Invokes
-                .HelmTemplate(new HelmTemplateArgs { JsonOpts = jsonOptsString }, new InvokeOptions { Provider = options?.Provider })
+                .HelmTemplate(new HelmTemplateArgs { JsonOpts = jsonOptsString }, invokeOpts)
                 .Apply(objs =>
                 {
                     var transformations = cfgBase.Transformations;
                     if (cfgBase.SkipAwait == true)
                     {
                         transformations = transformations.Append(Parser.SkipAwait).ToList();
                     }
-                    var args = new ConfigGroupArgs
+                    return Parser.ParseYamlObjects(new ParseArgs
                     {
-                        ResourcePrefix = cfgBase.ResourcePrefix,
                         Objs = objs,
-                        Transformations = transformations
-                    };
-                    var opts = new ComponentResourceOptions { Parent = this, DependsOn = dependsOn.ToArray(), Provider = options?.Provider };
-                    return Parser.Parse(args, opts);
+                        Transformations = transformations,
+                        ResourcePrefix = cfgBase.ResourcePrefix
+                    }, childOpts);
                 });
         }
 

provider/pkg/gen/dotnet-templates/kustomize/Directory.cs

@@ -141,27 +141,19 @@ public sealed class Directory : CollectionComponentResource
         public Directory(string name, DirectoryArgs args, ComponentResourceOptions? options = null)
             : base("kubernetes:kustomize:Directory", MakeName(args, name), options)
         {
-            name = GetName(args, name);
-            var objs = Invokes.KustomizeDirectory(new KustomizeDirectoryArgs { Directory = args.Directory }, new InvokeOptions  { Provider = options?.Provider });
-            var configGroupArgs = new ConfigGroupArgs
-            {
-                ResourcePrefix = args.ResourcePrefix,
-                Objs = objs,
-                Transformations = args.Transformations
-            };
-            var opts = ComponentResourceOptions.Merge(options, new ComponentResourceOptions { Parent = this });
-            var resources = Parser.Parse(configGroupArgs, opts);
+            var childOpts = GetChildOptions(this, null, options);
+            var invokeOpts = GetInvokeOptions(childOpts);
+            var objs = Invokes.KustomizeDirectory(new KustomizeDirectoryArgs { Directory = args.Directory }, invokeOpts);
+            var resources = Parser.ParseYamlObjects(new ParseArgs
+                {
+                    Objs = objs,
+                    Transformations = args.Transformations,
+                    ResourcePrefix = args.ResourcePrefix
+                }, childOpts);
             RegisterResources(resources);
         }
         private static string MakeName(DirectoryArgs? args, string name)
             => args?.ResourcePrefix != null ? $"{args.ResourcePrefix}-{name}" : name;
-
-        private static string GetName(DirectoryArgs config, string releaseName)
-        {
-            var prefix = config.ResourcePrefix;
-            return string.IsNullOrEmpty(prefix) ? releaseName : $"{prefix}-{releaseName}";
-        }
-
     }
 
     /// <summary>

provider/pkg/gen/dotnet-templates/yaml/ConfigFile.cs

@@ -125,39 +125,25 @@ public ConfigFile(string name, ConfigFileArgs? args = null, ComponentResourceOpt
             : base("kubernetes:yaml:ConfigFile", MakeName(args, name), options)
         {
             name = MakeName(args, name);
-            options ??= new ComponentResourceOptions();
-            options.Parent ??= this;
-
-			var transformations = args?.Transformations ?? new List<TransformationAction>();
-			if (args?.SkipAwait == true)
-			{
-				transformations.Add(Parser.SkipAwait);
-			}
+
             var fileOutput = args?.File.ToOutput() ?? Output.Create(name);
+            var childOpts = GetChildOptions(this, null, options);
             var resources = fileOutput.Apply(fileId =>
             {
                 try
                 {
-                    if (Parser.IsUrl(fileId))
-                    {
-                        using var wc = new System.Net.WebClient();
-                        return wc.DownloadString(fileId);
-                    }
-
-                    return File.ReadAllText(fileId);
+                    return Parser.Parse(new ConfigGroupArgs{
+                        Files = new string[]{ fileId },
+                        Transformations = args?.Transformations ?? new List<TransformationAction>(),
+                        ResourcePrefix = args?.ResourcePrefix,
+                        SkipAwait = args?.SkipAwait
+                    }, false, childOpts);
                 }
                 catch (Exception e)
                 {
                     throw new ResourceException($"Error fetching YAML file '{fileId}': {e.Message}", this);
                 }
-            }).Apply(text =>
-                Parser.ParseYamlDocument(new ParseArgs
-                {
-                    Objs = Invokes.YamlDecode(new YamlDecodeArgs { Text = text }, new InvokeOptions { Provider = options?.Provider }),
-                    Transformations = transformations,
-                    ResourcePrefix = args?.ResourcePrefix
-                }, options));
-
+            });
             RegisterResources(resources);
         }
 

provider/pkg/gen/dotnet-templates/yaml/ConfigGroup.cs

@@ -205,9 +205,8 @@ public sealed class ConfigGroup : CollectionComponentResource
         public ConfigGroup(string name, ConfigGroupArgs config, ComponentResourceOptions? options = null)
             : base("kubernetes:yaml:ConfigGroup", name, options)
         {
-            options ??= new ComponentResourceOptions();
-            options.Parent ??= this;
-            RegisterResources(Parser.Parse(config, options));
+            var childOpts = GetChildOptions(this, null, options);
+            RegisterResources(Parser.Parse(config, true, childOpts));
         }
     }