Initial pass

pulumi · Oct 5, 2022 · dcc2746 · dcc2746
1 parent ca6687f
commit dcc2746
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/sdk/dotnet/Pulumi/Resources/Resource.cs b/sdk/dotnet/Pulumi/Resources/Resource.cs
@@ -256,6 +256,9 @@ public class Resource
                     : componentOpts?.Providers;
 
                 this._providers = this._providers.AddRange(ConvertToProvidersMap(providerList));
+                this._providers = this._providers.AddRange(
+                    options.Parent?._providers.Where(kv => !this._providers.ContainsKey(kv.Key)) ??
+                    Enumerable.Empty<KeyValuePair<string, ProviderResource>>());
             }
 
             this._protect = options.Protect == true;

diff --git a/sdk/go/pulumi/context.go b/sdk/go/pulumi/context.go
@@ -796,6 +796,14 @@ func (ctx *Context) registerResource(
 		return err
 	}
 
+	if !custom && parent != nil {
+		for k, p := range parent.getProviders() {
+			if _, ok := providers[k]; !ok {
+				providers[k] = p
+			}
+		}
+	}
+
 	// Get the provider for the resource.
 	provider := getProvider(t, options.Provider, providers)
 

diff --git a/sdk/nodejs/resource.ts b/sdk/nodejs/resource.ts
@@ -346,6 +346,7 @@ export abstract class Resource {
             ...this.__providers,
             ...convertToProvidersMap((<ComponentResourceOptions>opts).providers),
             ...convertToProvidersMap(opts.provider ? [opts.provider] : {}),
+            ...(custom ? {} : opts.parent?.__providers),
         };
 
         // provider is the first option that does not return none

diff --git a/sdk/python/lib/pulumi/resource.py b/sdk/python/lib/pulumi/resource.py
@@ -18,6 +18,7 @@
 import copy
 import warnings
 from typing import (
+    Dict,
     Optional,
     List,
     Any,
@@ -908,6 +909,10 @@ def __init__(
             [pkg, _, _] = type_components
 
         opts.provider, providers = self._get_providers(t, pkg, opts)
+        if custom and opts.parent is not None:
+            for k, v in opts.parent._providers.items():
+                if k not in providers:
+                    providers[k] = v
 
         self._protect = bool(opts.protect)
         self._provider = opts.provider if custom else None
@@ -944,7 +949,7 @@ def __init__(
 
     def _get_providers(
         self, t: str, pkg: Optional[str], opts: ResourceOptions
-    ) -> Tuple[Optional["ProviderResource"], Mapping[str, "ProviderResource"]]:
+    ) -> Tuple[Optional["ProviderResource"], Dict[str, "ProviderResource"]]:
         """
         Fetches the correct provider and providers for this resource.