diff --git a/sdk/dotnet/Domain.cs b/sdk/dotnet/Domain.cs index 4bab763..d5d04af 100644 --- a/sdk/dotnet/Domain.cs +++ b/sdk/dotnet/Domain.cs @@ -19,6 +19,7 @@ namespace Pulumi.Mailgun /// /// ```csharp /// using System.Collections.Generic; + /// using System.Linq; /// using Pulumi; /// using Mailgun = Pulumi.Mailgun; /// diff --git a/sdk/dotnet/GetDomain.cs b/sdk/dotnet/GetDomain.cs index 327abae..7ecd76b 100644 --- a/sdk/dotnet/GetDomain.cs +++ b/sdk/dotnet/GetDomain.cs @@ -20,6 +20,7 @@ public static class GetDomain /// /// ```csharp /// using System.Collections.Generic; + /// using System.Linq; /// using Pulumi; /// using Aws = Pulumi.Aws; /// using Mailgun = Pulumi.Mailgun; @@ -71,6 +72,7 @@ public static Task InvokeAsync(GetDomainArgs args, InvokeOption /// /// ```csharp /// using System.Collections.Generic; + /// using System.Linq; /// using Pulumi; /// using Aws = Pulumi.Aws; /// using Mailgun = Pulumi.Mailgun; diff --git a/sdk/dotnet/Pulumi.Mailgun.csproj b/sdk/dotnet/Pulumi.Mailgun.csproj index 9be739d..6275b4f 100644 --- a/sdk/dotnet/Pulumi.Mailgun.csproj +++ b/sdk/dotnet/Pulumi.Mailgun.csproj @@ -10,9 +10,8 @@ https://github.com/pulumi/pulumi-mailgun logo.png - netcoreapp3.1 + net6.0 enable - false @@ -39,7 +38,7 @@ - + diff --git a/sdk/dotnet/Route.cs b/sdk/dotnet/Route.cs index 19e44f2..6306694 100644 --- a/sdk/dotnet/Route.cs +++ b/sdk/dotnet/Route.cs @@ -16,6 +16,7 @@ namespace Pulumi.Mailgun /// /// ```csharp /// using System.Collections.Generic; + /// using System.Linq; /// using Pulumi; /// using Mailgun = Pulumi.Mailgun; /// diff --git a/sdk/dotnet/Webhook.cs b/sdk/dotnet/Webhook.cs index 8712cb9..71c1e6b 100644 --- a/sdk/dotnet/Webhook.cs +++ b/sdk/dotnet/Webhook.cs @@ -17,6 +17,7 @@ namespace Pulumi.Mailgun /// /// ```csharp /// using System.Collections.Generic; + /// using System.Linq; /// using Pulumi; /// using Mailgun = Pulumi.Mailgun; /// diff --git a/sdk/go/mailgun/config/config.go b/sdk/go/mailgun/config/config.go index 5a9a0f3..0668234 100644 --- a/sdk/go/mailgun/config/config.go +++ b/sdk/go/mailgun/config/config.go @@ -4,10 +4,13 @@ package config import ( + "github.com/pulumi/pulumi-mailgun/sdk/v3/go/mailgun/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config" ) +var _ = internal.GetEnvOrDefault + func GetApiKey(ctx *pulumi.Context) string { return config.Get(ctx, "mailgun:apiKey") } diff --git a/sdk/go/mailgun/domain.go b/sdk/go/mailgun/domain.go index 0e3f799..ecba70c 100644 --- a/sdk/go/mailgun/domain.go +++ b/sdk/go/mailgun/domain.go @@ -7,7 +7,9 @@ import ( "context" "reflect" + "github.com/pulumi/pulumi-mailgun/sdk/v3/go/mailgun/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // Provides a Mailgun App resource. This can be used to @@ -109,6 +111,7 @@ func NewDomain(ctx *pulumi.Context, "smtpPassword", }) opts = append(opts, secrets) + opts = internal.PkgResourceDefaultOpts(opts) var resource Domain err := ctx.RegisterResource("mailgun:index/domain:Domain", name, args, &resource, opts...) if err != nil { @@ -282,6 +285,12 @@ func (i *Domain) ToDomainOutputWithContext(ctx context.Context) DomainOutput { return pulumi.ToOutputWithContext(ctx, i).(DomainOutput) } +func (i *Domain) ToOutput(ctx context.Context) pulumix.Output[*Domain] { + return pulumix.Output[*Domain]{ + OutputState: i.ToDomainOutputWithContext(ctx).OutputState, + } +} + // DomainArrayInput is an input type that accepts DomainArray and DomainArrayOutput values. // You can construct a concrete instance of `DomainArrayInput` via: // @@ -307,6 +316,12 @@ func (i DomainArray) ToDomainArrayOutputWithContext(ctx context.Context) DomainA return pulumi.ToOutputWithContext(ctx, i).(DomainArrayOutput) } +func (i DomainArray) ToOutput(ctx context.Context) pulumix.Output[[]*Domain] { + return pulumix.Output[[]*Domain]{ + OutputState: i.ToDomainArrayOutputWithContext(ctx).OutputState, + } +} + // DomainMapInput is an input type that accepts DomainMap and DomainMapOutput values. // You can construct a concrete instance of `DomainMapInput` via: // @@ -332,6 +347,12 @@ func (i DomainMap) ToDomainMapOutputWithContext(ctx context.Context) DomainMapOu return pulumi.ToOutputWithContext(ctx, i).(DomainMapOutput) } +func (i DomainMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*Domain] { + return pulumix.Output[map[string]*Domain]{ + OutputState: i.ToDomainMapOutputWithContext(ctx).OutputState, + } +} + type DomainOutput struct{ *pulumi.OutputState } func (DomainOutput) ElementType() reflect.Type { @@ -346,6 +367,12 @@ func (o DomainOutput) ToDomainOutputWithContext(ctx context.Context) DomainOutpu return o } +func (o DomainOutput) ToOutput(ctx context.Context) pulumix.Output[*Domain] { + return pulumix.Output[*Domain]{ + OutputState: o.OutputState, + } +} + // The length of your domain’s generated DKIM key. Default value is `1024`. func (o DomainOutput) DkimKeySize() pulumi.IntPtrOutput { return o.ApplyT(func(v *Domain) pulumi.IntPtrOutput { return v.DkimKeySize }).(pulumi.IntPtrOutput) @@ -437,6 +464,12 @@ func (o DomainArrayOutput) ToDomainArrayOutputWithContext(ctx context.Context) D return o } +func (o DomainArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*Domain] { + return pulumix.Output[[]*Domain]{ + OutputState: o.OutputState, + } +} + func (o DomainArrayOutput) Index(i pulumi.IntInput) DomainOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *Domain { return vs[0].([]*Domain)[vs[1].(int)] @@ -457,6 +490,12 @@ func (o DomainMapOutput) ToDomainMapOutputWithContext(ctx context.Context) Domai return o } +func (o DomainMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*Domain] { + return pulumix.Output[map[string]*Domain]{ + OutputState: o.OutputState, + } +} + func (o DomainMapOutput) MapIndex(k pulumi.StringInput) DomainOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *Domain { return vs[0].(map[string]*Domain)[vs[1].(string)] diff --git a/sdk/go/mailgun/domainCredential.go b/sdk/go/mailgun/domainCredential.go index 7afd124..8fc6d5b 100644 --- a/sdk/go/mailgun/domainCredential.go +++ b/sdk/go/mailgun/domainCredential.go @@ -8,7 +8,9 @@ import ( "reflect" "errors" + "github.com/pulumi/pulumi-mailgun/sdk/v3/go/mailgun/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // Provides a Mailgun domain credential resource. This can be used to create and manage credential in domain of Mailgun. @@ -62,6 +64,7 @@ func NewDomainCredential(ctx *pulumi.Context, "password", }) opts = append(opts, secrets) + opts = internal.PkgResourceDefaultOpts(opts) var resource DomainCredential err := ctx.RegisterResource("mailgun:index/domainCredential:DomainCredential", name, args, &resource, opts...) if err != nil { @@ -155,6 +158,12 @@ func (i *DomainCredential) ToDomainCredentialOutputWithContext(ctx context.Conte return pulumi.ToOutputWithContext(ctx, i).(DomainCredentialOutput) } +func (i *DomainCredential) ToOutput(ctx context.Context) pulumix.Output[*DomainCredential] { + return pulumix.Output[*DomainCredential]{ + OutputState: i.ToDomainCredentialOutputWithContext(ctx).OutputState, + } +} + // DomainCredentialArrayInput is an input type that accepts DomainCredentialArray and DomainCredentialArrayOutput values. // You can construct a concrete instance of `DomainCredentialArrayInput` via: // @@ -180,6 +189,12 @@ func (i DomainCredentialArray) ToDomainCredentialArrayOutputWithContext(ctx cont return pulumi.ToOutputWithContext(ctx, i).(DomainCredentialArrayOutput) } +func (i DomainCredentialArray) ToOutput(ctx context.Context) pulumix.Output[[]*DomainCredential] { + return pulumix.Output[[]*DomainCredential]{ + OutputState: i.ToDomainCredentialArrayOutputWithContext(ctx).OutputState, + } +} + // DomainCredentialMapInput is an input type that accepts DomainCredentialMap and DomainCredentialMapOutput values. // You can construct a concrete instance of `DomainCredentialMapInput` via: // @@ -205,6 +220,12 @@ func (i DomainCredentialMap) ToDomainCredentialMapOutputWithContext(ctx context. return pulumi.ToOutputWithContext(ctx, i).(DomainCredentialMapOutput) } +func (i DomainCredentialMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*DomainCredential] { + return pulumix.Output[map[string]*DomainCredential]{ + OutputState: i.ToDomainCredentialMapOutputWithContext(ctx).OutputState, + } +} + type DomainCredentialOutput struct{ *pulumi.OutputState } func (DomainCredentialOutput) ElementType() reflect.Type { @@ -219,6 +240,12 @@ func (o DomainCredentialOutput) ToDomainCredentialOutputWithContext(ctx context. return o } +func (o DomainCredentialOutput) ToOutput(ctx context.Context) pulumix.Output[*DomainCredential] { + return pulumix.Output[*DomainCredential]{ + OutputState: o.OutputState, + } +} + // The domain to add credential of Mailgun. func (o DomainCredentialOutput) Domain() pulumi.StringOutput { return o.ApplyT(func(v *DomainCredential) pulumi.StringOutput { return v.Domain }).(pulumi.StringOutput) @@ -253,6 +280,12 @@ func (o DomainCredentialArrayOutput) ToDomainCredentialArrayOutputWithContext(ct return o } +func (o DomainCredentialArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*DomainCredential] { + return pulumix.Output[[]*DomainCredential]{ + OutputState: o.OutputState, + } +} + func (o DomainCredentialArrayOutput) Index(i pulumi.IntInput) DomainCredentialOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *DomainCredential { return vs[0].([]*DomainCredential)[vs[1].(int)] @@ -273,6 +306,12 @@ func (o DomainCredentialMapOutput) ToDomainCredentialMapOutputWithContext(ctx co return o } +func (o DomainCredentialMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*DomainCredential] { + return pulumix.Output[map[string]*DomainCredential]{ + OutputState: o.OutputState, + } +} + func (o DomainCredentialMapOutput) MapIndex(k pulumi.StringInput) DomainCredentialOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *DomainCredential { return vs[0].(map[string]*DomainCredential)[vs[1].(string)] diff --git a/sdk/go/mailgun/getDomain.go b/sdk/go/mailgun/getDomain.go index bdb7d9c..f78a161 100644 --- a/sdk/go/mailgun/getDomain.go +++ b/sdk/go/mailgun/getDomain.go @@ -7,7 +7,9 @@ import ( "context" "reflect" + "github.com/pulumi/pulumi-mailgun/sdk/v3/go/mailgun/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // `Domain` provides details about a Mailgun domain. @@ -54,6 +56,7 @@ import ( // // ``` func LookupDomain(ctx *pulumi.Context, args *LookupDomainArgs, opts ...pulumi.InvokeOption) (*LookupDomainResult, error) { + opts = internal.PkgInvokeDefaultOpts(opts) var rv LookupDomainResult err := ctx.Invoke("mailgun:index/getDomain:getDomain", args, &rv, opts...) if err != nil { @@ -161,6 +164,12 @@ func (o LookupDomainResultOutput) ToLookupDomainResultOutputWithContext(ctx cont return o } +func (o LookupDomainResultOutput) ToOutput(ctx context.Context) pulumix.Output[LookupDomainResult] { + return pulumix.Output[LookupDomainResult]{ + OutputState: o.OutputState, + } +} + func (o LookupDomainResultOutput) DkimKeySize() pulumi.IntPtrOutput { return o.ApplyT(func(v LookupDomainResult) *int { return v.DkimKeySize }).(pulumi.IntPtrOutput) } diff --git a/sdk/go/mailgun/init.go b/sdk/go/mailgun/init.go index 4678e4e..588e58f 100644 --- a/sdk/go/mailgun/init.go +++ b/sdk/go/mailgun/init.go @@ -7,6 +7,7 @@ import ( "fmt" "github.com/blang/semver" + "github.com/pulumi/pulumi-mailgun/sdk/v3/go/mailgun/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -55,7 +56,10 @@ func (p *pkg) ConstructProvider(ctx *pulumi.Context, name, typ, urn string) (pul } func init() { - version, _ := PkgVersion() + version, err := internal.PkgVersion() + if err != nil { + version = semver.Version{Major: 1} + } pulumi.RegisterResourceModule( "mailgun", "index/domain", diff --git a/sdk/go/mailgun/pulumiUtilities.go b/sdk/go/mailgun/internal/pulumiUtilities.go similarity index 59% rename from sdk/go/mailgun/pulumiUtilities.go rename to sdk/go/mailgun/internal/pulumiUtilities.go index b3c4a7c..d747aab 100644 --- a/sdk/go/mailgun/pulumiUtilities.go +++ b/sdk/go/mailgun/internal/pulumiUtilities.go @@ -1,7 +1,7 @@ // Code generated by the Pulumi Terraform Bridge (tfgen) Tool DO NOT EDIT. // *** WARNING: Do not edit by hand unless you're certain you know what you are doing! *** -package mailgun +package internal import ( "fmt" @@ -17,7 +17,7 @@ import ( type envParser func(v string) interface{} -func parseEnvBool(v string) interface{} { +func ParseEnvBool(v string) interface{} { b, err := strconv.ParseBool(v) if err != nil { return nil @@ -25,7 +25,7 @@ func parseEnvBool(v string) interface{} { return b } -func parseEnvInt(v string) interface{} { +func ParseEnvInt(v string) interface{} { i, err := strconv.ParseInt(v, 0, 0) if err != nil { return nil @@ -33,7 +33,7 @@ func parseEnvInt(v string) interface{} { return int(i) } -func parseEnvFloat(v string) interface{} { +func ParseEnvFloat(v string) interface{} { f, err := strconv.ParseFloat(v, 64) if err != nil { return nil @@ -41,7 +41,7 @@ func parseEnvFloat(v string) interface{} { return f } -func parseEnvStringArray(v string) interface{} { +func ParseEnvStringArray(v string) interface{} { var result pulumi.StringArray for _, item := range strings.Split(v, ";") { result = append(result, pulumi.String(item)) @@ -49,9 +49,9 @@ func parseEnvStringArray(v string) interface{} { return result } -func getEnvOrDefault(def interface{}, parser envParser, vars ...string) interface{} { +func GetEnvOrDefault(def interface{}, parser envParser, vars ...string) interface{} { for _, v := range vars { - if value := os.Getenv(v); value != "" { + if value, ok := os.LookupEnv(v); ok { if parser != nil { return parser(value) } @@ -65,6 +65,10 @@ func getEnvOrDefault(def interface{}, parser envParser, vars ...string) interfac // If a version cannot be determined, v1 will be assumed. The second return // value is always nil. func PkgVersion() (semver.Version, error) { + // emptyVersion defaults to v0.0.0 + if !SdkVersion.Equals(semver.Version{}) { + return SdkVersion, nil + } type sentinal struct{} pkgPath := reflect.TypeOf(sentinal{}).PkgPath() re := regexp.MustCompile("^.*/pulumi-mailgun/sdk(/v\\d+)?") @@ -79,9 +83,31 @@ func PkgVersion() (semver.Version, error) { } // isZero is a null safe check for if a value is it's types zero value. -func isZero(v interface{}) bool { +func IsZero(v interface{}) bool { if v == nil { return true } return reflect.ValueOf(v).IsZero() } + +// PkgResourceDefaultOpts provides package level defaults to pulumi.OptionResource. +func PkgResourceDefaultOpts(opts []pulumi.ResourceOption) []pulumi.ResourceOption { + defaults := []pulumi.ResourceOption{} + + version := SdkVersion + if !version.Equals(semver.Version{}) { + defaults = append(defaults, pulumi.Version(version.String())) + } + return append(defaults, opts...) +} + +// PkgInvokeDefaultOpts provides package level defaults to pulumi.OptionInvoke. +func PkgInvokeDefaultOpts(opts []pulumi.InvokeOption) []pulumi.InvokeOption { + defaults := []pulumi.InvokeOption{} + + version := SdkVersion + if !version.Equals(semver.Version{}) { + defaults = append(defaults, pulumi.Version(version.String())) + } + return append(defaults, opts...) +} diff --git a/sdk/go/mailgun/internal/pulumiVersion.go b/sdk/go/mailgun/internal/pulumiVersion.go new file mode 100644 index 0000000..d591687 --- /dev/null +++ b/sdk/go/mailgun/internal/pulumiVersion.go @@ -0,0 +1,11 @@ +// Code generated by the Pulumi Terraform Bridge (tfgen) Tool DO NOT EDIT. +// *** WARNING: Do not edit by hand unless you're certain you know what you are doing! *** + +package internal + +import ( + "github.com/blang/semver" +) + +var SdkVersion semver.Version = semver.Version{} +var pluginDownloadURL string = "" diff --git a/sdk/go/mailgun/provider.go b/sdk/go/mailgun/provider.go index 8af11c7..47a555f 100644 --- a/sdk/go/mailgun/provider.go +++ b/sdk/go/mailgun/provider.go @@ -8,7 +8,9 @@ import ( "reflect" "errors" + "github.com/pulumi/pulumi-mailgun/sdk/v3/go/mailgun/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // The provider type for the mailgun package. By default, resources use package-wide configuration @@ -31,6 +33,7 @@ func NewProvider(ctx *pulumi.Context, if args.ApiKey == nil { return nil, errors.New("invalid value for required argument 'ApiKey'") } + opts = internal.PkgResourceDefaultOpts(opts) var resource Provider err := ctx.RegisterResource("pulumi:providers:mailgun", name, args, &resource, opts...) if err != nil { @@ -71,6 +74,12 @@ 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 { @@ -85,6 +94,12 @@ 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, + } +} + func (o ProviderOutput) ApiKey() pulumi.StringOutput { return o.ApplyT(func(v *Provider) pulumi.StringOutput { return v.ApiKey }).(pulumi.StringOutput) } diff --git a/sdk/go/mailgun/pulumiTypes.go b/sdk/go/mailgun/pulumiTypes.go index cf4cc27..b7dbc7d 100644 --- a/sdk/go/mailgun/pulumiTypes.go +++ b/sdk/go/mailgun/pulumiTypes.go @@ -7,9 +7,13 @@ import ( "context" "reflect" + "github.com/pulumi/pulumi-mailgun/sdk/v3/go/mailgun/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) +var _ = internal.GetEnvOrDefault + type DomainReceivingRecord struct { Id *string `pulumi:"id"` // The priority of the record. @@ -57,6 +61,12 @@ func (i DomainReceivingRecordArgs) ToDomainReceivingRecordOutputWithContext(ctx return pulumi.ToOutputWithContext(ctx, i).(DomainReceivingRecordOutput) } +func (i DomainReceivingRecordArgs) ToOutput(ctx context.Context) pulumix.Output[DomainReceivingRecord] { + return pulumix.Output[DomainReceivingRecord]{ + OutputState: i.ToDomainReceivingRecordOutputWithContext(ctx).OutputState, + } +} + // DomainReceivingRecordArrayInput is an input type that accepts DomainReceivingRecordArray and DomainReceivingRecordArrayOutput values. // You can construct a concrete instance of `DomainReceivingRecordArrayInput` via: // @@ -82,6 +92,12 @@ func (i DomainReceivingRecordArray) ToDomainReceivingRecordArrayOutputWithContex return pulumi.ToOutputWithContext(ctx, i).(DomainReceivingRecordArrayOutput) } +func (i DomainReceivingRecordArray) ToOutput(ctx context.Context) pulumix.Output[[]DomainReceivingRecord] { + return pulumix.Output[[]DomainReceivingRecord]{ + OutputState: i.ToDomainReceivingRecordArrayOutputWithContext(ctx).OutputState, + } +} + type DomainReceivingRecordOutput struct{ *pulumi.OutputState } func (DomainReceivingRecordOutput) ElementType() reflect.Type { @@ -96,6 +112,12 @@ func (o DomainReceivingRecordOutput) ToDomainReceivingRecordOutputWithContext(ct return o } +func (o DomainReceivingRecordOutput) ToOutput(ctx context.Context) pulumix.Output[DomainReceivingRecord] { + return pulumix.Output[DomainReceivingRecord]{ + OutputState: o.OutputState, + } +} + func (o DomainReceivingRecordOutput) Id() pulumi.StringPtrOutput { return o.ApplyT(func(v DomainReceivingRecord) *string { return v.Id }).(pulumi.StringPtrOutput) } @@ -134,6 +156,12 @@ func (o DomainReceivingRecordArrayOutput) ToDomainReceivingRecordArrayOutputWith return o } +func (o DomainReceivingRecordArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]DomainReceivingRecord] { + return pulumix.Output[[]DomainReceivingRecord]{ + OutputState: o.OutputState, + } +} + func (o DomainReceivingRecordArrayOutput) Index(i pulumi.IntInput) DomainReceivingRecordOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) DomainReceivingRecord { return vs[0].([]DomainReceivingRecord)[vs[1].(int)] @@ -187,6 +215,12 @@ func (i DomainReceivingRecordsSetArgs) ToDomainReceivingRecordsSetOutputWithCont return pulumi.ToOutputWithContext(ctx, i).(DomainReceivingRecordsSetOutput) } +func (i DomainReceivingRecordsSetArgs) ToOutput(ctx context.Context) pulumix.Output[DomainReceivingRecordsSet] { + return pulumix.Output[DomainReceivingRecordsSet]{ + OutputState: i.ToDomainReceivingRecordsSetOutputWithContext(ctx).OutputState, + } +} + // DomainReceivingRecordsSetArrayInput is an input type that accepts DomainReceivingRecordsSetArray and DomainReceivingRecordsSetArrayOutput values. // You can construct a concrete instance of `DomainReceivingRecordsSetArrayInput` via: // @@ -212,6 +246,12 @@ func (i DomainReceivingRecordsSetArray) ToDomainReceivingRecordsSetArrayOutputWi return pulumi.ToOutputWithContext(ctx, i).(DomainReceivingRecordsSetArrayOutput) } +func (i DomainReceivingRecordsSetArray) ToOutput(ctx context.Context) pulumix.Output[[]DomainReceivingRecordsSet] { + return pulumix.Output[[]DomainReceivingRecordsSet]{ + OutputState: i.ToDomainReceivingRecordsSetArrayOutputWithContext(ctx).OutputState, + } +} + type DomainReceivingRecordsSetOutput struct{ *pulumi.OutputState } func (DomainReceivingRecordsSetOutput) ElementType() reflect.Type { @@ -226,6 +266,12 @@ func (o DomainReceivingRecordsSetOutput) ToDomainReceivingRecordsSetOutputWithCo return o } +func (o DomainReceivingRecordsSetOutput) ToOutput(ctx context.Context) pulumix.Output[DomainReceivingRecordsSet] { + return pulumix.Output[DomainReceivingRecordsSet]{ + OutputState: o.OutputState, + } +} + func (o DomainReceivingRecordsSetOutput) Id() pulumi.StringPtrOutput { return o.ApplyT(func(v DomainReceivingRecordsSet) *string { return v.Id }).(pulumi.StringPtrOutput) } @@ -264,6 +310,12 @@ func (o DomainReceivingRecordsSetArrayOutput) ToDomainReceivingRecordsSetArrayOu return o } +func (o DomainReceivingRecordsSetArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]DomainReceivingRecordsSet] { + return pulumix.Output[[]DomainReceivingRecordsSet]{ + OutputState: o.OutputState, + } +} + func (o DomainReceivingRecordsSetArrayOutput) Index(i pulumi.IntInput) DomainReceivingRecordsSetOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) DomainReceivingRecordsSet { return vs[0].([]DomainReceivingRecordsSet)[vs[1].(int)] @@ -317,6 +369,12 @@ func (i DomainSendingRecordArgs) ToDomainSendingRecordOutputWithContext(ctx cont return pulumi.ToOutputWithContext(ctx, i).(DomainSendingRecordOutput) } +func (i DomainSendingRecordArgs) ToOutput(ctx context.Context) pulumix.Output[DomainSendingRecord] { + return pulumix.Output[DomainSendingRecord]{ + OutputState: i.ToDomainSendingRecordOutputWithContext(ctx).OutputState, + } +} + // DomainSendingRecordArrayInput is an input type that accepts DomainSendingRecordArray and DomainSendingRecordArrayOutput values. // You can construct a concrete instance of `DomainSendingRecordArrayInput` via: // @@ -342,6 +400,12 @@ func (i DomainSendingRecordArray) ToDomainSendingRecordArrayOutputWithContext(ct return pulumi.ToOutputWithContext(ctx, i).(DomainSendingRecordArrayOutput) } +func (i DomainSendingRecordArray) ToOutput(ctx context.Context) pulumix.Output[[]DomainSendingRecord] { + return pulumix.Output[[]DomainSendingRecord]{ + OutputState: i.ToDomainSendingRecordArrayOutputWithContext(ctx).OutputState, + } +} + type DomainSendingRecordOutput struct{ *pulumi.OutputState } func (DomainSendingRecordOutput) ElementType() reflect.Type { @@ -356,6 +420,12 @@ func (o DomainSendingRecordOutput) ToDomainSendingRecordOutputWithContext(ctx co return o } +func (o DomainSendingRecordOutput) ToOutput(ctx context.Context) pulumix.Output[DomainSendingRecord] { + return pulumix.Output[DomainSendingRecord]{ + OutputState: o.OutputState, + } +} + func (o DomainSendingRecordOutput) Id() pulumi.StringPtrOutput { return o.ApplyT(func(v DomainSendingRecord) *string { return v.Id }).(pulumi.StringPtrOutput) } @@ -394,6 +464,12 @@ func (o DomainSendingRecordArrayOutput) ToDomainSendingRecordArrayOutputWithCont return o } +func (o DomainSendingRecordArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]DomainSendingRecord] { + return pulumix.Output[[]DomainSendingRecord]{ + OutputState: o.OutputState, + } +} + func (o DomainSendingRecordArrayOutput) Index(i pulumi.IntInput) DomainSendingRecordOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) DomainSendingRecord { return vs[0].([]DomainSendingRecord)[vs[1].(int)] @@ -447,6 +523,12 @@ func (i DomainSendingRecordsSetArgs) ToDomainSendingRecordsSetOutputWithContext( return pulumi.ToOutputWithContext(ctx, i).(DomainSendingRecordsSetOutput) } +func (i DomainSendingRecordsSetArgs) ToOutput(ctx context.Context) pulumix.Output[DomainSendingRecordsSet] { + return pulumix.Output[DomainSendingRecordsSet]{ + OutputState: i.ToDomainSendingRecordsSetOutputWithContext(ctx).OutputState, + } +} + // DomainSendingRecordsSetArrayInput is an input type that accepts DomainSendingRecordsSetArray and DomainSendingRecordsSetArrayOutput values. // You can construct a concrete instance of `DomainSendingRecordsSetArrayInput` via: // @@ -472,6 +554,12 @@ func (i DomainSendingRecordsSetArray) ToDomainSendingRecordsSetArrayOutputWithCo return pulumi.ToOutputWithContext(ctx, i).(DomainSendingRecordsSetArrayOutput) } +func (i DomainSendingRecordsSetArray) ToOutput(ctx context.Context) pulumix.Output[[]DomainSendingRecordsSet] { + return pulumix.Output[[]DomainSendingRecordsSet]{ + OutputState: i.ToDomainSendingRecordsSetArrayOutputWithContext(ctx).OutputState, + } +} + type DomainSendingRecordsSetOutput struct{ *pulumi.OutputState } func (DomainSendingRecordsSetOutput) ElementType() reflect.Type { @@ -486,6 +574,12 @@ func (o DomainSendingRecordsSetOutput) ToDomainSendingRecordsSetOutputWithContex return o } +func (o DomainSendingRecordsSetOutput) ToOutput(ctx context.Context) pulumix.Output[DomainSendingRecordsSet] { + return pulumix.Output[DomainSendingRecordsSet]{ + OutputState: o.OutputState, + } +} + func (o DomainSendingRecordsSetOutput) Id() pulumi.StringPtrOutput { return o.ApplyT(func(v DomainSendingRecordsSet) *string { return v.Id }).(pulumi.StringPtrOutput) } @@ -524,6 +618,12 @@ func (o DomainSendingRecordsSetArrayOutput) ToDomainSendingRecordsSetArrayOutput return o } +func (o DomainSendingRecordsSetArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]DomainSendingRecordsSet] { + return pulumix.Output[[]DomainSendingRecordsSet]{ + OutputState: o.OutputState, + } +} + func (o DomainSendingRecordsSetArrayOutput) Index(i pulumi.IntInput) DomainSendingRecordsSetOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) DomainSendingRecordsSet { return vs[0].([]DomainSendingRecordsSet)[vs[1].(int)] @@ -577,6 +677,12 @@ func (i GetDomainReceivingRecordArgs) ToGetDomainReceivingRecordOutputWithContex return pulumi.ToOutputWithContext(ctx, i).(GetDomainReceivingRecordOutput) } +func (i GetDomainReceivingRecordArgs) ToOutput(ctx context.Context) pulumix.Output[GetDomainReceivingRecord] { + return pulumix.Output[GetDomainReceivingRecord]{ + OutputState: i.ToGetDomainReceivingRecordOutputWithContext(ctx).OutputState, + } +} + // GetDomainReceivingRecordArrayInput is an input type that accepts GetDomainReceivingRecordArray and GetDomainReceivingRecordArrayOutput values. // You can construct a concrete instance of `GetDomainReceivingRecordArrayInput` via: // @@ -602,6 +708,12 @@ func (i GetDomainReceivingRecordArray) ToGetDomainReceivingRecordArrayOutputWith return pulumi.ToOutputWithContext(ctx, i).(GetDomainReceivingRecordArrayOutput) } +func (i GetDomainReceivingRecordArray) ToOutput(ctx context.Context) pulumix.Output[[]GetDomainReceivingRecord] { + return pulumix.Output[[]GetDomainReceivingRecord]{ + OutputState: i.ToGetDomainReceivingRecordArrayOutputWithContext(ctx).OutputState, + } +} + type GetDomainReceivingRecordOutput struct{ *pulumi.OutputState } func (GetDomainReceivingRecordOutput) ElementType() reflect.Type { @@ -616,6 +728,12 @@ func (o GetDomainReceivingRecordOutput) ToGetDomainReceivingRecordOutputWithCont return o } +func (o GetDomainReceivingRecordOutput) ToOutput(ctx context.Context) pulumix.Output[GetDomainReceivingRecord] { + return pulumix.Output[GetDomainReceivingRecord]{ + OutputState: o.OutputState, + } +} + func (o GetDomainReceivingRecordOutput) Id() pulumi.StringOutput { return o.ApplyT(func(v GetDomainReceivingRecord) string { return v.Id }).(pulumi.StringOutput) } @@ -654,6 +772,12 @@ func (o GetDomainReceivingRecordArrayOutput) ToGetDomainReceivingRecordArrayOutp return o } +func (o GetDomainReceivingRecordArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]GetDomainReceivingRecord] { + return pulumix.Output[[]GetDomainReceivingRecord]{ + OutputState: o.OutputState, + } +} + func (o GetDomainReceivingRecordArrayOutput) Index(i pulumi.IntInput) GetDomainReceivingRecordOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) GetDomainReceivingRecord { return vs[0].([]GetDomainReceivingRecord)[vs[1].(int)] @@ -707,6 +831,12 @@ func (i GetDomainReceivingRecordsSetArgs) ToGetDomainReceivingRecordsSetOutputWi return pulumi.ToOutputWithContext(ctx, i).(GetDomainReceivingRecordsSetOutput) } +func (i GetDomainReceivingRecordsSetArgs) ToOutput(ctx context.Context) pulumix.Output[GetDomainReceivingRecordsSet] { + return pulumix.Output[GetDomainReceivingRecordsSet]{ + OutputState: i.ToGetDomainReceivingRecordsSetOutputWithContext(ctx).OutputState, + } +} + // GetDomainReceivingRecordsSetArrayInput is an input type that accepts GetDomainReceivingRecordsSetArray and GetDomainReceivingRecordsSetArrayOutput values. // You can construct a concrete instance of `GetDomainReceivingRecordsSetArrayInput` via: // @@ -732,6 +862,12 @@ func (i GetDomainReceivingRecordsSetArray) ToGetDomainReceivingRecordsSetArrayOu return pulumi.ToOutputWithContext(ctx, i).(GetDomainReceivingRecordsSetArrayOutput) } +func (i GetDomainReceivingRecordsSetArray) ToOutput(ctx context.Context) pulumix.Output[[]GetDomainReceivingRecordsSet] { + return pulumix.Output[[]GetDomainReceivingRecordsSet]{ + OutputState: i.ToGetDomainReceivingRecordsSetArrayOutputWithContext(ctx).OutputState, + } +} + type GetDomainReceivingRecordsSetOutput struct{ *pulumi.OutputState } func (GetDomainReceivingRecordsSetOutput) ElementType() reflect.Type { @@ -746,6 +882,12 @@ func (o GetDomainReceivingRecordsSetOutput) ToGetDomainReceivingRecordsSetOutput return o } +func (o GetDomainReceivingRecordsSetOutput) ToOutput(ctx context.Context) pulumix.Output[GetDomainReceivingRecordsSet] { + return pulumix.Output[GetDomainReceivingRecordsSet]{ + OutputState: o.OutputState, + } +} + func (o GetDomainReceivingRecordsSetOutput) Id() pulumi.StringOutput { return o.ApplyT(func(v GetDomainReceivingRecordsSet) string { return v.Id }).(pulumi.StringOutput) } @@ -784,6 +926,12 @@ func (o GetDomainReceivingRecordsSetArrayOutput) ToGetDomainReceivingRecordsSetA return o } +func (o GetDomainReceivingRecordsSetArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]GetDomainReceivingRecordsSet] { + return pulumix.Output[[]GetDomainReceivingRecordsSet]{ + OutputState: o.OutputState, + } +} + func (o GetDomainReceivingRecordsSetArrayOutput) Index(i pulumi.IntInput) GetDomainReceivingRecordsSetOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) GetDomainReceivingRecordsSet { return vs[0].([]GetDomainReceivingRecordsSet)[vs[1].(int)] @@ -837,6 +985,12 @@ func (i GetDomainSendingRecordArgs) ToGetDomainSendingRecordOutputWithContext(ct return pulumi.ToOutputWithContext(ctx, i).(GetDomainSendingRecordOutput) } +func (i GetDomainSendingRecordArgs) ToOutput(ctx context.Context) pulumix.Output[GetDomainSendingRecord] { + return pulumix.Output[GetDomainSendingRecord]{ + OutputState: i.ToGetDomainSendingRecordOutputWithContext(ctx).OutputState, + } +} + // GetDomainSendingRecordArrayInput is an input type that accepts GetDomainSendingRecordArray and GetDomainSendingRecordArrayOutput values. // You can construct a concrete instance of `GetDomainSendingRecordArrayInput` via: // @@ -862,6 +1016,12 @@ func (i GetDomainSendingRecordArray) ToGetDomainSendingRecordArrayOutputWithCont return pulumi.ToOutputWithContext(ctx, i).(GetDomainSendingRecordArrayOutput) } +func (i GetDomainSendingRecordArray) ToOutput(ctx context.Context) pulumix.Output[[]GetDomainSendingRecord] { + return pulumix.Output[[]GetDomainSendingRecord]{ + OutputState: i.ToGetDomainSendingRecordArrayOutputWithContext(ctx).OutputState, + } +} + type GetDomainSendingRecordOutput struct{ *pulumi.OutputState } func (GetDomainSendingRecordOutput) ElementType() reflect.Type { @@ -876,6 +1036,12 @@ func (o GetDomainSendingRecordOutput) ToGetDomainSendingRecordOutputWithContext( return o } +func (o GetDomainSendingRecordOutput) ToOutput(ctx context.Context) pulumix.Output[GetDomainSendingRecord] { + return pulumix.Output[GetDomainSendingRecord]{ + OutputState: o.OutputState, + } +} + func (o GetDomainSendingRecordOutput) Id() pulumi.StringOutput { return o.ApplyT(func(v GetDomainSendingRecord) string { return v.Id }).(pulumi.StringOutput) } @@ -914,6 +1080,12 @@ func (o GetDomainSendingRecordArrayOutput) ToGetDomainSendingRecordArrayOutputWi return o } +func (o GetDomainSendingRecordArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]GetDomainSendingRecord] { + return pulumix.Output[[]GetDomainSendingRecord]{ + OutputState: o.OutputState, + } +} + func (o GetDomainSendingRecordArrayOutput) Index(i pulumi.IntInput) GetDomainSendingRecordOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) GetDomainSendingRecord { return vs[0].([]GetDomainSendingRecord)[vs[1].(int)] @@ -967,6 +1139,12 @@ func (i GetDomainSendingRecordsSetArgs) ToGetDomainSendingRecordsSetOutputWithCo return pulumi.ToOutputWithContext(ctx, i).(GetDomainSendingRecordsSetOutput) } +func (i GetDomainSendingRecordsSetArgs) ToOutput(ctx context.Context) pulumix.Output[GetDomainSendingRecordsSet] { + return pulumix.Output[GetDomainSendingRecordsSet]{ + OutputState: i.ToGetDomainSendingRecordsSetOutputWithContext(ctx).OutputState, + } +} + // GetDomainSendingRecordsSetArrayInput is an input type that accepts GetDomainSendingRecordsSetArray and GetDomainSendingRecordsSetArrayOutput values. // You can construct a concrete instance of `GetDomainSendingRecordsSetArrayInput` via: // @@ -992,6 +1170,12 @@ func (i GetDomainSendingRecordsSetArray) ToGetDomainSendingRecordsSetArrayOutput return pulumi.ToOutputWithContext(ctx, i).(GetDomainSendingRecordsSetArrayOutput) } +func (i GetDomainSendingRecordsSetArray) ToOutput(ctx context.Context) pulumix.Output[[]GetDomainSendingRecordsSet] { + return pulumix.Output[[]GetDomainSendingRecordsSet]{ + OutputState: i.ToGetDomainSendingRecordsSetArrayOutputWithContext(ctx).OutputState, + } +} + type GetDomainSendingRecordsSetOutput struct{ *pulumi.OutputState } func (GetDomainSendingRecordsSetOutput) ElementType() reflect.Type { @@ -1006,6 +1190,12 @@ func (o GetDomainSendingRecordsSetOutput) ToGetDomainSendingRecordsSetOutputWith return o } +func (o GetDomainSendingRecordsSetOutput) ToOutput(ctx context.Context) pulumix.Output[GetDomainSendingRecordsSet] { + return pulumix.Output[GetDomainSendingRecordsSet]{ + OutputState: o.OutputState, + } +} + func (o GetDomainSendingRecordsSetOutput) Id() pulumi.StringOutput { return o.ApplyT(func(v GetDomainSendingRecordsSet) string { return v.Id }).(pulumi.StringOutput) } @@ -1044,6 +1234,12 @@ func (o GetDomainSendingRecordsSetArrayOutput) ToGetDomainSendingRecordsSetArray return o } +func (o GetDomainSendingRecordsSetArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]GetDomainSendingRecordsSet] { + return pulumix.Output[[]GetDomainSendingRecordsSet]{ + OutputState: o.OutputState, + } +} + func (o GetDomainSendingRecordsSetArrayOutput) Index(i pulumi.IntInput) GetDomainSendingRecordsSetOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) GetDomainSendingRecordsSet { return vs[0].([]GetDomainSendingRecordsSet)[vs[1].(int)] diff --git a/sdk/go/mailgun/route.go b/sdk/go/mailgun/route.go index 8ae4590..e5c8184 100644 --- a/sdk/go/mailgun/route.go +++ b/sdk/go/mailgun/route.go @@ -8,7 +8,9 @@ import ( "reflect" "errors" + "github.com/pulumi/pulumi-mailgun/sdk/v3/go/mailgun/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // Provides a Mailgun Route resource. This can be used to create and manage routes on Mailgun. @@ -85,6 +87,7 @@ func NewRoute(ctx *pulumi.Context, if args.Priority == nil { return nil, errors.New("invalid value for required argument 'Priority'") } + opts = internal.PkgResourceDefaultOpts(opts) var resource Route err := ctx.RegisterResource("mailgun:index/route:Route", name, args, &resource, opts...) if err != nil { @@ -178,6 +181,12 @@ func (i *Route) ToRouteOutputWithContext(ctx context.Context) RouteOutput { return pulumi.ToOutputWithContext(ctx, i).(RouteOutput) } +func (i *Route) ToOutput(ctx context.Context) pulumix.Output[*Route] { + return pulumix.Output[*Route]{ + OutputState: i.ToRouteOutputWithContext(ctx).OutputState, + } +} + // RouteArrayInput is an input type that accepts RouteArray and RouteArrayOutput values. // You can construct a concrete instance of `RouteArrayInput` via: // @@ -203,6 +212,12 @@ func (i RouteArray) ToRouteArrayOutputWithContext(ctx context.Context) RouteArra return pulumi.ToOutputWithContext(ctx, i).(RouteArrayOutput) } +func (i RouteArray) ToOutput(ctx context.Context) pulumix.Output[[]*Route] { + return pulumix.Output[[]*Route]{ + OutputState: i.ToRouteArrayOutputWithContext(ctx).OutputState, + } +} + // RouteMapInput is an input type that accepts RouteMap and RouteMapOutput values. // You can construct a concrete instance of `RouteMapInput` via: // @@ -228,6 +243,12 @@ func (i RouteMap) ToRouteMapOutputWithContext(ctx context.Context) RouteMapOutpu return pulumi.ToOutputWithContext(ctx, i).(RouteMapOutput) } +func (i RouteMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*Route] { + return pulumix.Output[map[string]*Route]{ + OutputState: i.ToRouteMapOutputWithContext(ctx).OutputState, + } +} + type RouteOutput struct{ *pulumi.OutputState } func (RouteOutput) ElementType() reflect.Type { @@ -242,6 +263,12 @@ func (o RouteOutput) ToRouteOutputWithContext(ctx context.Context) RouteOutput { return o } +func (o RouteOutput) ToOutput(ctx context.Context) pulumix.Output[*Route] { + return pulumix.Output[*Route]{ + OutputState: o.OutputState, + } +} + func (o RouteOutput) Actions() pulumi.StringArrayOutput { return o.ApplyT(func(v *Route) pulumi.StringArrayOutput { return v.Actions }).(pulumi.StringArrayOutput) } @@ -279,6 +306,12 @@ func (o RouteArrayOutput) ToRouteArrayOutputWithContext(ctx context.Context) Rou return o } +func (o RouteArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*Route] { + return pulumix.Output[[]*Route]{ + OutputState: o.OutputState, + } +} + func (o RouteArrayOutput) Index(i pulumi.IntInput) RouteOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *Route { return vs[0].([]*Route)[vs[1].(int)] @@ -299,6 +332,12 @@ func (o RouteMapOutput) ToRouteMapOutputWithContext(ctx context.Context) RouteMa return o } +func (o RouteMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*Route] { + return pulumix.Output[map[string]*Route]{ + OutputState: o.OutputState, + } +} + func (o RouteMapOutput) MapIndex(k pulumi.StringInput) RouteOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *Route { return vs[0].(map[string]*Route)[vs[1].(string)] diff --git a/sdk/go/mailgun/webhook.go b/sdk/go/mailgun/webhook.go index 1557c9f..9a9df1d 100644 --- a/sdk/go/mailgun/webhook.go +++ b/sdk/go/mailgun/webhook.go @@ -8,7 +8,9 @@ import ( "reflect" "errors" + "github.com/pulumi/pulumi-mailgun/sdk/v3/go/mailgun/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // Provides a Mailgun App resource. This can be used to @@ -73,6 +75,7 @@ func NewWebhook(ctx *pulumi.Context, if args.Urls == nil { return nil, errors.New("invalid value for required argument 'Urls'") } + opts = internal.PkgResourceDefaultOpts(opts) var resource Webhook err := ctx.RegisterResource("mailgun:index/webhook:Webhook", name, args, &resource, opts...) if err != nil { @@ -166,6 +169,12 @@ func (i *Webhook) ToWebhookOutputWithContext(ctx context.Context) WebhookOutput return pulumi.ToOutputWithContext(ctx, i).(WebhookOutput) } +func (i *Webhook) ToOutput(ctx context.Context) pulumix.Output[*Webhook] { + return pulumix.Output[*Webhook]{ + OutputState: i.ToWebhookOutputWithContext(ctx).OutputState, + } +} + // WebhookArrayInput is an input type that accepts WebhookArray and WebhookArrayOutput values. // You can construct a concrete instance of `WebhookArrayInput` via: // @@ -191,6 +200,12 @@ func (i WebhookArray) ToWebhookArrayOutputWithContext(ctx context.Context) Webho return pulumi.ToOutputWithContext(ctx, i).(WebhookArrayOutput) } +func (i WebhookArray) ToOutput(ctx context.Context) pulumix.Output[[]*Webhook] { + return pulumix.Output[[]*Webhook]{ + OutputState: i.ToWebhookArrayOutputWithContext(ctx).OutputState, + } +} + // WebhookMapInput is an input type that accepts WebhookMap and WebhookMapOutput values. // You can construct a concrete instance of `WebhookMapInput` via: // @@ -216,6 +231,12 @@ func (i WebhookMap) ToWebhookMapOutputWithContext(ctx context.Context) WebhookMa return pulumi.ToOutputWithContext(ctx, i).(WebhookMapOutput) } +func (i WebhookMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*Webhook] { + return pulumix.Output[map[string]*Webhook]{ + OutputState: i.ToWebhookMapOutputWithContext(ctx).OutputState, + } +} + type WebhookOutput struct{ *pulumi.OutputState } func (WebhookOutput) ElementType() reflect.Type { @@ -230,6 +251,12 @@ func (o WebhookOutput) ToWebhookOutputWithContext(ctx context.Context) WebhookOu return o } +func (o WebhookOutput) ToOutput(ctx context.Context) pulumix.Output[*Webhook] { + return pulumix.Output[*Webhook]{ + OutputState: o.OutputState, + } +} + // The domain to add to Mailgun func (o WebhookOutput) Domain() pulumi.StringOutput { return o.ApplyT(func(v *Webhook) pulumi.StringOutput { return v.Domain }).(pulumi.StringOutput) @@ -264,6 +291,12 @@ func (o WebhookArrayOutput) ToWebhookArrayOutputWithContext(ctx context.Context) return o } +func (o WebhookArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*Webhook] { + return pulumix.Output[[]*Webhook]{ + OutputState: o.OutputState, + } +} + func (o WebhookArrayOutput) Index(i pulumi.IntInput) WebhookOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *Webhook { return vs[0].([]*Webhook)[vs[1].(int)] @@ -284,6 +317,12 @@ func (o WebhookMapOutput) ToWebhookMapOutputWithContext(ctx context.Context) Web return o } +func (o WebhookMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*Webhook] { + return pulumix.Output[map[string]*Webhook]{ + OutputState: o.OutputState, + } +} + func (o WebhookMapOutput) MapIndex(k pulumi.StringInput) WebhookOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *Webhook { return vs[0].(map[string]*Webhook)[vs[1].(string)] diff --git a/sdk/nodejs/package.json b/sdk/nodejs/package.json index 4e5bc6d..da1180d 100644 --- a/sdk/nodejs/package.json +++ b/sdk/nodejs/package.json @@ -10,8 +10,7 @@ "repository": "https://github.com/pulumi/pulumi-mailgun", "license": "Apache-2.0", "scripts": { - "build": "tsc", - "install": "node scripts/install-pulumi-plugin.js resource mailgun ${VERSION}" + "build": "tsc" }, "dependencies": { "@pulumi/pulumi": "^3.0.0" diff --git a/sdk/nodejs/provider.ts b/sdk/nodejs/provider.ts index 10abdf6..74cae93 100644 --- a/sdk/nodejs/provider.ts +++ b/sdk/nodejs/provider.ts @@ -22,7 +22,7 @@ export class Provider extends pulumi.ProviderResource { if (obj === undefined || obj === null) { return false; } - return obj['__pulumiType'] === Provider.__pulumiType; + return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType; } public readonly apiKey!: pulumi.Output; diff --git a/sdk/nodejs/scripts/install-pulumi-plugin.js b/sdk/nodejs/scripts/install-pulumi-plugin.js deleted file mode 100644 index fefc6e0..0000000 --- a/sdk/nodejs/scripts/install-pulumi-plugin.js +++ /dev/null @@ -1,26 +0,0 @@ -"use strict"; -var childProcess = require("child_process"); - -var args = process.argv.slice(2); - -if (args.indexOf("${VERSION}") !== -1) { - process.exit(0); -} - -var res = childProcess.spawnSync("pulumi", ["plugin", "install"].concat(args), { - stdio: ["ignore", "inherit", "inherit"] -}); - -if (res.error && res.error.code === "ENOENT") { - console.error("\nThere was an error installing the resource provider plugin. " + - "It looks like `pulumi` is not installed on your system. " + - "Please visit https://pulumi.com/ to install the Pulumi CLI.\n" + - "You may try manually installing the plugin by running " + - "`pulumi plugin install " + args.join(" ") + "`"); -} else if (res.error || res.status !== 0) { - console.error("\nThere was an error installing the resource provider plugin. " + - "You may try to manually installing the plugin by running " + - "`pulumi plugin install " + args.join(" ") + "`"); -} - -process.exit(0); diff --git a/sdk/python/pulumi_mailgun/domain.py b/sdk/python/pulumi_mailgun/domain.py index 97c61fb..deac656 100644 --- a/sdk/python/pulumi_mailgun/domain.py +++ b/sdk/python/pulumi_mailgun/domain.py @@ -309,6 +309,9 @@ def receiving_records(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['Doma """ A list of DNS records for receiving validation. **Deprecated** Use `receiving_records_set` instead. """ + warnings.warn("""Use `receiving_records_set` instead.""", DeprecationWarning) + pulumi.log.warn("""receiving_records is deprecated: Use `receiving_records_set` instead.""") + return pulumi.get(self, "receiving_records") @receiving_records.setter @@ -345,6 +348,9 @@ def sending_records(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['Domain """ A list of DNS records for sending validation. **Deprecated** Use `sending_records_set` instead. """ + warnings.warn("""Use `sending_records_set` instead.""", DeprecationWarning) + pulumi.log.warn("""sending_records is deprecated: Use `sending_records_set` instead.""") + return pulumi.get(self, "sending_records") @sending_records.setter @@ -675,6 +681,9 @@ def receiving_records(self) -> pulumi.Output[Sequence['outputs.DomainReceivingRe """ A list of DNS records for receiving validation. **Deprecated** Use `receiving_records_set` instead. """ + warnings.warn("""Use `receiving_records_set` instead.""", DeprecationWarning) + pulumi.log.warn("""receiving_records is deprecated: Use `receiving_records_set` instead.""") + return pulumi.get(self, "receiving_records") @property @@ -699,6 +708,9 @@ def sending_records(self) -> pulumi.Output[Sequence['outputs.DomainSendingRecord """ A list of DNS records for sending validation. **Deprecated** Use `sending_records_set` instead. """ + warnings.warn("""Use `sending_records_set` instead.""", DeprecationWarning) + pulumi.log.warn("""sending_records is deprecated: Use `sending_records_set` instead.""") + return pulumi.get(self, "sending_records") @property diff --git a/sdk/python/pulumi_mailgun/get_domain.py b/sdk/python/pulumi_mailgun/get_domain.py index 559b811..7953260 100644 --- a/sdk/python/pulumi_mailgun/get_domain.py +++ b/sdk/python/pulumi_mailgun/get_domain.py @@ -43,10 +43,6 @@ def __init__(__self__, dkim_key_size=None, dkim_selector=None, force_dkim_author pulumi.set(__self__, "open_tracking", open_tracking) if receiving_records and not isinstance(receiving_records, list): raise TypeError("Expected argument 'receiving_records' to be a list") - if receiving_records is not None: - warnings.warn("""Use `receiving_records_set` instead.""", DeprecationWarning) - pulumi.log.warn("""receiving_records is deprecated: Use `receiving_records_set` instead.""") - pulumi.set(__self__, "receiving_records", receiving_records) if receiving_records_sets and not isinstance(receiving_records_sets, list): raise TypeError("Expected argument 'receiving_records_sets' to be a list") @@ -56,10 +52,6 @@ def __init__(__self__, dkim_key_size=None, dkim_selector=None, force_dkim_author pulumi.set(__self__, "region", region) if sending_records and not isinstance(sending_records, list): raise TypeError("Expected argument 'sending_records' to be a list") - if sending_records is not None: - warnings.warn("""Use `sending_records_set` instead.""", DeprecationWarning) - pulumi.log.warn("""sending_records is deprecated: Use `sending_records_set` instead.""") - pulumi.set(__self__, "sending_records", sending_records) if sending_records_sets and not isinstance(sending_records_sets, list): raise TypeError("Expected argument 'sending_records_sets' to be a list") @@ -119,6 +111,9 @@ def receiving_records(self) -> Sequence['outputs.GetDomainReceivingRecordResult' """ A list of DNS records for receiving validation. """ + warnings.warn("""Use `receiving_records_set` instead.""", DeprecationWarning) + pulumi.log.warn("""receiving_records is deprecated: Use `receiving_records_set` instead.""") + return pulumi.get(self, "receiving_records") @property @@ -137,6 +132,9 @@ def sending_records(self) -> Sequence['outputs.GetDomainSendingRecordResult']: """ A list of DNS records for sending validation. """ + warnings.warn("""Use `sending_records_set` instead.""", DeprecationWarning) + pulumi.log.warn("""sending_records is deprecated: Use `sending_records_set` instead.""") + return pulumi.get(self, "sending_records") @property @@ -253,21 +251,21 @@ def get_domain(dkim_key_size: Optional[int] = None, __ret__ = pulumi.runtime.invoke('mailgun:index/getDomain:getDomain', __args__, opts=opts, typ=GetDomainResult).value return AwaitableGetDomainResult( - dkim_key_size=__ret__.dkim_key_size, - dkim_selector=__ret__.dkim_selector, - force_dkim_authority=__ret__.force_dkim_authority, - id=__ret__.id, - name=__ret__.name, - open_tracking=__ret__.open_tracking, - receiving_records=__ret__.receiving_records, - receiving_records_sets=__ret__.receiving_records_sets, - region=__ret__.region, - sending_records=__ret__.sending_records, - sending_records_sets=__ret__.sending_records_sets, - smtp_login=__ret__.smtp_login, - smtp_password=__ret__.smtp_password, - spam_action=__ret__.spam_action, - wildcard=__ret__.wildcard) + dkim_key_size=pulumi.get(__ret__, 'dkim_key_size'), + dkim_selector=pulumi.get(__ret__, 'dkim_selector'), + force_dkim_authority=pulumi.get(__ret__, 'force_dkim_authority'), + id=pulumi.get(__ret__, 'id'), + name=pulumi.get(__ret__, 'name'), + open_tracking=pulumi.get(__ret__, 'open_tracking'), + receiving_records=pulumi.get(__ret__, 'receiving_records'), + receiving_records_sets=pulumi.get(__ret__, 'receiving_records_sets'), + region=pulumi.get(__ret__, 'region'), + sending_records=pulumi.get(__ret__, 'sending_records'), + sending_records_sets=pulumi.get(__ret__, 'sending_records_sets'), + smtp_login=pulumi.get(__ret__, 'smtp_login'), + smtp_password=pulumi.get(__ret__, 'smtp_password'), + spam_action=pulumi.get(__ret__, 'spam_action'), + wildcard=pulumi.get(__ret__, 'wildcard')) @_utilities.lift_output_func(get_domain) diff --git a/sdk/python/setup.py b/sdk/python/setup.py index 496e867..d6c57ec 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -9,26 +9,6 @@ VERSION = "0.0.0" -PLUGIN_VERSION = "0.0.0" - -class InstallPluginCommand(install): - def run(self): - install.run(self) - try: - check_call(['pulumi', 'plugin', 'install', 'resource', 'mailgun', PLUGIN_VERSION]) - except OSError as error: - if error.errno == errno.ENOENT: - print(f""" - There was an error installing the mailgun resource provider plugin. - It looks like `pulumi` is not installed on your system. - Please visit https://pulumi.com/ to install the Pulumi CLI. - You may try manually installing the plugin by running - `pulumi plugin install resource mailgun {PLUGIN_VERSION}` - """) - else: - raise - - def readme(): try: with open('README.md', encoding='utf-8') as f: @@ -38,13 +18,11 @@ def readme(): setup(name='pulumi_mailgun', + python_requires='>=3.7', version=VERSION, description="A Pulumi package for creating and managing Mailgun resources.", long_description=readme(), long_description_content_type='text/markdown', - cmdclass={ - 'install': InstallPluginCommand, - }, keywords='pulumi mailgun', url='https://pulumi.io', project_urls={