Update get methods

pulumi · May 5, 2020 · c963966 · c963966
1 parent ec2759b
commit c963966
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 9 deletions.
diff --git a/provider/pkg/gen/go-templates/configFile.tmpl b/provider/pkg/gen/go-templates/configFile.tmpl
@@ -18,6 +18,8 @@
 package yaml
 
 import (
+	"fmt"
+
 	"github.com/pkg/errors"
 	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
@@ -87,6 +89,13 @@ func NewConfigFile(ctx *pulumi.Context,
 	return configFile, nil
 }
 
-func (cf *ConfigFile) GetResource(key string) pulumi.Output {
+// GetResource returns a resource defined by a built-in Kubernetes group/version/kind, name and namespace.
+// For example, GetResource("v1/Pod", "foo", "") would return a Pod called "foo" from the "default" namespace.
+func (cf *ConfigFile) GetResource(gvk, name, namespace string) pulumi.Output {
+	id := name
+	if len(namespace) > 0 && namespace != "default" {
+		id = fmt.Sprintf("%s/%s", namespace, name)
+	}
+	key := fmt.Sprintf("%s::%s", gvk, id)
 	return cf.Resources.MapIndex(pulumi.String(key))
 }
diff --git a/provider/pkg/gen/go-templates/configGroup.tmpl b/provider/pkg/gen/go-templates/configGroup.tmpl
@@ -18,6 +18,8 @@
 package yaml
 
 import (
+	"fmt"
+
 	"github.com/pkg/errors"
 	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
@@ -87,6 +89,13 @@ func NewConfigGroup(ctx *pulumi.Context,
 	return configGroup, nil
 }
 
-func (cf *ConfigGroup) GetResource(key string) pulumi.Output {
+// GetResource returns a resource defined by a built-in Kubernetes group/version/kind, name and namespace.
+// For example, GetResource("v1/Pod", "foo", "") would return a Pod called "foo" from the "default" namespace.
+func (cf *ConfigGroup) GetResource(gvk, name, namespace string) pulumi.Output {
+	id := name
+	if len(namespace) > 0 && namespace != "default" {
+		id = fmt.Sprintf("%s/%s", namespace, name)
+	}
+	key := fmt.Sprintf("%s::%s", gvk, id)
 	return cf.Resources.MapIndex(pulumi.String(key))
 }
diff --git a/provider/pkg/gen/go-templates/yaml.tmpl b/provider/pkg/gen/go-templates/yaml.tmpl
@@ -100,8 +100,6 @@ func yamlDecode(ctx *pulumi.Context, text string, opts ...pulumi.ResourceOption)
 	var ret struct {
 		Result []map[string]interface{} `pulumi:"result"`
 	}
-	// TODO(joe): not clear how to translate ResourceOptions to InvokeOptions (or even get individual
-	//     settings, e.g. opts.Parent).
 	if err := ctx.Invoke("kubernetes:yaml:decode", &args, &ret); err != nil {
 		return nil, err
 	}

diff --git a/sdk/go/kubernetes/yaml/configFile.go b/sdk/go/kubernetes/yaml/configFile.go
@@ -18,6 +18,8 @@
 package yaml
 
 import (
+	"fmt"
+
 	"github.com/pkg/errors"
 	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
@@ -87,6 +89,13 @@ func NewConfigFile(ctx *pulumi.Context,
 	return configFile, nil
 }
 
-func (cf *ConfigFile) GetResource(key string) pulumi.Output {
+// GetResource returns a resource defined by a built-in Kubernetes group/version/kind, name and namespace.
+// For example, GetResource("v1/Pod", "foo", "") would return a Pod called "foo" from the "default" namespace.
+func (cf *ConfigFile) GetResource(gvk, name, namespace string) pulumi.Output {
+	id := name
+	if len(namespace) > 0 && namespace != "default" {
+		id = fmt.Sprintf("%s/%s", namespace, name)
+	}
+	key := fmt.Sprintf("%s::%s", gvk, id)
 	return cf.Resources.MapIndex(pulumi.String(key))
 }
diff --git a/sdk/go/kubernetes/yaml/configGroup.go b/sdk/go/kubernetes/yaml/configGroup.go
@@ -18,6 +18,8 @@
 package yaml
 
 import (
+	"fmt"
+
 	"github.com/pkg/errors"
 	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
@@ -87,6 +89,13 @@ func NewConfigGroup(ctx *pulumi.Context,
 	return configGroup, nil
 }
 
-func (cf *ConfigGroup) GetResource(key string) pulumi.Output {
+// GetResource returns a resource defined by a built-in Kubernetes group/version/kind, name and namespace.
+// For example, GetResource("v1/Pod", "foo", "") would return a Pod called "foo" from the "default" namespace.
+func (cf *ConfigGroup) GetResource(gvk, name, namespace string) pulumi.Output {
+	id := name
+	if len(namespace) > 0 && namespace != "default" {
+		id = fmt.Sprintf("%s/%s", namespace, name)
+	}
+	key := fmt.Sprintf("%s::%s", gvk, id)
 	return cf.Resources.MapIndex(pulumi.String(key))
 }
diff --git a/sdk/go/kubernetes/yaml/yaml.go b/sdk/go/kubernetes/yaml/yaml.go
@@ -141,8 +141,6 @@ func yamlDecode(ctx *pulumi.Context, text string, opts ...pulumi.ResourceOption)
 	var ret struct {
 		Result []map[string]interface{} `pulumi:"result"`
 	}
-	// TODO(joe): not clear how to translate ResourceOptions to InvokeOptions (or even get individual
-	//     settings, e.g. opts.Parent).
 	if err := ctx.Invoke("kubernetes:yaml:decode", &args, &ret); err != nil {
 		return nil, err
 	}

diff --git a/tests/integration/go/yaml/main.go b/tests/integration/go/yaml/main.go
@@ -25,7 +25,7 @@ func main() {
 		}
 
 		if resources != nil {
-			hostIP := resources.GetResource("v1/Pod::foo").Apply(func(r interface{}) (interface{}, error) {
+			hostIP := resources.GetResource("v1/Pod", "foo", "").Apply(func(r interface{}) (interface{}, error) {
 				pod := r.(*corev1.Pod)
 				return pod.Status.HostIP(), nil
 			})