diff --git a/Makefile b/Makefile index 999e097..a530b4f 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,7 @@ PROVIDER_PATH := provider VERSION_PATH := ${PROVIDER_PATH}/pkg/version.Version SCHEMA_PATH := ${PROVIDER_PATH}/cmd/${PROVIDER}/schema.json WORKING_DIR := $(shell pwd) -VERSION := $(shell pulumictl get version) -LATEST_VERSION := $(shell git describe --tags --abbrev=0 --match="v[0-9]*" HEAD) +VERSION := $(shell git describe --tags --abbrev=0 --match="v[0-9]*" HEAD) all: prepare lint build schema test @@ -26,7 +25,7 @@ prepare: done install_latest: - pulumi plugin install resource ${NAME} ${LATEST_VERSION} --server github://api.github.com/threefoldtech/pulumi-threefold + pulumi plugin install resource ${NAME} ${VERSION} --server github://api.github.com/threefoldtech/pulumi-threefold build: gen (cd provider && go build -o $(WORKING_DIR)/bin/${PROVIDER} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" $(PROJECT)/${PROVIDER_PATH}/cmd/$(PROVIDER)) @@ -38,7 +37,7 @@ schema: pulumi package get-schema $(WORKING_DIR)/bin/${PROVIDER} > $(WORKING_DIR)/provider/cmd/${PROVIDER}/schema.json pulumi: - [ -x $(shell which pulumi) ] || curl -fsSL https://get.pulumi.com | sh + curl -fsSL https://get.pulumi.com | sh test: @echo "Running Tests" @@ -83,7 +82,6 @@ go_sdk:: build rm -rf sdk/go pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language go -nodejs_sdk:: VERSION := $(shell pulumictl get version --language javascript) nodejs_sdk:: build rm -rf sdk/nodejs pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language nodejs @@ -94,7 +92,6 @@ nodejs_sdk:: build sed -i.bak 's/$${VERSION}/$(VERSION)/g' bin/package.json && \ rm ./bin/package.json.bak -python_sdk:: PYPI_VERSION := $(shell pulumictl get version --language python) python_sdk:: build rm -rf sdk/python pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language python @@ -102,7 +99,7 @@ python_sdk:: build cd sdk/python/ && \ python3 setup.py clean --all 2>/dev/null && \ rm -rf ./bin/ ../python.bin/ && cp -R . ../python.bin && mv ../python.bin ./bin && \ - sed -i.bak -e 's/^VERSION = .*/VERSION = "$(PYPI_VERSION)"/g' -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "$(VERSION)"/g' ./bin/setup.py && \ + sed -i.bak -e 's/^VERSION = .*/VERSION = "$(VERSION)"/g' -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "$(VERSION)"/g' ./bin/setup.py && \ rm ./bin/setup.py.bak && \ cd ./bin && python3 setup.py build sdist diff --git a/release.sh b/release.sh index 49ae51a..d3ae8e0 100755 --- a/release.sh +++ b/release.sh @@ -2,26 +2,29 @@ set -ex -if [ -z ${VERSION+x} ] +if [ -z ${RELEASE_VERSION+x} ] then - echo 'Error! $VERSION is required.' + echo 'Error! $RELEASE_VERSION is required.' exit 64 fi -echo $VERSION +echo $RELEASE_VERSION make pulumi go_sdk nodejs_sdk python_sdk +make lint goreleaser check tag_and_push() { local component="$1" - git tag -a "$component/$VERSION" -m "release $component/$VERSION" - git push origin $component/$VERSION + git tag -a "$component/$RELEASE_VERSION" -m "release $component/$RELEASE_VERSION" + git push origin $component/$RELEASE_VERSION } tag_and_push "sdk" # main -git tag -a $VERSION -m "release $VERSION" -git push origin $VERSION +git tag -a $RELEASE_VERSION -m "release $RELEASE_VERSION" +git push origin $RELEASE_VERSION + +make pulumi go_sdk nodejs_sdk python_sdk diff --git a/sdk/go/threefold/internal/pulumiUtilities.go b/sdk/go/threefold/internal/pulumiUtilities.go index 0e44d99..c7fc2ce 100644 --- a/sdk/go/threefold/internal/pulumiUtilities.go +++ b/sdk/go/threefold/internal/pulumiUtilities.go @@ -15,6 +15,10 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) +import ( + "github.com/pulumi/pulumi/sdk/v3/go/pulumi/internals" +) + type envParser func(v string) interface{} func ParseEnvBool(v string) interface{} { @@ -90,6 +94,73 @@ func IsZero(v interface{}) bool { return reflect.ValueOf(v).IsZero() } +func CallPlain( + ctx *pulumi.Context, + tok string, + args pulumi.Input, + output pulumi.Output, + self pulumi.Resource, + property string, + resultPtr reflect.Value, + errorPtr *error, + opts ...pulumi.InvokeOption, +) { + res, err := callPlainInner(ctx, tok, args, output, self, opts...) + if err != nil { + *errorPtr = err + return + } + + v := reflect.ValueOf(res) + + // extract res.property field if asked to do so + if property != "" { + v = v.FieldByName("Res") + } + + // return by setting the result pointer; this style of returns shortens the generated code without generics + resultPtr.Elem().Set(v) +} + +func callPlainInner( + ctx *pulumi.Context, + tok string, + args pulumi.Input, + output pulumi.Output, + self pulumi.Resource, + opts ...pulumi.InvokeOption, +) (any, error) { + o, err := ctx.Call(tok, args, output, self, opts...) + if err != nil { + return nil, err + } + + outputData, err := internals.UnsafeAwaitOutput(ctx.Context(), o) + if err != nil { + return nil, err + } + + // Ingoring deps silently. They are typically non-empty, r.f() calls include r as a dependency. + known := outputData.Known + value := outputData.Value + secret := outputData.Secret + + problem := "" + if !known { + problem = "an unknown value" + } else if secret { + problem = "a secret value" + } + + if problem != "" { + return nil, fmt.Errorf("Plain resource method %q incorrectly returned %s. "+ + "This is an error in the provider, please report this to the provider developer.", + tok, problem) + } + + return value, nil +} + // PkgResourceDefaultOpts provides package level defaults to pulumi.OptionResource. func PkgResourceDefaultOpts(opts []pulumi.ResourceOption) []pulumi.ResourceOption { defaults := []pulumi.ResourceOption{} diff --git a/sdk/go/threefold/provider.go b/sdk/go/threefold/provider.go index 6385f9a..49f40a9 100644 --- a/sdk/go/threefold/provider.go +++ b/sdk/go/threefold/provider.go @@ -8,7 +8,6 @@ import ( "reflect" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" - "github.com/pulumi/pulumi/sdk/v3/go/pulumix" "github.com/threefoldtech/pulumi-threefold/sdk/go/threefold/internal" ) @@ -121,12 +120,6 @@ func (i *Provider) ToProviderOutputWithContext(ctx context.Context) ProviderOutp return pulumi.ToOutputWithContext(ctx, i).(ProviderOutput) } -func (i *Provider) ToOutput(ctx context.Context) pulumix.Output[*Provider] { - return pulumix.Output[*Provider]{ - OutputState: i.ToProviderOutputWithContext(ctx).OutputState, - } -} - type ProviderOutput struct{ *pulumi.OutputState } func (ProviderOutput) ElementType() reflect.Type { @@ -141,12 +134,6 @@ func (o ProviderOutput) ToProviderOutputWithContext(ctx context.Context) Provide return o } -func (o ProviderOutput) ToOutput(ctx context.Context) pulumix.Output[*Provider] { - return pulumix.Output[*Provider]{ - OutputState: o.OutputState, - } -} - // The key type registered on substrate (ed25519 or sr25519). func (o ProviderOutput) Key_type() pulumi.StringPtrOutput { return o.ApplyT(func(v *Provider) pulumi.StringPtrOutput { return v.Key_type }).(pulumi.StringPtrOutput) diff --git a/sdk/go/threefold/provider/deployment.go b/sdk/go/threefold/provider/deployment.go index 86ca5d0..9b598b5 100644 --- a/sdk/go/threefold/provider/deployment.go +++ b/sdk/go/threefold/provider/deployment.go @@ -9,7 +9,6 @@ import ( "errors" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" - "github.com/pulumi/pulumi/sdk/v3/go/pulumix" "github.com/threefoldtech/pulumi-threefold/sdk/go/threefold/internal" ) @@ -126,12 +125,6 @@ func (i *Deployment) ToDeploymentOutputWithContext(ctx context.Context) Deployme return pulumi.ToOutputWithContext(ctx, i).(DeploymentOutput) } -func (i *Deployment) ToOutput(ctx context.Context) pulumix.Output[*Deployment] { - return pulumix.Output[*Deployment]{ - OutputState: i.ToDeploymentOutputWithContext(ctx).OutputState, - } -} - // DeploymentArrayInput is an input type that accepts DeploymentArray and DeploymentArrayOutput values. // You can construct a concrete instance of `DeploymentArrayInput` via: // @@ -157,12 +150,6 @@ func (i DeploymentArray) ToDeploymentArrayOutputWithContext(ctx context.Context) return pulumi.ToOutputWithContext(ctx, i).(DeploymentArrayOutput) } -func (i DeploymentArray) ToOutput(ctx context.Context) pulumix.Output[[]*Deployment] { - return pulumix.Output[[]*Deployment]{ - OutputState: i.ToDeploymentArrayOutputWithContext(ctx).OutputState, - } -} - // DeploymentMapInput is an input type that accepts DeploymentMap and DeploymentMapOutput values. // You can construct a concrete instance of `DeploymentMapInput` via: // @@ -188,12 +175,6 @@ func (i DeploymentMap) ToDeploymentMapOutputWithContext(ctx context.Context) Dep return pulumi.ToOutputWithContext(ctx, i).(DeploymentMapOutput) } -func (i DeploymentMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*Deployment] { - return pulumix.Output[map[string]*Deployment]{ - OutputState: i.ToDeploymentMapOutputWithContext(ctx).OutputState, - } -} - type DeploymentOutput struct{ *pulumi.OutputState } func (DeploymentOutput) ElementType() reflect.Type { @@ -208,12 +189,6 @@ func (o DeploymentOutput) ToDeploymentOutputWithContext(ctx context.Context) Dep return o } -func (o DeploymentOutput) ToOutput(ctx context.Context) pulumix.Output[*Deployment] { - return pulumix.Output[*Deployment]{ - OutputState: o.OutputState, - } -} - func (o DeploymentOutput) Contract_id() pulumi.IntOutput { return o.ApplyT(func(v *Deployment) pulumi.IntOutput { return v.Contract_id }).(pulumi.IntOutput) } @@ -288,12 +263,6 @@ func (o DeploymentArrayOutput) ToDeploymentArrayOutputWithContext(ctx context.Co return o } -func (o DeploymentArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*Deployment] { - return pulumix.Output[[]*Deployment]{ - OutputState: o.OutputState, - } -} - func (o DeploymentArrayOutput) Index(i pulumi.IntInput) DeploymentOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *Deployment { return vs[0].([]*Deployment)[vs[1].(int)] @@ -314,12 +283,6 @@ func (o DeploymentMapOutput) ToDeploymentMapOutputWithContext(ctx context.Contex return o } -func (o DeploymentMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*Deployment] { - return pulumix.Output[map[string]*Deployment]{ - OutputState: o.OutputState, - } -} - func (o DeploymentMapOutput) MapIndex(k pulumi.StringInput) DeploymentOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *Deployment { return vs[0].(map[string]*Deployment)[vs[1].(string)] diff --git a/sdk/go/threefold/provider/gatewayFQDN.go b/sdk/go/threefold/provider/gatewayFQDN.go index 88b1cd2..a929a29 100644 --- a/sdk/go/threefold/provider/gatewayFQDN.go +++ b/sdk/go/threefold/provider/gatewayFQDN.go @@ -9,7 +9,6 @@ import ( "errors" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" - "github.com/pulumi/pulumi/sdk/v3/go/pulumix" "github.com/threefoldtech/pulumi-threefold/sdk/go/threefold/internal" ) @@ -125,12 +124,6 @@ func (i *GatewayFQDN) ToGatewayFQDNOutputWithContext(ctx context.Context) Gatewa return pulumi.ToOutputWithContext(ctx, i).(GatewayFQDNOutput) } -func (i *GatewayFQDN) ToOutput(ctx context.Context) pulumix.Output[*GatewayFQDN] { - return pulumix.Output[*GatewayFQDN]{ - OutputState: i.ToGatewayFQDNOutputWithContext(ctx).OutputState, - } -} - // GatewayFQDNArrayInput is an input type that accepts GatewayFQDNArray and GatewayFQDNArrayOutput values. // You can construct a concrete instance of `GatewayFQDNArrayInput` via: // @@ -156,12 +149,6 @@ func (i GatewayFQDNArray) ToGatewayFQDNArrayOutputWithContext(ctx context.Contex return pulumi.ToOutputWithContext(ctx, i).(GatewayFQDNArrayOutput) } -func (i GatewayFQDNArray) ToOutput(ctx context.Context) pulumix.Output[[]*GatewayFQDN] { - return pulumix.Output[[]*GatewayFQDN]{ - OutputState: i.ToGatewayFQDNArrayOutputWithContext(ctx).OutputState, - } -} - // GatewayFQDNMapInput is an input type that accepts GatewayFQDNMap and GatewayFQDNMapOutput values. // You can construct a concrete instance of `GatewayFQDNMapInput` via: // @@ -187,12 +174,6 @@ func (i GatewayFQDNMap) ToGatewayFQDNMapOutputWithContext(ctx context.Context) G return pulumi.ToOutputWithContext(ctx, i).(GatewayFQDNMapOutput) } -func (i GatewayFQDNMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*GatewayFQDN] { - return pulumix.Output[map[string]*GatewayFQDN]{ - OutputState: i.ToGatewayFQDNMapOutputWithContext(ctx).OutputState, - } -} - type GatewayFQDNOutput struct{ *pulumi.OutputState } func (GatewayFQDNOutput) ElementType() reflect.Type { @@ -207,12 +188,6 @@ func (o GatewayFQDNOutput) ToGatewayFQDNOutputWithContext(ctx context.Context) G return o } -func (o GatewayFQDNOutput) ToOutput(ctx context.Context) pulumix.Output[*GatewayFQDN] { - return pulumix.Output[*GatewayFQDN]{ - OutputState: o.OutputState, - } -} - func (o GatewayFQDNOutput) Backends() pulumi.StringArrayOutput { return o.ApplyT(func(v *GatewayFQDN) pulumi.StringArrayOutput { return v.Backends }).(pulumi.StringArrayOutput) } @@ -267,12 +242,6 @@ func (o GatewayFQDNArrayOutput) ToGatewayFQDNArrayOutputWithContext(ctx context. return o } -func (o GatewayFQDNArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*GatewayFQDN] { - return pulumix.Output[[]*GatewayFQDN]{ - OutputState: o.OutputState, - } -} - func (o GatewayFQDNArrayOutput) Index(i pulumi.IntInput) GatewayFQDNOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *GatewayFQDN { return vs[0].([]*GatewayFQDN)[vs[1].(int)] @@ -293,12 +262,6 @@ func (o GatewayFQDNMapOutput) ToGatewayFQDNMapOutputWithContext(ctx context.Cont return o } -func (o GatewayFQDNMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*GatewayFQDN] { - return pulumix.Output[map[string]*GatewayFQDN]{ - OutputState: o.OutputState, - } -} - func (o GatewayFQDNMapOutput) MapIndex(k pulumi.StringInput) GatewayFQDNOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *GatewayFQDN { return vs[0].(map[string]*GatewayFQDN)[vs[1].(string)] diff --git a/sdk/go/threefold/provider/gatewayName.go b/sdk/go/threefold/provider/gatewayName.go index 5444205..a99579a 100644 --- a/sdk/go/threefold/provider/gatewayName.go +++ b/sdk/go/threefold/provider/gatewayName.go @@ -9,7 +9,6 @@ import ( "errors" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" - "github.com/pulumi/pulumi/sdk/v3/go/pulumix" "github.com/threefoldtech/pulumi-threefold/sdk/go/threefold/internal" ) @@ -121,12 +120,6 @@ func (i *GatewayName) ToGatewayNameOutputWithContext(ctx context.Context) Gatewa return pulumi.ToOutputWithContext(ctx, i).(GatewayNameOutput) } -func (i *GatewayName) ToOutput(ctx context.Context) pulumix.Output[*GatewayName] { - return pulumix.Output[*GatewayName]{ - OutputState: i.ToGatewayNameOutputWithContext(ctx).OutputState, - } -} - // GatewayNameArrayInput is an input type that accepts GatewayNameArray and GatewayNameArrayOutput values. // You can construct a concrete instance of `GatewayNameArrayInput` via: // @@ -152,12 +145,6 @@ func (i GatewayNameArray) ToGatewayNameArrayOutputWithContext(ctx context.Contex return pulumi.ToOutputWithContext(ctx, i).(GatewayNameArrayOutput) } -func (i GatewayNameArray) ToOutput(ctx context.Context) pulumix.Output[[]*GatewayName] { - return pulumix.Output[[]*GatewayName]{ - OutputState: i.ToGatewayNameArrayOutputWithContext(ctx).OutputState, - } -} - // GatewayNameMapInput is an input type that accepts GatewayNameMap and GatewayNameMapOutput values. // You can construct a concrete instance of `GatewayNameMapInput` via: // @@ -183,12 +170,6 @@ func (i GatewayNameMap) ToGatewayNameMapOutputWithContext(ctx context.Context) G return pulumi.ToOutputWithContext(ctx, i).(GatewayNameMapOutput) } -func (i GatewayNameMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*GatewayName] { - return pulumix.Output[map[string]*GatewayName]{ - OutputState: i.ToGatewayNameMapOutputWithContext(ctx).OutputState, - } -} - type GatewayNameOutput struct{ *pulumi.OutputState } func (GatewayNameOutput) ElementType() reflect.Type { @@ -203,12 +184,6 @@ func (o GatewayNameOutput) ToGatewayNameOutputWithContext(ctx context.Context) G return o } -func (o GatewayNameOutput) ToOutput(ctx context.Context) pulumix.Output[*GatewayName] { - return pulumix.Output[*GatewayName]{ - OutputState: o.OutputState, - } -} - func (o GatewayNameOutput) Backends() pulumi.StringArrayOutput { return o.ApplyT(func(v *GatewayName) pulumi.StringArrayOutput { return v.Backends }).(pulumi.StringArrayOutput) } @@ -267,12 +242,6 @@ func (o GatewayNameArrayOutput) ToGatewayNameArrayOutputWithContext(ctx context. return o } -func (o GatewayNameArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*GatewayName] { - return pulumix.Output[[]*GatewayName]{ - OutputState: o.OutputState, - } -} - func (o GatewayNameArrayOutput) Index(i pulumi.IntInput) GatewayNameOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *GatewayName { return vs[0].([]*GatewayName)[vs[1].(int)] @@ -293,12 +262,6 @@ func (o GatewayNameMapOutput) ToGatewayNameMapOutputWithContext(ctx context.Cont return o } -func (o GatewayNameMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*GatewayName] { - return pulumix.Output[map[string]*GatewayName]{ - OutputState: o.OutputState, - } -} - func (o GatewayNameMapOutput) MapIndex(k pulumi.StringInput) GatewayNameOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *GatewayName { return vs[0].(map[string]*GatewayName)[vs[1].(string)] diff --git a/sdk/go/threefold/provider/kubernetes.go b/sdk/go/threefold/provider/kubernetes.go index bc69d9d..dc1910b 100644 --- a/sdk/go/threefold/provider/kubernetes.go +++ b/sdk/go/threefold/provider/kubernetes.go @@ -9,7 +9,6 @@ import ( "errors" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" - "github.com/pulumi/pulumi/sdk/v3/go/pulumix" "github.com/threefoldtech/pulumi-threefold/sdk/go/threefold/internal" ) @@ -121,12 +120,6 @@ func (i *Kubernetes) ToKubernetesOutputWithContext(ctx context.Context) Kubernet return pulumi.ToOutputWithContext(ctx, i).(KubernetesOutput) } -func (i *Kubernetes) ToOutput(ctx context.Context) pulumix.Output[*Kubernetes] { - return pulumix.Output[*Kubernetes]{ - OutputState: i.ToKubernetesOutputWithContext(ctx).OutputState, - } -} - // KubernetesArrayInput is an input type that accepts KubernetesArray and KubernetesArrayOutput values. // You can construct a concrete instance of `KubernetesArrayInput` via: // @@ -152,12 +145,6 @@ func (i KubernetesArray) ToKubernetesArrayOutputWithContext(ctx context.Context) return pulumi.ToOutputWithContext(ctx, i).(KubernetesArrayOutput) } -func (i KubernetesArray) ToOutput(ctx context.Context) pulumix.Output[[]*Kubernetes] { - return pulumix.Output[[]*Kubernetes]{ - OutputState: i.ToKubernetesArrayOutputWithContext(ctx).OutputState, - } -} - // KubernetesMapInput is an input type that accepts KubernetesMap and KubernetesMapOutput values. // You can construct a concrete instance of `KubernetesMapInput` via: // @@ -183,12 +170,6 @@ func (i KubernetesMap) ToKubernetesMapOutputWithContext(ctx context.Context) Kub return pulumi.ToOutputWithContext(ctx, i).(KubernetesMapOutput) } -func (i KubernetesMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*Kubernetes] { - return pulumix.Output[map[string]*Kubernetes]{ - OutputState: i.ToKubernetesMapOutputWithContext(ctx).OutputState, - } -} - type KubernetesOutput struct{ *pulumi.OutputState } func (KubernetesOutput) ElementType() reflect.Type { @@ -203,12 +184,6 @@ func (o KubernetesOutput) ToKubernetesOutputWithContext(ctx context.Context) Kub return o } -func (o KubernetesOutput) ToOutput(ctx context.Context) pulumix.Output[*Kubernetes] { - return pulumix.Output[*Kubernetes]{ - OutputState: o.OutputState, - } -} - func (o KubernetesOutput) Master() K8sNodeInputOutput { return o.ApplyT(func(v *Kubernetes) K8sNodeInputOutput { return v.Master }).(K8sNodeInputOutput) } @@ -263,12 +238,6 @@ func (o KubernetesArrayOutput) ToKubernetesArrayOutputWithContext(ctx context.Co return o } -func (o KubernetesArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*Kubernetes] { - return pulumix.Output[[]*Kubernetes]{ - OutputState: o.OutputState, - } -} - func (o KubernetesArrayOutput) Index(i pulumi.IntInput) KubernetesOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *Kubernetes { return vs[0].([]*Kubernetes)[vs[1].(int)] @@ -289,12 +258,6 @@ func (o KubernetesMapOutput) ToKubernetesMapOutputWithContext(ctx context.Contex return o } -func (o KubernetesMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*Kubernetes] { - return pulumix.Output[map[string]*Kubernetes]{ - OutputState: o.OutputState, - } -} - func (o KubernetesMapOutput) MapIndex(k pulumi.StringInput) KubernetesOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *Kubernetes { return vs[0].(map[string]*Kubernetes)[vs[1].(string)] diff --git a/sdk/go/threefold/provider/network.go b/sdk/go/threefold/provider/network.go index b61c20e..131552d 100644 --- a/sdk/go/threefold/provider/network.go +++ b/sdk/go/threefold/provider/network.go @@ -9,7 +9,6 @@ import ( "errors" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" - "github.com/pulumi/pulumi/sdk/v3/go/pulumix" "github.com/threefoldtech/pulumi-threefold/sdk/go/threefold/internal" ) @@ -123,12 +122,6 @@ func (i *Network) ToNetworkOutputWithContext(ctx context.Context) NetworkOutput return pulumi.ToOutputWithContext(ctx, i).(NetworkOutput) } -func (i *Network) ToOutput(ctx context.Context) pulumix.Output[*Network] { - return pulumix.Output[*Network]{ - OutputState: i.ToNetworkOutputWithContext(ctx).OutputState, - } -} - // NetworkArrayInput is an input type that accepts NetworkArray and NetworkArrayOutput values. // You can construct a concrete instance of `NetworkArrayInput` via: // @@ -154,12 +147,6 @@ func (i NetworkArray) ToNetworkArrayOutputWithContext(ctx context.Context) Netwo return pulumi.ToOutputWithContext(ctx, i).(NetworkArrayOutput) } -func (i NetworkArray) ToOutput(ctx context.Context) pulumix.Output[[]*Network] { - return pulumix.Output[[]*Network]{ - OutputState: i.ToNetworkArrayOutputWithContext(ctx).OutputState, - } -} - // NetworkMapInput is an input type that accepts NetworkMap and NetworkMapOutput values. // You can construct a concrete instance of `NetworkMapInput` via: // @@ -185,12 +172,6 @@ func (i NetworkMap) ToNetworkMapOutputWithContext(ctx context.Context) NetworkMa return pulumi.ToOutputWithContext(ctx, i).(NetworkMapOutput) } -func (i NetworkMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*Network] { - return pulumix.Output[map[string]*Network]{ - OutputState: i.ToNetworkMapOutputWithContext(ctx).OutputState, - } -} - type NetworkOutput struct{ *pulumi.OutputState } func (NetworkOutput) ElementType() reflect.Type { @@ -205,12 +186,6 @@ func (o NetworkOutput) ToNetworkOutputWithContext(ctx context.Context) NetworkOu return o } -func (o NetworkOutput) ToOutput(ctx context.Context) pulumix.Output[*Network] { - return pulumix.Output[*Network]{ - OutputState: o.OutputState, - } -} - func (o NetworkOutput) Access_wg_config() pulumi.StringOutput { return o.ApplyT(func(v *Network) pulumi.StringOutput { return v.Access_wg_config }).(pulumi.StringOutput) } @@ -273,12 +248,6 @@ func (o NetworkArrayOutput) ToNetworkArrayOutputWithContext(ctx context.Context) return o } -func (o NetworkArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*Network] { - return pulumix.Output[[]*Network]{ - OutputState: o.OutputState, - } -} - func (o NetworkArrayOutput) Index(i pulumi.IntInput) NetworkOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *Network { return vs[0].([]*Network)[vs[1].(int)] @@ -299,12 +268,6 @@ func (o NetworkMapOutput) ToNetworkMapOutputWithContext(ctx context.Context) Net return o } -func (o NetworkMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*Network] { - return pulumix.Output[map[string]*Network]{ - OutputState: o.OutputState, - } -} - func (o NetworkMapOutput) MapIndex(k pulumi.StringInput) NetworkOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *Network { return vs[0].(map[string]*Network)[vs[1].(string)] diff --git a/sdk/go/threefold/provider/pulumiTypes.go b/sdk/go/threefold/provider/pulumiTypes.go index 06e249a..e1bca57 100644 --- a/sdk/go/threefold/provider/pulumiTypes.go +++ b/sdk/go/threefold/provider/pulumiTypes.go @@ -8,7 +8,6 @@ import ( "reflect" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" - "github.com/pulumi/pulumi/sdk/v3/go/pulumix" "github.com/threefoldtech/pulumi-threefold/sdk/go/threefold/internal" ) @@ -49,12 +48,6 @@ func (i BackendArgs) ToBackendOutputWithContext(ctx context.Context) BackendOutp return pulumi.ToOutputWithContext(ctx, i).(BackendOutput) } -func (i BackendArgs) ToOutput(ctx context.Context) pulumix.Output[Backend] { - return pulumix.Output[Backend]{ - OutputState: i.ToBackendOutputWithContext(ctx).OutputState, - } -} - // BackendArrayInput is an input type that accepts BackendArray and BackendArrayOutput values. // You can construct a concrete instance of `BackendArrayInput` via: // @@ -80,12 +73,6 @@ func (i BackendArray) ToBackendArrayOutputWithContext(ctx context.Context) Backe return pulumi.ToOutputWithContext(ctx, i).(BackendArrayOutput) } -func (i BackendArray) ToOutput(ctx context.Context) pulumix.Output[[]Backend] { - return pulumix.Output[[]Backend]{ - OutputState: i.ToBackendArrayOutputWithContext(ctx).OutputState, - } -} - type BackendOutput struct{ *pulumi.OutputState } func (BackendOutput) ElementType() reflect.Type { @@ -100,12 +87,6 @@ func (o BackendOutput) ToBackendOutputWithContext(ctx context.Context) BackendOu return o } -func (o BackendOutput) ToOutput(ctx context.Context) pulumix.Output[Backend] { - return pulumix.Output[Backend]{ - OutputState: o.OutputState, - } -} - func (o BackendOutput) Address() pulumi.StringOutput { return o.ApplyT(func(v Backend) string { return v.Address }).(pulumi.StringOutput) } @@ -132,12 +113,6 @@ func (o BackendArrayOutput) ToBackendArrayOutputWithContext(ctx context.Context) return o } -func (o BackendArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]Backend] { - return pulumix.Output[[]Backend]{ - OutputState: o.OutputState, - } -} - func (o BackendArrayOutput) Index(i pulumi.IntInput) BackendOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) Backend { return vs[0].([]Backend)[vs[1].(int)] @@ -179,12 +154,6 @@ func (i DiskArgs) ToDiskOutputWithContext(ctx context.Context) DiskOutput { return pulumi.ToOutputWithContext(ctx, i).(DiskOutput) } -func (i DiskArgs) ToOutput(ctx context.Context) pulumix.Output[Disk] { - return pulumix.Output[Disk]{ - OutputState: i.ToDiskOutputWithContext(ctx).OutputState, - } -} - // DiskArrayInput is an input type that accepts DiskArray and DiskArrayOutput values. // You can construct a concrete instance of `DiskArrayInput` via: // @@ -210,12 +179,6 @@ func (i DiskArray) ToDiskArrayOutputWithContext(ctx context.Context) DiskArrayOu return pulumi.ToOutputWithContext(ctx, i).(DiskArrayOutput) } -func (i DiskArray) ToOutput(ctx context.Context) pulumix.Output[[]Disk] { - return pulumix.Output[[]Disk]{ - OutputState: i.ToDiskArrayOutputWithContext(ctx).OutputState, - } -} - type DiskOutput struct{ *pulumi.OutputState } func (DiskOutput) ElementType() reflect.Type { @@ -230,12 +193,6 @@ func (o DiskOutput) ToDiskOutputWithContext(ctx context.Context) DiskOutput { return o } -func (o DiskOutput) ToOutput(ctx context.Context) pulumix.Output[Disk] { - return pulumix.Output[Disk]{ - OutputState: o.OutputState, - } -} - func (o DiskOutput) Description() pulumi.StringPtrOutput { return o.ApplyT(func(v Disk) *string { return v.Description }).(pulumi.StringPtrOutput) } @@ -262,12 +219,6 @@ func (o DiskArrayOutput) ToDiskArrayOutputWithContext(ctx context.Context) DiskA return o } -func (o DiskArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]Disk] { - return pulumix.Output[[]Disk]{ - OutputState: o.OutputState, - } -} - func (o DiskArrayOutput) Index(i pulumi.IntInput) DiskOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) Disk { return vs[0].([]Disk)[vs[1].(int)] @@ -305,12 +256,6 @@ func (i GroupArgs) ToGroupOutputWithContext(ctx context.Context) GroupOutput { return pulumi.ToOutputWithContext(ctx, i).(GroupOutput) } -func (i GroupArgs) ToOutput(ctx context.Context) pulumix.Output[Group] { - return pulumix.Output[Group]{ - OutputState: i.ToGroupOutputWithContext(ctx).OutputState, - } -} - // GroupArrayInput is an input type that accepts GroupArray and GroupArrayOutput values. // You can construct a concrete instance of `GroupArrayInput` via: // @@ -336,12 +281,6 @@ func (i GroupArray) ToGroupArrayOutputWithContext(ctx context.Context) GroupArra return pulumi.ToOutputWithContext(ctx, i).(GroupArrayOutput) } -func (i GroupArray) ToOutput(ctx context.Context) pulumix.Output[[]Group] { - return pulumix.Output[[]Group]{ - OutputState: i.ToGroupArrayOutputWithContext(ctx).OutputState, - } -} - type GroupOutput struct{ *pulumi.OutputState } func (GroupOutput) ElementType() reflect.Type { @@ -356,12 +295,6 @@ func (o GroupOutput) ToGroupOutputWithContext(ctx context.Context) GroupOutput { return o } -func (o GroupOutput) ToOutput(ctx context.Context) pulumix.Output[Group] { - return pulumix.Output[Group]{ - OutputState: o.OutputState, - } -} - func (o GroupOutput) Backends() BackendArrayOutput { return o.ApplyT(func(v Group) []Backend { return v.Backends }).(BackendArrayOutput) } @@ -380,12 +313,6 @@ func (o GroupArrayOutput) ToGroupArrayOutputWithContext(ctx context.Context) Gro return o } -func (o GroupArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]Group] { - return pulumix.Output[[]Group]{ - OutputState: o.OutputState, - } -} - func (o GroupArrayOutput) Index(i pulumi.IntInput) GroupOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) Group { return vs[0].([]Group)[vs[1].(int)] @@ -437,12 +364,6 @@ func (i K8sNodeComputedArgs) ToK8sNodeComputedOutputWithContext(ctx context.Cont return pulumi.ToOutputWithContext(ctx, i).(K8sNodeComputedOutput) } -func (i K8sNodeComputedArgs) ToOutput(ctx context.Context) pulumix.Output[K8sNodeComputed] { - return pulumix.Output[K8sNodeComputed]{ - OutputState: i.ToK8sNodeComputedOutputWithContext(ctx).OutputState, - } -} - // K8sNodeComputedMapInput is an input type that accepts K8sNodeComputedMap and K8sNodeComputedMapOutput values. // You can construct a concrete instance of `K8sNodeComputedMapInput` via: // @@ -468,12 +389,6 @@ func (i K8sNodeComputedMap) ToK8sNodeComputedMapOutputWithContext(ctx context.Co return pulumi.ToOutputWithContext(ctx, i).(K8sNodeComputedMapOutput) } -func (i K8sNodeComputedMap) ToOutput(ctx context.Context) pulumix.Output[map[string]K8sNodeComputed] { - return pulumix.Output[map[string]K8sNodeComputed]{ - OutputState: i.ToK8sNodeComputedMapOutputWithContext(ctx).OutputState, - } -} - type K8sNodeComputedOutput struct{ *pulumi.OutputState } func (K8sNodeComputedOutput) ElementType() reflect.Type { @@ -488,12 +403,6 @@ func (o K8sNodeComputedOutput) ToK8sNodeComputedOutputWithContext(ctx context.Co return o } -func (o K8sNodeComputedOutput) ToOutput(ctx context.Context) pulumix.Output[K8sNodeComputed] { - return pulumix.Output[K8sNodeComputed]{ - OutputState: o.OutputState, - } -} - func (o K8sNodeComputedOutput) Computed_ip() pulumi.StringOutput { return o.ApplyT(func(v K8sNodeComputed) string { return v.Computed_ip }).(pulumi.StringOutput) } @@ -540,12 +449,6 @@ func (o K8sNodeComputedMapOutput) ToK8sNodeComputedMapOutputWithContext(ctx cont return o } -func (o K8sNodeComputedMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]K8sNodeComputed] { - return pulumix.Output[map[string]K8sNodeComputed]{ - OutputState: o.OutputState, - } -} - func (o K8sNodeComputedMapOutput) MapIndex(k pulumi.StringInput) K8sNodeComputedOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) K8sNodeComputed { return vs[0].(map[string]K8sNodeComputed)[vs[1].(string)] @@ -601,12 +504,6 @@ func (i K8sNodeInputArgs) ToK8sNodeInputOutputWithContext(ctx context.Context) K return pulumi.ToOutputWithContext(ctx, i).(K8sNodeInputOutput) } -func (i K8sNodeInputArgs) ToOutput(ctx context.Context) pulumix.Output[K8sNodeInput] { - return pulumix.Output[K8sNodeInput]{ - OutputState: i.ToK8sNodeInputOutputWithContext(ctx).OutputState, - } -} - // K8sNodeInputArrayInput is an input type that accepts K8sNodeInputArray and K8sNodeInputArrayOutput values. // You can construct a concrete instance of `K8sNodeInputArrayInput` via: // @@ -632,12 +529,6 @@ func (i K8sNodeInputArray) ToK8sNodeInputArrayOutputWithContext(ctx context.Cont return pulumi.ToOutputWithContext(ctx, i).(K8sNodeInputArrayOutput) } -func (i K8sNodeInputArray) ToOutput(ctx context.Context) pulumix.Output[[]K8sNodeInput] { - return pulumix.Output[[]K8sNodeInput]{ - OutputState: i.ToK8sNodeInputArrayOutputWithContext(ctx).OutputState, - } -} - type K8sNodeInputOutput struct{ *pulumi.OutputState } func (K8sNodeInputOutput) ElementType() reflect.Type { @@ -652,12 +543,6 @@ func (o K8sNodeInputOutput) ToK8sNodeInputOutputWithContext(ctx context.Context) return o } -func (o K8sNodeInputOutput) ToOutput(ctx context.Context) pulumix.Output[K8sNodeInput] { - return pulumix.Output[K8sNodeInput]{ - OutputState: o.OutputState, - } -} - func (o K8sNodeInputOutput) Cpu() pulumi.IntOutput { return o.ApplyT(func(v K8sNodeInput) int { return v.Cpu }).(pulumi.IntOutput) } @@ -712,12 +597,6 @@ func (o K8sNodeInputArrayOutput) ToK8sNodeInputArrayOutputWithContext(ctx contex return o } -func (o K8sNodeInputArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]K8sNodeInput] { - return pulumix.Output[[]K8sNodeInput]{ - OutputState: o.OutputState, - } -} - func (o K8sNodeInputArrayOutput) Index(i pulumi.IntInput) K8sNodeInputOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) K8sNodeInput { return vs[0].([]K8sNodeInput)[vs[1].(int)] @@ -763,12 +642,6 @@ func (i MetadataArgs) ToMetadataOutputWithContext(ctx context.Context) MetadataO return pulumi.ToOutputWithContext(ctx, i).(MetadataOutput) } -func (i MetadataArgs) ToOutput(ctx context.Context) pulumix.Output[Metadata] { - return pulumix.Output[Metadata]{ - OutputState: i.ToMetadataOutputWithContext(ctx).OutputState, - } -} - type MetadataOutput struct{ *pulumi.OutputState } func (MetadataOutput) ElementType() reflect.Type { @@ -783,12 +656,6 @@ func (o MetadataOutput) ToMetadataOutputWithContext(ctx context.Context) Metadat return o } -func (o MetadataOutput) ToOutput(ctx context.Context) pulumix.Output[Metadata] { - return pulumix.Output[Metadata]{ - OutputState: o.OutputState, - } -} - func (o MetadataOutput) Backends() BackendArrayOutput { return o.ApplyT(func(v Metadata) []Backend { return v.Backends }).(BackendArrayOutput) } @@ -842,12 +709,6 @@ func (i MountArgs) ToMountOutputWithContext(ctx context.Context) MountOutput { return pulumi.ToOutputWithContext(ctx, i).(MountOutput) } -func (i MountArgs) ToOutput(ctx context.Context) pulumix.Output[Mount] { - return pulumix.Output[Mount]{ - OutputState: i.ToMountOutputWithContext(ctx).OutputState, - } -} - // MountArrayInput is an input type that accepts MountArray and MountArrayOutput values. // You can construct a concrete instance of `MountArrayInput` via: // @@ -873,12 +734,6 @@ func (i MountArray) ToMountArrayOutputWithContext(ctx context.Context) MountArra return pulumi.ToOutputWithContext(ctx, i).(MountArrayOutput) } -func (i MountArray) ToOutput(ctx context.Context) pulumix.Output[[]Mount] { - return pulumix.Output[[]Mount]{ - OutputState: i.ToMountArrayOutputWithContext(ctx).OutputState, - } -} - type MountOutput struct{ *pulumi.OutputState } func (MountOutput) ElementType() reflect.Type { @@ -893,12 +748,6 @@ func (o MountOutput) ToMountOutputWithContext(ctx context.Context) MountOutput { return o } -func (o MountOutput) ToOutput(ctx context.Context) pulumix.Output[Mount] { - return pulumix.Output[Mount]{ - OutputState: o.OutputState, - } -} - func (o MountOutput) Disk_name() pulumi.StringOutput { return o.ApplyT(func(v Mount) string { return v.Disk_name }).(pulumi.StringOutput) } @@ -921,12 +770,6 @@ func (o MountArrayOutput) ToMountArrayOutputWithContext(ctx context.Context) Mou return o } -func (o MountArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]Mount] { - return pulumix.Output[[]Mount]{ - OutputState: o.OutputState, - } -} - func (o MountArrayOutput) Index(i pulumi.IntInput) MountOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) Mount { return vs[0].([]Mount)[vs[1].(int)] @@ -964,12 +807,6 @@ func (i QSFSComputedArgs) ToQSFSComputedOutputWithContext(ctx context.Context) Q return pulumi.ToOutputWithContext(ctx, i).(QSFSComputedOutput) } -func (i QSFSComputedArgs) ToOutput(ctx context.Context) pulumix.Output[QSFSComputed] { - return pulumix.Output[QSFSComputed]{ - OutputState: i.ToQSFSComputedOutputWithContext(ctx).OutputState, - } -} - // QSFSComputedArrayInput is an input type that accepts QSFSComputedArray and QSFSComputedArrayOutput values. // You can construct a concrete instance of `QSFSComputedArrayInput` via: // @@ -995,12 +832,6 @@ func (i QSFSComputedArray) ToQSFSComputedArrayOutputWithContext(ctx context.Cont return pulumi.ToOutputWithContext(ctx, i).(QSFSComputedArrayOutput) } -func (i QSFSComputedArray) ToOutput(ctx context.Context) pulumix.Output[[]QSFSComputed] { - return pulumix.Output[[]QSFSComputed]{ - OutputState: i.ToQSFSComputedArrayOutputWithContext(ctx).OutputState, - } -} - type QSFSComputedOutput struct{ *pulumi.OutputState } func (QSFSComputedOutput) ElementType() reflect.Type { @@ -1015,12 +846,6 @@ func (o QSFSComputedOutput) ToQSFSComputedOutputWithContext(ctx context.Context) return o } -func (o QSFSComputedOutput) ToOutput(ctx context.Context) pulumix.Output[QSFSComputed] { - return pulumix.Output[QSFSComputed]{ - OutputState: o.OutputState, - } -} - func (o QSFSComputedOutput) Metrics_endpoint() pulumi.StringOutput { return o.ApplyT(func(v QSFSComputed) string { return v.Metrics_endpoint }).(pulumi.StringOutput) } @@ -1039,12 +864,6 @@ func (o QSFSComputedArrayOutput) ToQSFSComputedArrayOutputWithContext(ctx contex return o } -func (o QSFSComputedArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]QSFSComputed] { - return pulumix.Output[[]QSFSComputed]{ - OutputState: o.OutputState, - } -} - func (o QSFSComputedArrayOutput) Index(i pulumi.IntInput) QSFSComputedOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) QSFSComputed { return vs[0].([]QSFSComputed)[vs[1].(int)] @@ -1106,12 +925,6 @@ func (i QSFSInputArgs) ToQSFSInputOutputWithContext(ctx context.Context) QSFSInp return pulumi.ToOutputWithContext(ctx, i).(QSFSInputOutput) } -func (i QSFSInputArgs) ToOutput(ctx context.Context) pulumix.Output[QSFSInput] { - return pulumix.Output[QSFSInput]{ - OutputState: i.ToQSFSInputOutputWithContext(ctx).OutputState, - } -} - // QSFSInputArrayInput is an input type that accepts QSFSInputArray and QSFSInputArrayOutput values. // You can construct a concrete instance of `QSFSInputArrayInput` via: // @@ -1137,12 +950,6 @@ func (i QSFSInputArray) ToQSFSInputArrayOutputWithContext(ctx context.Context) Q return pulumi.ToOutputWithContext(ctx, i).(QSFSInputArrayOutput) } -func (i QSFSInputArray) ToOutput(ctx context.Context) pulumix.Output[[]QSFSInput] { - return pulumix.Output[[]QSFSInput]{ - OutputState: i.ToQSFSInputArrayOutputWithContext(ctx).OutputState, - } -} - type QSFSInputOutput struct{ *pulumi.OutputState } func (QSFSInputOutput) ElementType() reflect.Type { @@ -1157,12 +964,6 @@ func (o QSFSInputOutput) ToQSFSInputOutputWithContext(ctx context.Context) QSFSI return o } -func (o QSFSInputOutput) ToOutput(ctx context.Context) pulumix.Output[QSFSInput] { - return pulumix.Output[QSFSInput]{ - OutputState: o.OutputState, - } -} - func (o QSFSInputOutput) Cache() pulumi.IntOutput { return o.ApplyT(func(v QSFSInput) int { return v.Cache }).(pulumi.IntOutput) } @@ -1229,12 +1030,6 @@ func (o QSFSInputArrayOutput) ToQSFSInputArrayOutputWithContext(ctx context.Cont return o } -func (o QSFSInputArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]QSFSInput] { - return pulumix.Output[[]QSFSInput]{ - OutputState: o.OutputState, - } -} - func (o QSFSInputArrayOutput) Index(i pulumi.IntInput) QSFSInputOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) QSFSInput { return vs[0].([]QSFSInput)[vs[1].(int)] @@ -1280,12 +1075,6 @@ func (i VMComputedArgs) ToVMComputedOutputWithContext(ctx context.Context) VMCom return pulumi.ToOutputWithContext(ctx, i).(VMComputedOutput) } -func (i VMComputedArgs) ToOutput(ctx context.Context) pulumix.Output[VMComputed] { - return pulumix.Output[VMComputed]{ - OutputState: i.ToVMComputedOutputWithContext(ctx).OutputState, - } -} - // VMComputedArrayInput is an input type that accepts VMComputedArray and VMComputedArrayOutput values. // You can construct a concrete instance of `VMComputedArrayInput` via: // @@ -1311,12 +1100,6 @@ func (i VMComputedArray) ToVMComputedArrayOutputWithContext(ctx context.Context) return pulumi.ToOutputWithContext(ctx, i).(VMComputedArrayOutput) } -func (i VMComputedArray) ToOutput(ctx context.Context) pulumix.Output[[]VMComputed] { - return pulumix.Output[[]VMComputed]{ - OutputState: i.ToVMComputedArrayOutputWithContext(ctx).OutputState, - } -} - type VMComputedOutput struct{ *pulumi.OutputState } func (VMComputedOutput) ElementType() reflect.Type { @@ -1331,12 +1114,6 @@ func (o VMComputedOutput) ToVMComputedOutputWithContext(ctx context.Context) VMC return o } -func (o VMComputedOutput) ToOutput(ctx context.Context) pulumix.Output[VMComputed] { - return pulumix.Output[VMComputed]{ - OutputState: o.OutputState, - } -} - func (o VMComputedOutput) Computed_ip() pulumi.StringOutput { return o.ApplyT(func(v VMComputed) string { return v.Computed_ip }).(pulumi.StringOutput) } @@ -1371,12 +1148,6 @@ func (o VMComputedArrayOutput) ToVMComputedArrayOutputWithContext(ctx context.Co return o } -func (o VMComputedArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]VMComputed] { - return pulumix.Output[[]VMComputed]{ - OutputState: o.OutputState, - } -} - func (o VMComputedArrayOutput) Index(i pulumi.IntInput) VMComputedOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) VMComputed { return vs[0].([]VMComputed)[vs[1].(int)] @@ -1444,12 +1215,6 @@ func (i VMInputArgs) ToVMInputOutputWithContext(ctx context.Context) VMInputOutp return pulumi.ToOutputWithContext(ctx, i).(VMInputOutput) } -func (i VMInputArgs) ToOutput(ctx context.Context) pulumix.Output[VMInput] { - return pulumix.Output[VMInput]{ - OutputState: i.ToVMInputOutputWithContext(ctx).OutputState, - } -} - // VMInputArrayInput is an input type that accepts VMInputArray and VMInputArrayOutput values. // You can construct a concrete instance of `VMInputArrayInput` via: // @@ -1475,12 +1240,6 @@ func (i VMInputArray) ToVMInputArrayOutputWithContext(ctx context.Context) VMInp return pulumi.ToOutputWithContext(ctx, i).(VMInputArrayOutput) } -func (i VMInputArray) ToOutput(ctx context.Context) pulumix.Output[[]VMInput] { - return pulumix.Output[[]VMInput]{ - OutputState: i.ToVMInputArrayOutputWithContext(ctx).OutputState, - } -} - type VMInputOutput struct{ *pulumi.OutputState } func (VMInputOutput) ElementType() reflect.Type { @@ -1495,12 +1254,6 @@ func (o VMInputOutput) ToVMInputOutputWithContext(ctx context.Context) VMInputOu return o } -func (o VMInputOutput) ToOutput(ctx context.Context) pulumix.Output[VMInput] { - return pulumix.Output[VMInput]{ - OutputState: o.OutputState, - } -} - func (o VMInputOutput) Cpu() pulumi.IntOutput { return o.ApplyT(func(v VMInput) int { return v.Cpu }).(pulumi.IntOutput) } @@ -1579,12 +1332,6 @@ func (o VMInputArrayOutput) ToVMInputArrayOutputWithContext(ctx context.Context) return o } -func (o VMInputArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]VMInput] { - return pulumix.Output[[]VMInput]{ - OutputState: o.OutputState, - } -} - func (o VMInputArrayOutput) Index(i pulumi.IntInput) VMInputOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) VMInput { return vs[0].([]VMInput)[vs[1].(int)] @@ -1626,12 +1373,6 @@ func (i ZDBComputedArgs) ToZDBComputedOutputWithContext(ctx context.Context) ZDB return pulumi.ToOutputWithContext(ctx, i).(ZDBComputedOutput) } -func (i ZDBComputedArgs) ToOutput(ctx context.Context) pulumix.Output[ZDBComputed] { - return pulumix.Output[ZDBComputed]{ - OutputState: i.ToZDBComputedOutputWithContext(ctx).OutputState, - } -} - // ZDBComputedArrayInput is an input type that accepts ZDBComputedArray and ZDBComputedArrayOutput values. // You can construct a concrete instance of `ZDBComputedArrayInput` via: // @@ -1657,12 +1398,6 @@ func (i ZDBComputedArray) ToZDBComputedArrayOutputWithContext(ctx context.Contex return pulumi.ToOutputWithContext(ctx, i).(ZDBComputedArrayOutput) } -func (i ZDBComputedArray) ToOutput(ctx context.Context) pulumix.Output[[]ZDBComputed] { - return pulumix.Output[[]ZDBComputed]{ - OutputState: i.ToZDBComputedArrayOutputWithContext(ctx).OutputState, - } -} - type ZDBComputedOutput struct{ *pulumi.OutputState } func (ZDBComputedOutput) ElementType() reflect.Type { @@ -1677,12 +1412,6 @@ func (o ZDBComputedOutput) ToZDBComputedOutputWithContext(ctx context.Context) Z return o } -func (o ZDBComputedOutput) ToOutput(ctx context.Context) pulumix.Output[ZDBComputed] { - return pulumix.Output[ZDBComputed]{ - OutputState: o.OutputState, - } -} - func (o ZDBComputedOutput) Ips() pulumi.StringArrayOutput { return o.ApplyT(func(v ZDBComputed) []string { return v.Ips }).(pulumi.StringArrayOutput) } @@ -1709,12 +1438,6 @@ func (o ZDBComputedArrayOutput) ToZDBComputedArrayOutputWithContext(ctx context. return o } -func (o ZDBComputedArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]ZDBComputed] { - return pulumix.Output[[]ZDBComputed]{ - OutputState: o.OutputState, - } -} - func (o ZDBComputedArrayOutput) Index(i pulumi.IntInput) ZDBComputedOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) ZDBComputed { return vs[0].([]ZDBComputed)[vs[1].(int)] @@ -1790,12 +1513,6 @@ func (i ZDBInputArgs) ToZDBInputOutputWithContext(ctx context.Context) ZDBInputO return pulumi.ToOutputWithContext(ctx, i).(ZDBInputOutput) } -func (i ZDBInputArgs) ToOutput(ctx context.Context) pulumix.Output[ZDBInput] { - return pulumix.Output[ZDBInput]{ - OutputState: i.ToZDBInputOutputWithContext(ctx).OutputState, - } -} - // ZDBInputArrayInput is an input type that accepts ZDBInputArray and ZDBInputArrayOutput values. // You can construct a concrete instance of `ZDBInputArrayInput` via: // @@ -1821,12 +1538,6 @@ func (i ZDBInputArray) ToZDBInputArrayOutputWithContext(ctx context.Context) ZDB return pulumi.ToOutputWithContext(ctx, i).(ZDBInputArrayOutput) } -func (i ZDBInputArray) ToOutput(ctx context.Context) pulumix.Output[[]ZDBInput] { - return pulumix.Output[[]ZDBInput]{ - OutputState: i.ToZDBInputArrayOutputWithContext(ctx).OutputState, - } -} - type ZDBInputOutput struct{ *pulumi.OutputState } func (ZDBInputOutput) ElementType() reflect.Type { @@ -1841,12 +1552,6 @@ func (o ZDBInputOutput) ToZDBInputOutputWithContext(ctx context.Context) ZDBInpu return o } -func (o ZDBInputOutput) ToOutput(ctx context.Context) pulumix.Output[ZDBInput] { - return pulumix.Output[ZDBInput]{ - OutputState: o.OutputState, - } -} - func (o ZDBInputOutput) Description() pulumi.StringPtrOutput { return o.ApplyT(func(v ZDBInput) *string { return v.Description }).(pulumi.StringPtrOutput) } @@ -1885,12 +1590,6 @@ func (o ZDBInputArrayOutput) ToZDBInputArrayOutputWithContext(ctx context.Contex return o } -func (o ZDBInputArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]ZDBInput] { - return pulumix.Output[[]ZDBInput]{ - OutputState: o.OutputState, - } -} - func (o ZDBInputArrayOutput) Index(i pulumi.IntInput) ZDBInputOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) ZDBInput { return vs[0].([]ZDBInput)[vs[1].(int)] @@ -1930,12 +1629,6 @@ func (i ZlogArgs) ToZlogOutputWithContext(ctx context.Context) ZlogOutput { return pulumi.ToOutputWithContext(ctx, i).(ZlogOutput) } -func (i ZlogArgs) ToOutput(ctx context.Context) pulumix.Output[Zlog] { - return pulumix.Output[Zlog]{ - OutputState: i.ToZlogOutputWithContext(ctx).OutputState, - } -} - // ZlogArrayInput is an input type that accepts ZlogArray and ZlogArrayOutput values. // You can construct a concrete instance of `ZlogArrayInput` via: // @@ -1961,12 +1654,6 @@ func (i ZlogArray) ToZlogArrayOutputWithContext(ctx context.Context) ZlogArrayOu return pulumi.ToOutputWithContext(ctx, i).(ZlogArrayOutput) } -func (i ZlogArray) ToOutput(ctx context.Context) pulumix.Output[[]Zlog] { - return pulumix.Output[[]Zlog]{ - OutputState: i.ToZlogArrayOutputWithContext(ctx).OutputState, - } -} - type ZlogOutput struct{ *pulumi.OutputState } func (ZlogOutput) ElementType() reflect.Type { @@ -1981,12 +1668,6 @@ func (o ZlogOutput) ToZlogOutputWithContext(ctx context.Context) ZlogOutput { return o } -func (o ZlogOutput) ToOutput(ctx context.Context) pulumix.Output[Zlog] { - return pulumix.Output[Zlog]{ - OutputState: o.OutputState, - } -} - func (o ZlogOutput) Output() pulumi.StringOutput { return o.ApplyT(func(v Zlog) string { return v.Output }).(pulumi.StringOutput) } @@ -2009,12 +1690,6 @@ func (o ZlogArrayOutput) ToZlogArrayOutputWithContext(ctx context.Context) ZlogA return o } -func (o ZlogArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]Zlog] { - return pulumix.Output[[]Zlog]{ - OutputState: o.OutputState, - } -} - func (o ZlogArrayOutput) Index(i pulumi.IntInput) ZlogOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) Zlog { return vs[0].([]Zlog)[vs[1].(int)] diff --git a/sdk/go/threefold/provider/scheduler.go b/sdk/go/threefold/provider/scheduler.go index b4c62db..ae49439 100644 --- a/sdk/go/threefold/provider/scheduler.go +++ b/sdk/go/threefold/provider/scheduler.go @@ -8,7 +8,6 @@ import ( "reflect" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" - "github.com/pulumi/pulumi/sdk/v3/go/pulumix" "github.com/threefoldtech/pulumi-threefold/sdk/go/threefold/internal" ) @@ -156,12 +155,6 @@ func (i *Scheduler) ToSchedulerOutputWithContext(ctx context.Context) SchedulerO return pulumi.ToOutputWithContext(ctx, i).(SchedulerOutput) } -func (i *Scheduler) ToOutput(ctx context.Context) pulumix.Output[*Scheduler] { - return pulumix.Output[*Scheduler]{ - OutputState: i.ToSchedulerOutputWithContext(ctx).OutputState, - } -} - // SchedulerArrayInput is an input type that accepts SchedulerArray and SchedulerArrayOutput values. // You can construct a concrete instance of `SchedulerArrayInput` via: // @@ -187,12 +180,6 @@ func (i SchedulerArray) ToSchedulerArrayOutputWithContext(ctx context.Context) S return pulumi.ToOutputWithContext(ctx, i).(SchedulerArrayOutput) } -func (i SchedulerArray) ToOutput(ctx context.Context) pulumix.Output[[]*Scheduler] { - return pulumix.Output[[]*Scheduler]{ - OutputState: i.ToSchedulerArrayOutputWithContext(ctx).OutputState, - } -} - // SchedulerMapInput is an input type that accepts SchedulerMap and SchedulerMapOutput values. // You can construct a concrete instance of `SchedulerMapInput` via: // @@ -218,12 +205,6 @@ func (i SchedulerMap) ToSchedulerMapOutputWithContext(ctx context.Context) Sched return pulumi.ToOutputWithContext(ctx, i).(SchedulerMapOutput) } -func (i SchedulerMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*Scheduler] { - return pulumix.Output[map[string]*Scheduler]{ - OutputState: i.ToSchedulerMapOutputWithContext(ctx).OutputState, - } -} - type SchedulerOutput struct{ *pulumi.OutputState } func (SchedulerOutput) ElementType() reflect.Type { @@ -238,12 +219,6 @@ func (o SchedulerOutput) ToSchedulerOutputWithContext(ctx context.Context) Sched return o } -func (o SchedulerOutput) ToOutput(ctx context.Context) pulumix.Output[*Scheduler] { - return pulumix.Output[*Scheduler]{ - OutputState: o.OutputState, - } -} - func (o SchedulerOutput) Certification_type() pulumi.StringPtrOutput { return o.ApplyT(func(v *Scheduler) pulumi.StringPtrOutput { return v.Certification_type }).(pulumi.StringPtrOutput) } @@ -354,12 +329,6 @@ func (o SchedulerArrayOutput) ToSchedulerArrayOutputWithContext(ctx context.Cont return o } -func (o SchedulerArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*Scheduler] { - return pulumix.Output[[]*Scheduler]{ - OutputState: o.OutputState, - } -} - func (o SchedulerArrayOutput) Index(i pulumi.IntInput) SchedulerOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *Scheduler { return vs[0].([]*Scheduler)[vs[1].(int)] @@ -380,12 +349,6 @@ func (o SchedulerMapOutput) ToSchedulerMapOutputWithContext(ctx context.Context) return o } -func (o SchedulerMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*Scheduler] { - return pulumix.Output[map[string]*Scheduler]{ - OutputState: o.OutputState, - } -} - func (o SchedulerMapOutput) MapIndex(k pulumi.StringInput) SchedulerOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *Scheduler { return vs[0].(map[string]*Scheduler)[vs[1].(string)] diff --git a/sdk/nodejs/utilities.ts b/sdk/nodejs/utilities.ts index 6e06b45..80e2826 100644 --- a/sdk/nodejs/utilities.ts +++ b/sdk/nodejs/utilities.ts @@ -2,6 +2,9 @@ // *** Do not edit by hand unless you're certain you know what you are doing! *** +import * as runtime from "@pulumi/pulumi/runtime"; +import * as pulumi from "@pulumi/pulumi"; + export function getEnv(...vars: string[]): string | undefined { for (const v of vars) { const value = process.env[v]; @@ -64,3 +67,29 @@ export function lazyLoad(exports: any, props: string[], loadModule: any) { }); } } + +export async function callAsync( + tok: string, + props: pulumi.Inputs, + res?: pulumi.Resource, + opts?: {property?: string}, +): Promise { + const o: any = runtime.call(tok, props, res); + const value = await o.promise(true /*withUnknowns*/); + const isKnown = await o.isKnown; + const isSecret = await o.isSecret; + const problem: string|undefined = + !isKnown ? "an unknown value" + : isSecret ? "a secret value" + : undefined; + // Ingoring o.resources silently. They are typically non-empty, r.f() calls include r as a dependency. + if (problem) { + throw new Error(`Plain resource method "${tok}" incorrectly returned ${problem}. ` + + "This is an error in the provider, please report this to the provider developer."); + } + // Extract a single property if requested. + if (opts && opts.property) { + return value[opts.property]; + } + return value; +} diff --git a/sdk/python/pulumi_threefold/_utilities.py b/sdk/python/pulumi_threefold/_utilities.py index 73e357d..f2330ce 100644 --- a/sdk/python/pulumi_threefold/_utilities.py +++ b/sdk/python/pulumi_threefold/_utilities.py @@ -3,6 +3,7 @@ # *** Do not edit by hand unless you're certain you know what you are doing! *** +import asyncio import importlib.util import inspect import json @@ -13,6 +14,7 @@ import pulumi import pulumi.runtime +from pulumi.runtime.sync_await import _sync_await from semver import VersionInfo as SemverVersion from parver import Version as PEP440Version @@ -246,5 +248,44 @@ def lifted_func(*args, opts=None, **kwargs): return (lambda _: lifted_func) + +def call_plain( + tok: str, + props: pulumi.Inputs, + res: typing.Optional[pulumi.Resource] = None, + typ: typing.Optional[type] = None, +) -> typing.Any: + """ + Wraps pulumi.runtime.plain to force the output and return it plainly. + """ + + output = pulumi.runtime.call(tok, props, res, typ) + + # Ingoring deps silently. They are typically non-empty, r.f() calls include r as a dependency. + result, known, secret, _ = _sync_await(asyncio.ensure_future(_await_output(output))) + + problem = None + if not known: + problem = ' an unknown value' + elif secret: + problem = ' a secret value' + + if problem: + raise AssertionError( + f"Plain resource method '{tok}' incorrectly returned {problem}. " + + "This is an error in the provider, please report this to the provider developer." + ) + + return result + + +async def _await_output(o: pulumi.Output[typing.Any]) -> typing.Tuple[object, bool, bool, set]: + return ( + await o._future, + await o._is_known, + await o._is_secret, + await o._resources, + ) + def get_plugin_download_url(): return "github://api.github.com/threefoldtech/pulumi-threefold"