feat: declare a new type for 'any resource' (#15793)

This commit exists to enable the Java SDK to update and use it, which then unblocks the next commit passing tests. Part of #6346 --------- Co-authored-by: Eron Wright <[email protected]>
pulumi · Apr 9, 2024 · e211f2e · e211f2e
1 parent f72e276
commit e211f2e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/pkg/codegen/pcl/binder_component.go b/pkg/codegen/pcl/binder_component.go
@@ -161,7 +161,6 @@ func ComponentProgramBinderFromFileSystem() ComponentProgramBinder {
  }
 
  err = parser.ParseFile(file, fileName)
-
  if err != nil {
  diagnostics = diagnostics.Append(errorf(nodeRange, err.Error()))
  return nil, diagnostics, err

diff --git a/pkg/codegen/schema/schema.go b/pkg/codegen/schema/schema.go
@@ -44,14 +44,15 @@ type Type interface {
 type primitiveType int
 
 const (
- boolType primitiveType = 1
- intType primitiveType = 2
- numberType primitiveType = 3
- stringType primitiveType = 4
- archiveType primitiveType = 5
- assetType primitiveType = 6
- anyType primitiveType = 7
- jsonType primitiveType = 8
+ boolType primitiveType = 1
+ intType primitiveType = 2
+ numberType primitiveType = 3
+ stringType primitiveType = 4
+ archiveType primitiveType = 5
+ assetType primitiveType = 6
+ anyType primitiveType = 7
+ jsonType primitiveType = 8
+ anyResourceType primitiveType = 9
 )
 
 func (t primitiveType) String() string {
@@ -70,6 +71,8 @@ func (t primitiveType) String() string {
  return "pulumi:pulumi:Asset"
  case jsonType:
  fallthrough
+ case anyResourceType:
+ fallthrough
  case anyType:
  return "pulumi:pulumi:Any"
  default:
@@ -103,6 +106,8 @@ var (
  JSONType Type = jsonType
  // AnyType represents the complete set of values.
  AnyType Type = anyType
+ // AnyResourceType represents any Pulumi resource - custom or component
+ AnyResourceType Type = anyResourceType
 )
 
 // An InvalidType represents an invalid type with associated diagnostics.

diff --git a/sdk/go/pulumi/generate/templates/types_builtins.go.template b/sdk/go/pulumi/generate/templates/types_builtins.go.template
@@ -51,6 +51,7 @@ type {{.PtrType}} {{.ElemElementType}}
 func {{.Name}}(v {{.ElemElementType}}) {{.Name}}Input {
  return ({{.InputType}})(&v)
 }
+
 func {{.Name}}FromPtr(v *{{.ElemElementType}}) {{.Name}}Input {
  if v == nil {
  return nil

diff --git a/sdk/go/pulumi/types_builtins.go b/sdk/go/pulumi/types_builtins.go