diff --git a/provider/cmd/pulumi-resource-spotinst/schema.json b/provider/cmd/pulumi-resource-spotinst/schema.json index 4026308b..60bd5747 100644 --- a/provider/cmd/pulumi-resource-spotinst/schema.json +++ b/provider/cmd/pulumi-resource-spotinst/schema.json @@ -64,6 +64,10 @@ "type": "string", "description": "Spotinst Account ID\n" }, + "enabled": { + "type": "boolean", + "description": "Enable or disable the Spotinst provider\n" + }, "featureFlags": { "type": "string", "description": "Spotinst SDK Feature Flags\n" @@ -2146,9 +2150,18 @@ "deleteOnTermination": { "type": "boolean" }, + "encrypted": { + "type": "boolean" + }, "iops": { "type": "integer" }, + "kmsKeyId": { + "type": "string" + }, + "snapshotId": { + "type": "string" + }, "throughput": { "type": "integer" }, @@ -9187,6 +9200,10 @@ "type": "string", "description": "Spotinst Account ID\n" }, + "enabled": { + "type": "boolean", + "description": "Enable or disable the Spotinst provider\n" + }, "featureFlags": { "type": "string", "description": "Spotinst SDK Feature Flags\n" @@ -9201,6 +9218,10 @@ "type": "string", "description": "Spotinst Account ID\n" }, + "enabled": { + "type": "boolean", + "description": "Enable or disable the Spotinst provider\n" + }, "featureFlags": { "type": "string", "description": "Spotinst SDK Feature Flags\n" @@ -9441,10 +9462,11 @@ } }, "spotinst:aws/credentials:Credentials": { - "description": "Provides a Spotinst credential AWS resource.\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as spotinst from \"@pulumi/spotinst\";\n\n// set credential AWS\nconst credential = new spotinst.aws.Credentials(\"credential\", {\n accountid: \"act-123456\",\n iamrole: \"arn:aws:iam::1234567890:role/Spot_Iam_Role\",\n});\n```\n```python\nimport pulumi\nimport pulumi_spotinst as spotinst\n\n# set credential AWS\ncredential = spotinst.aws.Credentials(\"credential\",\n accountid=\"act-123456\",\n iamrole=\"arn:aws:iam::1234567890:role/Spot_Iam_Role\")\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing SpotInst = Pulumi.SpotInst;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n // set credential AWS\n var credential = new SpotInst.Aws.Credentials(\"credential\", new()\n {\n Accountid = \"act-123456\",\n Iamrole = \"arn:aws:iam::1234567890:role/Spot_Iam_Role\",\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-spotinst/sdk/v3/go/spotinst/aws\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\t// set credential AWS\n\t\t_, err := aws.NewCredentials(ctx, \"credential\", \u0026aws.CredentialsArgs{\n\t\t\tAccountid: pulumi.String(\"act-123456\"),\n\t\t\tIamrole: pulumi.String(\"arn:aws:iam::1234567890:role/Spot_Iam_Role\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.spotinst.aws.Credentials;\nimport com.pulumi.spotinst.aws.CredentialsArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var credential = new Credentials(\"credential\", CredentialsArgs.builder() \n .accountid(\"act-123456\")\n .iamrole(\"arn:aws:iam::1234567890:role/Spot_Iam_Role\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n # set credential AWS\n credential:\n type: spotinst:aws:Credentials\n properties:\n accountid: act-123456\n iamrole: arn:aws:iam::1234567890:role/Spot_Iam_Role\n```\n\u003c!--End PulumiCodeChooser --\u003e\n", + "description": "Provides a Spotinst credential AWS resource.\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as spotinst from \"@pulumi/spotinst\";\n\n// set credential AWS\nconst credential = new spotinst.aws.Credentials(\"credential\", {\n accountId: \"act-123456\",\n iamrole: \"arn:aws:iam::1234567890:role/Spot_Iam_Role\",\n});\n```\n```python\nimport pulumi\nimport pulumi_spotinst as spotinst\n\n# set credential AWS\ncredential = spotinst.aws.Credentials(\"credential\",\n account_id=\"act-123456\",\n iamrole=\"arn:aws:iam::1234567890:role/Spot_Iam_Role\")\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing SpotInst = Pulumi.SpotInst;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n // set credential AWS\n var credential = new SpotInst.Aws.Credentials(\"credential\", new()\n {\n AccountId = \"act-123456\",\n Iamrole = \"arn:aws:iam::1234567890:role/Spot_Iam_Role\",\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-spotinst/sdk/v3/go/spotinst/aws\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\t// set credential AWS\n\t\t_, err := aws.NewCredentials(ctx, \"credential\", \u0026aws.CredentialsArgs{\n\t\t\tAccountId: pulumi.String(\"act-123456\"),\n\t\t\tIamrole: pulumi.String(\"arn:aws:iam::1234567890:role/Spot_Iam_Role\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.spotinst.aws.Credentials;\nimport com.pulumi.spotinst.aws.CredentialsArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var credential = new Credentials(\"credential\", CredentialsArgs.builder() \n .accountId(\"act-123456\")\n .iamrole(\"arn:aws:iam::1234567890:role/Spot_Iam_Role\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n # set credential AWS\n credential:\n type: spotinst:aws:Credentials\n properties:\n accountId: act-123456\n iamrole: arn:aws:iam::1234567890:role/Spot_Iam_Role\n```\n\u003c!--End PulumiCodeChooser --\u003e\n", "properties": { "accountId": { - "type": "string" + "type": "string", + "description": "The ID of the account associated with your token.\n" }, "iamrole": { "type": "string", @@ -9458,6 +9480,7 @@ "inputProperties": { "accountId": { "type": "string", + "description": "The ID of the account associated with your token.\n", "willReplaceOnChanges": true }, "iamrole": { @@ -9475,6 +9498,7 @@ "properties": { "accountId": { "type": "string", + "description": "The ID of the account associated with your token.\n", "willReplaceOnChanges": true }, "iamrole": { diff --git a/provider/go.mod b/provider/go.mod index 6a16e785..2b8c96dd 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -205,8 +205,8 @@ require ( github.com/spf13/cast v1.5.0 // indirect github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spotinst/spotinst-sdk-go v1.194.0 // indirect - github.com/stretchr/testify v1.8.4 // indirect + github.com/spotinst/spotinst-sdk-go v1.336.0 // indirect + github.com/stretchr/testify v1.9.0 // indirect github.com/texttheater/golang-levenshtein v1.0.1 // indirect github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect diff --git a/provider/go.sum b/provider/go.sum index f41b6241..3675ea3a 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -2964,8 +2964,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spotinst/spotinst-sdk-go v1.194.0 h1:bq76aWyqd6LPA+P2zMv17CEv8xAuLhKY3FSrxLgbP3A= -github.com/spotinst/spotinst-sdk-go v1.194.0/go.mod h1:DP/y998hi551EWIR6t4mbohMMMKjp1IE0K+eJztaFGc= +github.com/spotinst/spotinst-sdk-go v1.336.0 h1:TvgKWDznce2WIAKNktmRgLqfFLlK92SHaTWQd/EGvLk= +github.com/spotinst/spotinst-sdk-go v1.336.0/go.mod h1:cPpdCFZ4K3PWCbZdQB2wxNfEUVuz+KecJCSbqqesoMM= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -2976,8 +2976,9 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -2992,8 +2993,9 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= diff --git a/sdk/dotnet/Aws/Credentials.cs b/sdk/dotnet/Aws/Credentials.cs index 21b3a4bf..c8536088 100644 --- a/sdk/dotnet/Aws/Credentials.cs +++ b/sdk/dotnet/Aws/Credentials.cs @@ -26,7 +26,7 @@ namespace Pulumi.SpotInst.Aws /// // set credential AWS /// var credential = new SpotInst.Aws.Credentials("credential", new() /// { - /// Accountid = "act-123456", + /// AccountId = "act-123456", /// Iamrole = "arn:aws:iam::1234567890:role/Spot_Iam_Role", /// }); /// @@ -37,6 +37,9 @@ namespace Pulumi.SpotInst.Aws [SpotInstResourceType("spotinst:aws/credentials:Credentials")] public partial class Credentials : global::Pulumi.CustomResource { + /// + /// The ID of the account associated with your token. + /// [Output("accountId")] public Output AccountId { get; private set; } = null!; @@ -92,6 +95,9 @@ public static Credentials Get(string name, Input id, CredentialsState? s public sealed class CredentialsArgs : global::Pulumi.ResourceArgs { + /// + /// The ID of the account associated with your token. + /// [Input("accountId", required: true)] public Input AccountId { get; set; } = null!; @@ -109,6 +115,9 @@ public CredentialsArgs() public sealed class CredentialsState : global::Pulumi.ResourceArgs { + /// + /// The ID of the account associated with your token. + /// [Input("accountId")] public Input? AccountId { get; set; } diff --git a/sdk/dotnet/Aws/Inputs/ManagedInstanceBlockDeviceMappingEbsArgs.cs b/sdk/dotnet/Aws/Inputs/ManagedInstanceBlockDeviceMappingEbsArgs.cs index 6a655438..586c0820 100644 --- a/sdk/dotnet/Aws/Inputs/ManagedInstanceBlockDeviceMappingEbsArgs.cs +++ b/sdk/dotnet/Aws/Inputs/ManagedInstanceBlockDeviceMappingEbsArgs.cs @@ -15,9 +15,18 @@ public sealed class ManagedInstanceBlockDeviceMappingEbsArgs : global::Pulumi.Re [Input("deleteOnTermination")] public Input? DeleteOnTermination { get; set; } + [Input("encrypted")] + public Input? Encrypted { get; set; } + [Input("iops")] public Input? Iops { get; set; } + [Input("kmsKeyId")] + public Input? KmsKeyId { get; set; } + + [Input("snapshotId")] + public Input? SnapshotId { get; set; } + [Input("throughput")] public Input? Throughput { get; set; } diff --git a/sdk/dotnet/Aws/Inputs/ManagedInstanceBlockDeviceMappingEbsGetArgs.cs b/sdk/dotnet/Aws/Inputs/ManagedInstanceBlockDeviceMappingEbsGetArgs.cs index a75662dd..b0deeb49 100644 --- a/sdk/dotnet/Aws/Inputs/ManagedInstanceBlockDeviceMappingEbsGetArgs.cs +++ b/sdk/dotnet/Aws/Inputs/ManagedInstanceBlockDeviceMappingEbsGetArgs.cs @@ -15,9 +15,18 @@ public sealed class ManagedInstanceBlockDeviceMappingEbsGetArgs : global::Pulumi [Input("deleteOnTermination")] public Input? DeleteOnTermination { get; set; } + [Input("encrypted")] + public Input? Encrypted { get; set; } + [Input("iops")] public Input? Iops { get; set; } + [Input("kmsKeyId")] + public Input? KmsKeyId { get; set; } + + [Input("snapshotId")] + public Input? SnapshotId { get; set; } + [Input("throughput")] public Input? Throughput { get; set; } diff --git a/sdk/dotnet/Aws/Outputs/ManagedInstanceBlockDeviceMappingEbs.cs b/sdk/dotnet/Aws/Outputs/ManagedInstanceBlockDeviceMappingEbs.cs index b75bdcac..ed216593 100644 --- a/sdk/dotnet/Aws/Outputs/ManagedInstanceBlockDeviceMappingEbs.cs +++ b/sdk/dotnet/Aws/Outputs/ManagedInstanceBlockDeviceMappingEbs.cs @@ -14,7 +14,10 @@ namespace Pulumi.SpotInst.Aws.Outputs public sealed class ManagedInstanceBlockDeviceMappingEbs { public readonly bool? DeleteOnTermination; + public readonly bool? Encrypted; public readonly int? Iops; + public readonly string? KmsKeyId; + public readonly string? SnapshotId; public readonly int? Throughput; public readonly int? VolumeSize; public readonly string? VolumeType; @@ -23,8 +26,14 @@ public sealed class ManagedInstanceBlockDeviceMappingEbs private ManagedInstanceBlockDeviceMappingEbs( bool? deleteOnTermination, + bool? encrypted, + int? iops, + string? kmsKeyId, + + string? snapshotId, + int? throughput, int? volumeSize, @@ -32,7 +41,10 @@ private ManagedInstanceBlockDeviceMappingEbs( string? volumeType) { DeleteOnTermination = deleteOnTermination; + Encrypted = encrypted; Iops = iops; + KmsKeyId = kmsKeyId; + SnapshotId = snapshotId; Throughput = throughput; VolumeSize = volumeSize; VolumeType = volumeType; diff --git a/sdk/dotnet/Config/Config.cs b/sdk/dotnet/Config/Config.cs index 2b85d898..dcd40ddc 100644 --- a/sdk/dotnet/Config/Config.cs +++ b/sdk/dotnet/Config/Config.cs @@ -42,6 +42,16 @@ public static string? Account set => _account.Set(value); } + private static readonly __Value _enabled = new __Value(() => __config.GetBoolean("enabled")); + /// + /// Enable or disable the Spotinst provider + /// + public static bool? Enabled + { + get => _enabled.Get(); + set => _enabled.Set(value); + } + private static readonly __Value _featureFlags = new __Value(() => __config.Get("featureFlags")); /// /// Spotinst SDK Feature Flags diff --git a/sdk/dotnet/Provider.cs b/sdk/dotnet/Provider.cs index 9e1f1604..a05a0a1f 100644 --- a/sdk/dotnet/Provider.cs +++ b/sdk/dotnet/Provider.cs @@ -70,6 +70,12 @@ public sealed class ProviderArgs : global::Pulumi.ResourceArgs [Input("account")] public Input? Account { get; set; } + /// + /// Enable or disable the Spotinst provider + /// + [Input("enabled", json: true)] + public Input? Enabled { get; set; } + /// /// Spotinst SDK Feature Flags /// diff --git a/sdk/go/spotinst/aws/credentials.go b/sdk/go/spotinst/aws/credentials.go index f2609cbc..e8c39c41 100644 --- a/sdk/go/spotinst/aws/credentials.go +++ b/sdk/go/spotinst/aws/credentials.go @@ -31,7 +31,7 @@ import ( // pulumi.Run(func(ctx *pulumi.Context) error { // // set credential AWS // _, err := aws.NewCredentials(ctx, "credential", &aws.CredentialsArgs{ -// Accountid: pulumi.String("act-123456"), +// AccountId: pulumi.String("act-123456"), // Iamrole: pulumi.String("arn:aws:iam::1234567890:role/Spot_Iam_Role"), // }) // if err != nil { @@ -46,6 +46,7 @@ import ( type Credentials struct { pulumi.CustomResourceState + // The ID of the account associated with your token. AccountId pulumi.StringOutput `pulumi:"accountId"` // Provide the IAM Role ARN connected to another AWS account 922761411349 and with the latest Spot Policy - https://docs.spot.io/administration/api/spot-policy-in-aws Iamrole pulumi.StringOutput `pulumi:"iamrole"` @@ -87,12 +88,14 @@ func GetCredentials(ctx *pulumi.Context, // Input properties used for looking up and filtering Credentials resources. type credentialsState struct { + // The ID of the account associated with your token. AccountId *string `pulumi:"accountId"` // Provide the IAM Role ARN connected to another AWS account 922761411349 and with the latest Spot Policy - https://docs.spot.io/administration/api/spot-policy-in-aws Iamrole *string `pulumi:"iamrole"` } type CredentialsState struct { + // The ID of the account associated with your token. AccountId pulumi.StringPtrInput // Provide the IAM Role ARN connected to another AWS account 922761411349 and with the latest Spot Policy - https://docs.spot.io/administration/api/spot-policy-in-aws Iamrole pulumi.StringPtrInput @@ -103,6 +106,7 @@ func (CredentialsState) ElementType() reflect.Type { } type credentialsArgs struct { + // The ID of the account associated with your token. AccountId string `pulumi:"accountId"` // Provide the IAM Role ARN connected to another AWS account 922761411349 and with the latest Spot Policy - https://docs.spot.io/administration/api/spot-policy-in-aws Iamrole string `pulumi:"iamrole"` @@ -110,6 +114,7 @@ type credentialsArgs struct { // The set of arguments for constructing a Credentials resource. type CredentialsArgs struct { + // The ID of the account associated with your token. AccountId pulumi.StringInput // Provide the IAM Role ARN connected to another AWS account 922761411349 and with the latest Spot Policy - https://docs.spot.io/administration/api/spot-policy-in-aws Iamrole pulumi.StringInput @@ -202,6 +207,7 @@ func (o CredentialsOutput) ToCredentialsOutputWithContext(ctx context.Context) C return o } +// The ID of the account associated with your token. func (o CredentialsOutput) AccountId() pulumi.StringOutput { return o.ApplyT(func(v *Credentials) pulumi.StringOutput { return v.AccountId }).(pulumi.StringOutput) } diff --git a/sdk/go/spotinst/aws/pulumiTypes.go b/sdk/go/spotinst/aws/pulumiTypes.go index b195830a..132da9ce 100644 --- a/sdk/go/spotinst/aws/pulumiTypes.go +++ b/sdk/go/spotinst/aws/pulumiTypes.go @@ -14254,7 +14254,10 @@ func (o ManagedInstanceBlockDeviceMappingArrayOutput) Index(i pulumi.IntInput) M type ManagedInstanceBlockDeviceMappingEbs struct { DeleteOnTermination *bool `pulumi:"deleteOnTermination"` + Encrypted *bool `pulumi:"encrypted"` Iops *int `pulumi:"iops"` + KmsKeyId *string `pulumi:"kmsKeyId"` + SnapshotId *string `pulumi:"snapshotId"` Throughput *int `pulumi:"throughput"` VolumeSize *int `pulumi:"volumeSize"` VolumeType *string `pulumi:"volumeType"` @@ -14273,7 +14276,10 @@ type ManagedInstanceBlockDeviceMappingEbsInput interface { type ManagedInstanceBlockDeviceMappingEbsArgs struct { DeleteOnTermination pulumi.BoolPtrInput `pulumi:"deleteOnTermination"` + Encrypted pulumi.BoolPtrInput `pulumi:"encrypted"` Iops pulumi.IntPtrInput `pulumi:"iops"` + KmsKeyId pulumi.StringPtrInput `pulumi:"kmsKeyId"` + SnapshotId pulumi.StringPtrInput `pulumi:"snapshotId"` Throughput pulumi.IntPtrInput `pulumi:"throughput"` VolumeSize pulumi.IntPtrInput `pulumi:"volumeSize"` VolumeType pulumi.StringPtrInput `pulumi:"volumeType"` @@ -14360,10 +14366,22 @@ func (o ManagedInstanceBlockDeviceMappingEbsOutput) DeleteOnTermination() pulumi return o.ApplyT(func(v ManagedInstanceBlockDeviceMappingEbs) *bool { return v.DeleteOnTermination }).(pulumi.BoolPtrOutput) } +func (o ManagedInstanceBlockDeviceMappingEbsOutput) Encrypted() pulumi.BoolPtrOutput { + return o.ApplyT(func(v ManagedInstanceBlockDeviceMappingEbs) *bool { return v.Encrypted }).(pulumi.BoolPtrOutput) +} + func (o ManagedInstanceBlockDeviceMappingEbsOutput) Iops() pulumi.IntPtrOutput { return o.ApplyT(func(v ManagedInstanceBlockDeviceMappingEbs) *int { return v.Iops }).(pulumi.IntPtrOutput) } +func (o ManagedInstanceBlockDeviceMappingEbsOutput) KmsKeyId() pulumi.StringPtrOutput { + return o.ApplyT(func(v ManagedInstanceBlockDeviceMappingEbs) *string { return v.KmsKeyId }).(pulumi.StringPtrOutput) +} + +func (o ManagedInstanceBlockDeviceMappingEbsOutput) SnapshotId() pulumi.StringPtrOutput { + return o.ApplyT(func(v ManagedInstanceBlockDeviceMappingEbs) *string { return v.SnapshotId }).(pulumi.StringPtrOutput) +} + func (o ManagedInstanceBlockDeviceMappingEbsOutput) Throughput() pulumi.IntPtrOutput { return o.ApplyT(func(v ManagedInstanceBlockDeviceMappingEbs) *int { return v.Throughput }).(pulumi.IntPtrOutput) } @@ -14409,6 +14427,15 @@ func (o ManagedInstanceBlockDeviceMappingEbsPtrOutput) DeleteOnTermination() pul }).(pulumi.BoolPtrOutput) } +func (o ManagedInstanceBlockDeviceMappingEbsPtrOutput) Encrypted() pulumi.BoolPtrOutput { + return o.ApplyT(func(v *ManagedInstanceBlockDeviceMappingEbs) *bool { + if v == nil { + return nil + } + return v.Encrypted + }).(pulumi.BoolPtrOutput) +} + func (o ManagedInstanceBlockDeviceMappingEbsPtrOutput) Iops() pulumi.IntPtrOutput { return o.ApplyT(func(v *ManagedInstanceBlockDeviceMappingEbs) *int { if v == nil { @@ -14418,6 +14445,24 @@ func (o ManagedInstanceBlockDeviceMappingEbsPtrOutput) Iops() pulumi.IntPtrOutpu }).(pulumi.IntPtrOutput) } +func (o ManagedInstanceBlockDeviceMappingEbsPtrOutput) KmsKeyId() pulumi.StringPtrOutput { + return o.ApplyT(func(v *ManagedInstanceBlockDeviceMappingEbs) *string { + if v == nil { + return nil + } + return v.KmsKeyId + }).(pulumi.StringPtrOutput) +} + +func (o ManagedInstanceBlockDeviceMappingEbsPtrOutput) SnapshotId() pulumi.StringPtrOutput { + return o.ApplyT(func(v *ManagedInstanceBlockDeviceMappingEbs) *string { + if v == nil { + return nil + } + return v.SnapshotId + }).(pulumi.StringPtrOutput) +} + func (o ManagedInstanceBlockDeviceMappingEbsPtrOutput) Throughput() pulumi.IntPtrOutput { return o.ApplyT(func(v *ManagedInstanceBlockDeviceMappingEbs) *int { if v == nil { diff --git a/sdk/go/spotinst/config/config.go b/sdk/go/spotinst/config/config.go index 3f53525a..f1459797 100644 --- a/sdk/go/spotinst/config/config.go +++ b/sdk/go/spotinst/config/config.go @@ -16,6 +16,11 @@ func GetAccount(ctx *pulumi.Context) string { return config.Get(ctx, "spotinst:account") } +// Enable or disable the Spotinst provider +func GetEnabled(ctx *pulumi.Context) bool { + return config.GetBool(ctx, "spotinst:enabled") +} + // Spotinst SDK Feature Flags func GetFeatureFlags(ctx *pulumi.Context) string { return config.Get(ctx, "spotinst:featureFlags") diff --git a/sdk/go/spotinst/provider.go b/sdk/go/spotinst/provider.go index 6a87c0b6..bdf1a852 100644 --- a/sdk/go/spotinst/provider.go +++ b/sdk/go/spotinst/provider.go @@ -45,6 +45,8 @@ func NewProvider(ctx *pulumi.Context, type providerArgs struct { // Spotinst Account ID Account *string `pulumi:"account"` + // Enable or disable the Spotinst provider + Enabled *bool `pulumi:"enabled"` // Spotinst SDK Feature Flags FeatureFlags *string `pulumi:"featureFlags"` // Spotinst Personal API Access Token @@ -55,6 +57,8 @@ type providerArgs struct { type ProviderArgs struct { // Spotinst Account ID Account pulumi.StringPtrInput + // Enable or disable the Spotinst provider + Enabled pulumi.BoolPtrInput // Spotinst SDK Feature Flags FeatureFlags pulumi.StringPtrInput // Spotinst Personal API Access Token diff --git a/sdk/java/src/main/java/com/pulumi/spotinst/Config.java b/sdk/java/src/main/java/com/pulumi/spotinst/Config.java index 7c9e4dc8..fa98ff14 100644 --- a/sdk/java/src/main/java/com/pulumi/spotinst/Config.java +++ b/sdk/java/src/main/java/com/pulumi/spotinst/Config.java @@ -4,6 +4,7 @@ package com.pulumi.spotinst; import com.pulumi.core.internal.Codegen; +import java.lang.Boolean; import java.lang.String; import java.util.Optional; @@ -17,6 +18,13 @@ public final class Config { public Optional account() { return Codegen.stringProp("account").config(config).get(); } +/** + * Enable or disable the Spotinst provider + * + */ + public Optional enabled() { + return Codegen.booleanProp("enabled").config(config).get(); + } /** * Spotinst SDK Feature Flags * diff --git a/sdk/java/src/main/java/com/pulumi/spotinst/ProviderArgs.java b/sdk/java/src/main/java/com/pulumi/spotinst/ProviderArgs.java index d2e3318d..add97410 100644 --- a/sdk/java/src/main/java/com/pulumi/spotinst/ProviderArgs.java +++ b/sdk/java/src/main/java/com/pulumi/spotinst/ProviderArgs.java @@ -5,6 +5,7 @@ import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; +import java.lang.Boolean; import java.lang.String; import java.util.Objects; import java.util.Optional; @@ -30,6 +31,21 @@ public Optional> account() { return Optional.ofNullable(this.account); } + /** + * Enable or disable the Spotinst provider + * + */ + @Import(name="enabled", json=true) + private @Nullable Output enabled; + + /** + * @return Enable or disable the Spotinst provider + * + */ + public Optional> enabled() { + return Optional.ofNullable(this.enabled); + } + /** * Spotinst SDK Feature Flags * @@ -64,6 +80,7 @@ private ProviderArgs() {} private ProviderArgs(ProviderArgs $) { this.account = $.account; + this.enabled = $.enabled; this.featureFlags = $.featureFlags; this.token = $.token; } @@ -107,6 +124,27 @@ public Builder account(String account) { return account(Output.of(account)); } + /** + * @param enabled Enable or disable the Spotinst provider + * + * @return builder + * + */ + public Builder enabled(@Nullable Output enabled) { + $.enabled = enabled; + return this; + } + + /** + * @param enabled Enable or disable the Spotinst provider + * + * @return builder + * + */ + public Builder enabled(Boolean enabled) { + return enabled(Output.of(enabled)); + } + /** * @param featureFlags Spotinst SDK Feature Flags * diff --git a/sdk/java/src/main/java/com/pulumi/spotinst/aws/Credentials.java b/sdk/java/src/main/java/com/pulumi/spotinst/aws/Credentials.java index 6a90e08b..e84baa43 100644 --- a/sdk/java/src/main/java/com/pulumi/spotinst/aws/Credentials.java +++ b/sdk/java/src/main/java/com/pulumi/spotinst/aws/Credentials.java @@ -41,7 +41,7 @@ * * public static void stack(Context ctx) { * var credential = new Credentials("credential", CredentialsArgs.builder() - * .accountid("act-123456") + * .accountId("act-123456") * .iamrole("arn:aws:iam::1234567890:role/Spot_Iam_Role") * .build()); * @@ -53,9 +53,17 @@ */ @ResourceType(type="spotinst:aws/credentials:Credentials") public class Credentials extends com.pulumi.resources.CustomResource { + /** + * The ID of the account associated with your token. + * + */ @Export(name="accountId", refs={String.class}, tree="[0]") private Output accountId; + /** + * @return The ID of the account associated with your token. + * + */ public Output accountId() { return this.accountId; } diff --git a/sdk/java/src/main/java/com/pulumi/spotinst/aws/CredentialsArgs.java b/sdk/java/src/main/java/com/pulumi/spotinst/aws/CredentialsArgs.java index 3dad6fdf..793ff24a 100644 --- a/sdk/java/src/main/java/com/pulumi/spotinst/aws/CredentialsArgs.java +++ b/sdk/java/src/main/java/com/pulumi/spotinst/aws/CredentialsArgs.java @@ -14,9 +14,17 @@ public final class CredentialsArgs extends com.pulumi.resources.ResourceArgs { public static final CredentialsArgs Empty = new CredentialsArgs(); + /** + * The ID of the account associated with your token. + * + */ @Import(name="accountId", required=true) private Output accountId; + /** + * @return The ID of the account associated with your token. + * + */ public Output accountId() { return this.accountId; } @@ -61,11 +69,23 @@ public Builder(CredentialsArgs defaults) { $ = new CredentialsArgs(Objects.requireNonNull(defaults)); } + /** + * @param accountId The ID of the account associated with your token. + * + * @return builder + * + */ public Builder accountId(Output accountId) { $.accountId = accountId; return this; } + /** + * @param accountId The ID of the account associated with your token. + * + * @return builder + * + */ public Builder accountId(String accountId) { return accountId(Output.of(accountId)); } diff --git a/sdk/java/src/main/java/com/pulumi/spotinst/aws/inputs/CredentialsState.java b/sdk/java/src/main/java/com/pulumi/spotinst/aws/inputs/CredentialsState.java index 61397561..5d30578e 100644 --- a/sdk/java/src/main/java/com/pulumi/spotinst/aws/inputs/CredentialsState.java +++ b/sdk/java/src/main/java/com/pulumi/spotinst/aws/inputs/CredentialsState.java @@ -15,9 +15,17 @@ public final class CredentialsState extends com.pulumi.resources.ResourceArgs { public static final CredentialsState Empty = new CredentialsState(); + /** + * The ID of the account associated with your token. + * + */ @Import(name="accountId") private @Nullable Output accountId; + /** + * @return The ID of the account associated with your token. + * + */ public Optional> accountId() { return Optional.ofNullable(this.accountId); } @@ -62,11 +70,23 @@ public Builder(CredentialsState defaults) { $ = new CredentialsState(Objects.requireNonNull(defaults)); } + /** + * @param accountId The ID of the account associated with your token. + * + * @return builder + * + */ public Builder accountId(@Nullable Output accountId) { $.accountId = accountId; return this; } + /** + * @param accountId The ID of the account associated with your token. + * + * @return builder + * + */ public Builder accountId(String accountId) { return accountId(Output.of(accountId)); } diff --git a/sdk/java/src/main/java/com/pulumi/spotinst/aws/inputs/ManagedInstanceBlockDeviceMappingEbsArgs.java b/sdk/java/src/main/java/com/pulumi/spotinst/aws/inputs/ManagedInstanceBlockDeviceMappingEbsArgs.java index a95b2573..82407355 100644 --- a/sdk/java/src/main/java/com/pulumi/spotinst/aws/inputs/ManagedInstanceBlockDeviceMappingEbsArgs.java +++ b/sdk/java/src/main/java/com/pulumi/spotinst/aws/inputs/ManagedInstanceBlockDeviceMappingEbsArgs.java @@ -24,6 +24,13 @@ public Optional> deleteOnTermination() { return Optional.ofNullable(this.deleteOnTermination); } + @Import(name="encrypted") + private @Nullable Output encrypted; + + public Optional> encrypted() { + return Optional.ofNullable(this.encrypted); + } + @Import(name="iops") private @Nullable Output iops; @@ -31,6 +38,20 @@ public Optional> iops() { return Optional.ofNullable(this.iops); } + @Import(name="kmsKeyId") + private @Nullable Output kmsKeyId; + + public Optional> kmsKeyId() { + return Optional.ofNullable(this.kmsKeyId); + } + + @Import(name="snapshotId") + private @Nullable Output snapshotId; + + public Optional> snapshotId() { + return Optional.ofNullable(this.snapshotId); + } + @Import(name="throughput") private @Nullable Output throughput; @@ -56,7 +77,10 @@ private ManagedInstanceBlockDeviceMappingEbsArgs() {} private ManagedInstanceBlockDeviceMappingEbsArgs(ManagedInstanceBlockDeviceMappingEbsArgs $) { this.deleteOnTermination = $.deleteOnTermination; + this.encrypted = $.encrypted; this.iops = $.iops; + this.kmsKeyId = $.kmsKeyId; + this.snapshotId = $.snapshotId; this.throughput = $.throughput; this.volumeSize = $.volumeSize; this.volumeType = $.volumeType; @@ -89,6 +113,15 @@ public Builder deleteOnTermination(Boolean deleteOnTermination) { return deleteOnTermination(Output.of(deleteOnTermination)); } + public Builder encrypted(@Nullable Output encrypted) { + $.encrypted = encrypted; + return this; + } + + public Builder encrypted(Boolean encrypted) { + return encrypted(Output.of(encrypted)); + } + public Builder iops(@Nullable Output iops) { $.iops = iops; return this; @@ -98,6 +131,24 @@ public Builder iops(Integer iops) { return iops(Output.of(iops)); } + public Builder kmsKeyId(@Nullable Output kmsKeyId) { + $.kmsKeyId = kmsKeyId; + return this; + } + + public Builder kmsKeyId(String kmsKeyId) { + return kmsKeyId(Output.of(kmsKeyId)); + } + + public Builder snapshotId(@Nullable Output snapshotId) { + $.snapshotId = snapshotId; + return this; + } + + public Builder snapshotId(String snapshotId) { + return snapshotId(Output.of(snapshotId)); + } + public Builder throughput(@Nullable Output throughput) { $.throughput = throughput; return this; diff --git a/sdk/java/src/main/java/com/pulumi/spotinst/aws/outputs/ManagedInstanceBlockDeviceMappingEbs.java b/sdk/java/src/main/java/com/pulumi/spotinst/aws/outputs/ManagedInstanceBlockDeviceMappingEbs.java index c954fadb..eacd7814 100644 --- a/sdk/java/src/main/java/com/pulumi/spotinst/aws/outputs/ManagedInstanceBlockDeviceMappingEbs.java +++ b/sdk/java/src/main/java/com/pulumi/spotinst/aws/outputs/ManagedInstanceBlockDeviceMappingEbs.java @@ -14,7 +14,10 @@ @CustomType public final class ManagedInstanceBlockDeviceMappingEbs { private @Nullable Boolean deleteOnTermination; + private @Nullable Boolean encrypted; private @Nullable Integer iops; + private @Nullable String kmsKeyId; + private @Nullable String snapshotId; private @Nullable Integer throughput; private @Nullable Integer volumeSize; private @Nullable String volumeType; @@ -23,9 +26,18 @@ private ManagedInstanceBlockDeviceMappingEbs() {} public Optional deleteOnTermination() { return Optional.ofNullable(this.deleteOnTermination); } + public Optional encrypted() { + return Optional.ofNullable(this.encrypted); + } public Optional iops() { return Optional.ofNullable(this.iops); } + public Optional kmsKeyId() { + return Optional.ofNullable(this.kmsKeyId); + } + public Optional snapshotId() { + return Optional.ofNullable(this.snapshotId); + } public Optional throughput() { return Optional.ofNullable(this.throughput); } @@ -46,7 +58,10 @@ public static Builder builder(ManagedInstanceBlockDeviceMappingEbs defaults) { @CustomType.Builder public static final class Builder { private @Nullable Boolean deleteOnTermination; + private @Nullable Boolean encrypted; private @Nullable Integer iops; + private @Nullable String kmsKeyId; + private @Nullable String snapshotId; private @Nullable Integer throughput; private @Nullable Integer volumeSize; private @Nullable String volumeType; @@ -54,7 +69,10 @@ public Builder() {} public Builder(ManagedInstanceBlockDeviceMappingEbs defaults) { Objects.requireNonNull(defaults); this.deleteOnTermination = defaults.deleteOnTermination; + this.encrypted = defaults.encrypted; this.iops = defaults.iops; + this.kmsKeyId = defaults.kmsKeyId; + this.snapshotId = defaults.snapshotId; this.throughput = defaults.throughput; this.volumeSize = defaults.volumeSize; this.volumeType = defaults.volumeType; @@ -67,12 +85,30 @@ public Builder deleteOnTermination(@Nullable Boolean deleteOnTermination) { return this; } @CustomType.Setter + public Builder encrypted(@Nullable Boolean encrypted) { + + this.encrypted = encrypted; + return this; + } + @CustomType.Setter public Builder iops(@Nullable Integer iops) { this.iops = iops; return this; } @CustomType.Setter + public Builder kmsKeyId(@Nullable String kmsKeyId) { + + this.kmsKeyId = kmsKeyId; + return this; + } + @CustomType.Setter + public Builder snapshotId(@Nullable String snapshotId) { + + this.snapshotId = snapshotId; + return this; + } + @CustomType.Setter public Builder throughput(@Nullable Integer throughput) { this.throughput = throughput; @@ -93,7 +129,10 @@ public Builder volumeType(@Nullable String volumeType) { public ManagedInstanceBlockDeviceMappingEbs build() { final var _resultValue = new ManagedInstanceBlockDeviceMappingEbs(); _resultValue.deleteOnTermination = deleteOnTermination; + _resultValue.encrypted = encrypted; _resultValue.iops = iops; + _resultValue.kmsKeyId = kmsKeyId; + _resultValue.snapshotId = snapshotId; _resultValue.throughput = throughput; _resultValue.volumeSize = volumeSize; _resultValue.volumeType = volumeType; diff --git a/sdk/nodejs/aws/credentials.ts b/sdk/nodejs/aws/credentials.ts index ed821032..8b3fa52b 100644 --- a/sdk/nodejs/aws/credentials.ts +++ b/sdk/nodejs/aws/credentials.ts @@ -16,7 +16,7 @@ import * as utilities from "../utilities"; * * // set credential AWS * const credential = new spotinst.aws.Credentials("credential", { - * accountid: "act-123456", + * accountId: "act-123456", * iamrole: "arn:aws:iam::1234567890:role/Spot_Iam_Role", * }); * ``` @@ -50,6 +50,9 @@ export class Credentials extends pulumi.CustomResource { return obj['__pulumiType'] === Credentials.__pulumiType; } + /** + * The ID of the account associated with your token. + */ public readonly accountId!: pulumi.Output; /** * Provide the IAM Role ARN connected to another AWS account 922761411349 and with the latest Spot Policy - https://docs.spot.io/administration/api/spot-policy-in-aws @@ -91,6 +94,9 @@ export class Credentials extends pulumi.CustomResource { * Input properties used for looking up and filtering Credentials resources. */ export interface CredentialsState { + /** + * The ID of the account associated with your token. + */ accountId?: pulumi.Input; /** * Provide the IAM Role ARN connected to another AWS account 922761411349 and with the latest Spot Policy - https://docs.spot.io/administration/api/spot-policy-in-aws @@ -102,6 +108,9 @@ export interface CredentialsState { * The set of arguments for constructing a Credentials resource. */ export interface CredentialsArgs { + /** + * The ID of the account associated with your token. + */ accountId: pulumi.Input; /** * Provide the IAM Role ARN connected to another AWS account 922761411349 and with the latest Spot Policy - https://docs.spot.io/administration/api/spot-policy-in-aws diff --git a/sdk/nodejs/config/vars.ts b/sdk/nodejs/config/vars.ts index a608b555..37d7e514 100644 --- a/sdk/nodejs/config/vars.ts +++ b/sdk/nodejs/config/vars.ts @@ -18,6 +18,17 @@ Object.defineProperty(exports, "account", { enumerable: true, }); +/** + * Enable or disable the Spotinst provider + */ +export declare const enabled: boolean | undefined; +Object.defineProperty(exports, "enabled", { + get() { + return __config.getObject("enabled"); + }, + enumerable: true, +}); + /** * Spotinst SDK Feature Flags */ diff --git a/sdk/nodejs/provider.ts b/sdk/nodejs/provider.ts index 1e05ef2c..5c89f5c0 100644 --- a/sdk/nodejs/provider.ts +++ b/sdk/nodejs/provider.ts @@ -50,6 +50,7 @@ export class Provider extends pulumi.ProviderResource { opts = opts || {}; { resourceInputs["account"] = args ? args.account : undefined; + resourceInputs["enabled"] = pulumi.output(args ? args.enabled : undefined).apply(JSON.stringify); resourceInputs["featureFlags"] = args ? args.featureFlags : undefined; resourceInputs["token"] = args ? args.token : undefined; } @@ -66,6 +67,10 @@ export interface ProviderArgs { * Spotinst Account ID */ account?: pulumi.Input; + /** + * Enable or disable the Spotinst provider + */ + enabled?: pulumi.Input; /** * Spotinst SDK Feature Flags */ diff --git a/sdk/nodejs/types/input.ts b/sdk/nodejs/types/input.ts index 6f08408a..42ede3f3 100644 --- a/sdk/nodejs/types/input.ts +++ b/sdk/nodejs/types/input.ts @@ -2003,7 +2003,10 @@ export namespace aws { export interface ManagedInstanceBlockDeviceMappingEbs { deleteOnTermination?: pulumi.Input; + encrypted?: pulumi.Input; iops?: pulumi.Input; + kmsKeyId?: pulumi.Input; + snapshotId?: pulumi.Input; throughput?: pulumi.Input; volumeSize?: pulumi.Input; volumeType?: pulumi.Input; diff --git a/sdk/nodejs/types/output.ts b/sdk/nodejs/types/output.ts index 9a43f70f..893e3c43 100644 --- a/sdk/nodejs/types/output.ts +++ b/sdk/nodejs/types/output.ts @@ -2004,7 +2004,10 @@ export namespace aws { export interface ManagedInstanceBlockDeviceMappingEbs { deleteOnTermination: boolean; + encrypted?: boolean; iops?: number; + kmsKeyId?: string; + snapshotId?: string; throughput?: number; volumeSize?: number; volumeType: string; diff --git a/sdk/python/pulumi_spotinst/aws/_inputs.py b/sdk/python/pulumi_spotinst/aws/_inputs.py index 07d1a108..1cc3b642 100644 --- a/sdk/python/pulumi_spotinst/aws/_inputs.py +++ b/sdk/python/pulumi_spotinst/aws/_inputs.py @@ -6271,14 +6271,23 @@ def ebs(self, value: Optional[pulumi.Input['ManagedInstanceBlockDeviceMappingEbs class ManagedInstanceBlockDeviceMappingEbsArgs: def __init__(__self__, *, delete_on_termination: Optional[pulumi.Input[bool]] = None, + encrypted: Optional[pulumi.Input[bool]] = None, iops: Optional[pulumi.Input[int]] = None, + kms_key_id: Optional[pulumi.Input[str]] = None, + snapshot_id: Optional[pulumi.Input[str]] = None, throughput: Optional[pulumi.Input[int]] = None, volume_size: Optional[pulumi.Input[int]] = None, volume_type: Optional[pulumi.Input[str]] = None): if delete_on_termination is not None: pulumi.set(__self__, "delete_on_termination", delete_on_termination) + if encrypted is not None: + pulumi.set(__self__, "encrypted", encrypted) if iops is not None: pulumi.set(__self__, "iops", iops) + if kms_key_id is not None: + pulumi.set(__self__, "kms_key_id", kms_key_id) + if snapshot_id is not None: + pulumi.set(__self__, "snapshot_id", snapshot_id) if throughput is not None: pulumi.set(__self__, "throughput", throughput) if volume_size is not None: @@ -6295,6 +6304,15 @@ def delete_on_termination(self) -> Optional[pulumi.Input[bool]]: def delete_on_termination(self, value: Optional[pulumi.Input[bool]]): pulumi.set(self, "delete_on_termination", value) + @property + @pulumi.getter + def encrypted(self) -> Optional[pulumi.Input[bool]]: + return pulumi.get(self, "encrypted") + + @encrypted.setter + def encrypted(self, value: Optional[pulumi.Input[bool]]): + pulumi.set(self, "encrypted", value) + @property @pulumi.getter def iops(self) -> Optional[pulumi.Input[int]]: @@ -6304,6 +6322,24 @@ def iops(self) -> Optional[pulumi.Input[int]]: def iops(self, value: Optional[pulumi.Input[int]]): pulumi.set(self, "iops", value) + @property + @pulumi.getter(name="kmsKeyId") + def kms_key_id(self) -> Optional[pulumi.Input[str]]: + return pulumi.get(self, "kms_key_id") + + @kms_key_id.setter + def kms_key_id(self, value: Optional[pulumi.Input[str]]): + pulumi.set(self, "kms_key_id", value) + + @property + @pulumi.getter(name="snapshotId") + def snapshot_id(self) -> Optional[pulumi.Input[str]]: + return pulumi.get(self, "snapshot_id") + + @snapshot_id.setter + def snapshot_id(self, value: Optional[pulumi.Input[str]]): + pulumi.set(self, "snapshot_id", value) + @property @pulumi.getter def throughput(self) -> Optional[pulumi.Input[int]]: diff --git a/sdk/python/pulumi_spotinst/aws/credentials.py b/sdk/python/pulumi_spotinst/aws/credentials.py index d3c561e8..772e62d1 100644 --- a/sdk/python/pulumi_spotinst/aws/credentials.py +++ b/sdk/python/pulumi_spotinst/aws/credentials.py @@ -18,6 +18,7 @@ def __init__(__self__, *, iamrole: pulumi.Input[str]): """ The set of arguments for constructing a Credentials resource. + :param pulumi.Input[str] account_id: The ID of the account associated with your token. :param pulumi.Input[str] iamrole: Provide the IAM Role ARN connected to another AWS account 922761411349 and with the latest Spot Policy - https://docs.spot.io/administration/api/spot-policy-in-aws """ pulumi.set(__self__, "account_id", account_id) @@ -26,6 +27,9 @@ def __init__(__self__, *, @property @pulumi.getter(name="accountId") def account_id(self) -> pulumi.Input[str]: + """ + The ID of the account associated with your token. + """ return pulumi.get(self, "account_id") @account_id.setter @@ -52,6 +56,7 @@ def __init__(__self__, *, iamrole: Optional[pulumi.Input[str]] = None): """ Input properties used for looking up and filtering Credentials resources. + :param pulumi.Input[str] account_id: The ID of the account associated with your token. :param pulumi.Input[str] iamrole: Provide the IAM Role ARN connected to another AWS account 922761411349 and with the latest Spot Policy - https://docs.spot.io/administration/api/spot-policy-in-aws """ if account_id is not None: @@ -62,6 +67,9 @@ def __init__(__self__, *, @property @pulumi.getter(name="accountId") def account_id(self) -> Optional[pulumi.Input[str]]: + """ + The ID of the account associated with your token. + """ return pulumi.get(self, "account_id") @account_id.setter @@ -101,13 +109,14 @@ def __init__(__self__, # set credential AWS credential = spotinst.aws.Credentials("credential", - accountid="act-123456", + account_id="act-123456", iamrole="arn:aws:iam::1234567890:role/Spot_Iam_Role") ``` :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. + :param pulumi.Input[str] account_id: The ID of the account associated with your token. :param pulumi.Input[str] iamrole: Provide the IAM Role ARN connected to another AWS account 922761411349 and with the latest Spot Policy - https://docs.spot.io/administration/api/spot-policy-in-aws """ ... @@ -128,7 +137,7 @@ def __init__(__self__, # set credential AWS credential = spotinst.aws.Credentials("credential", - accountid="act-123456", + account_id="act-123456", iamrole="arn:aws:iam::1234567890:role/Spot_Iam_Role") ``` @@ -184,6 +193,7 @@ def get(resource_name: str, :param str resource_name: The unique name of the resulting resource. :param pulumi.Input[str] id: The unique provider ID of the resource to lookup. :param pulumi.ResourceOptions opts: Options for the resource. + :param pulumi.Input[str] account_id: The ID of the account associated with your token. :param pulumi.Input[str] iamrole: Provide the IAM Role ARN connected to another AWS account 922761411349 and with the latest Spot Policy - https://docs.spot.io/administration/api/spot-policy-in-aws """ opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id)) @@ -197,6 +207,9 @@ def get(resource_name: str, @property @pulumi.getter(name="accountId") def account_id(self) -> pulumi.Output[str]: + """ + The ID of the account associated with your token. + """ return pulumi.get(self, "account_id") @property diff --git a/sdk/python/pulumi_spotinst/aws/outputs.py b/sdk/python/pulumi_spotinst/aws/outputs.py index a3baebcf..28b4999b 100644 --- a/sdk/python/pulumi_spotinst/aws/outputs.py +++ b/sdk/python/pulumi_spotinst/aws/outputs.py @@ -6311,6 +6311,10 @@ def __key_warning(key: str): suggest = None if key == "deleteOnTermination": suggest = "delete_on_termination" + elif key == "kmsKeyId": + suggest = "kms_key_id" + elif key == "snapshotId": + suggest = "snapshot_id" elif key == "volumeSize": suggest = "volume_size" elif key == "volumeType": @@ -6329,14 +6333,23 @@ def get(self, key: str, default = None) -> Any: def __init__(__self__, *, delete_on_termination: Optional[bool] = None, + encrypted: Optional[bool] = None, iops: Optional[int] = None, + kms_key_id: Optional[str] = None, + snapshot_id: Optional[str] = None, throughput: Optional[int] = None, volume_size: Optional[int] = None, volume_type: Optional[str] = None): if delete_on_termination is not None: pulumi.set(__self__, "delete_on_termination", delete_on_termination) + if encrypted is not None: + pulumi.set(__self__, "encrypted", encrypted) if iops is not None: pulumi.set(__self__, "iops", iops) + if kms_key_id is not None: + pulumi.set(__self__, "kms_key_id", kms_key_id) + if snapshot_id is not None: + pulumi.set(__self__, "snapshot_id", snapshot_id) if throughput is not None: pulumi.set(__self__, "throughput", throughput) if volume_size is not None: @@ -6349,11 +6362,26 @@ def __init__(__self__, *, def delete_on_termination(self) -> Optional[bool]: return pulumi.get(self, "delete_on_termination") + @property + @pulumi.getter + def encrypted(self) -> Optional[bool]: + return pulumi.get(self, "encrypted") + @property @pulumi.getter def iops(self) -> Optional[int]: return pulumi.get(self, "iops") + @property + @pulumi.getter(name="kmsKeyId") + def kms_key_id(self) -> Optional[str]: + return pulumi.get(self, "kms_key_id") + + @property + @pulumi.getter(name="snapshotId") + def snapshot_id(self) -> Optional[str]: + return pulumi.get(self, "snapshot_id") + @property @pulumi.getter def throughput(self) -> Optional[int]: diff --git a/sdk/python/pulumi_spotinst/config/__init__.pyi b/sdk/python/pulumi_spotinst/config/__init__.pyi index 5a682ef7..07845c65 100644 --- a/sdk/python/pulumi_spotinst/config/__init__.pyi +++ b/sdk/python/pulumi_spotinst/config/__init__.pyi @@ -14,6 +14,11 @@ account: Optional[str] Spotinst Account ID """ +enabled: Optional[bool] +""" +Enable or disable the Spotinst provider +""" + featureFlags: Optional[str] """ Spotinst SDK Feature Flags diff --git a/sdk/python/pulumi_spotinst/config/vars.py b/sdk/python/pulumi_spotinst/config/vars.py index cc72aaef..46da0030 100644 --- a/sdk/python/pulumi_spotinst/config/vars.py +++ b/sdk/python/pulumi_spotinst/config/vars.py @@ -22,6 +22,13 @@ def account(self) -> Optional[str]: """ return __config__.get('account') + @property + def enabled(self) -> Optional[bool]: + """ + Enable or disable the Spotinst provider + """ + return __config__.get_bool('enabled') + @property def feature_flags(self) -> Optional[str]: """ diff --git a/sdk/python/pulumi_spotinst/provider.py b/sdk/python/pulumi_spotinst/provider.py index 2d0e0419..6f527f8c 100644 --- a/sdk/python/pulumi_spotinst/provider.py +++ b/sdk/python/pulumi_spotinst/provider.py @@ -15,16 +15,20 @@ class ProviderArgs: def __init__(__self__, *, account: Optional[pulumi.Input[str]] = None, + enabled: Optional[pulumi.Input[bool]] = None, feature_flags: Optional[pulumi.Input[str]] = None, token: Optional[pulumi.Input[str]] = None): """ The set of arguments for constructing a Provider resource. :param pulumi.Input[str] account: Spotinst Account ID + :param pulumi.Input[bool] enabled: Enable or disable the Spotinst provider :param pulumi.Input[str] feature_flags: Spotinst SDK Feature Flags :param pulumi.Input[str] token: Spotinst Personal API Access Token """ if account is not None: pulumi.set(__self__, "account", account) + if enabled is not None: + pulumi.set(__self__, "enabled", enabled) if feature_flags is not None: pulumi.set(__self__, "feature_flags", feature_flags) if token is not None: @@ -42,6 +46,18 @@ def account(self) -> Optional[pulumi.Input[str]]: def account(self, value: Optional[pulumi.Input[str]]): pulumi.set(self, "account", value) + @property + @pulumi.getter + def enabled(self) -> Optional[pulumi.Input[bool]]: + """ + Enable or disable the Spotinst provider + """ + return pulumi.get(self, "enabled") + + @enabled.setter + def enabled(self, value: Optional[pulumi.Input[bool]]): + pulumi.set(self, "enabled", value) + @property @pulumi.getter(name="featureFlags") def feature_flags(self) -> Optional[pulumi.Input[str]]: @@ -73,6 +89,7 @@ def __init__(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, account: Optional[pulumi.Input[str]] = None, + enabled: Optional[pulumi.Input[bool]] = None, feature_flags: Optional[pulumi.Input[str]] = None, token: Optional[pulumi.Input[str]] = None, __props__=None): @@ -85,6 +102,7 @@ def __init__(__self__, :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[str] account: Spotinst Account ID + :param pulumi.Input[bool] enabled: Enable or disable the Spotinst provider :param pulumi.Input[str] feature_flags: Spotinst SDK Feature Flags :param pulumi.Input[str] token: Spotinst Personal API Access Token """ @@ -116,6 +134,7 @@ def _internal_init(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, account: Optional[pulumi.Input[str]] = None, + enabled: Optional[pulumi.Input[bool]] = None, feature_flags: Optional[pulumi.Input[str]] = None, token: Optional[pulumi.Input[str]] = None, __props__=None): @@ -128,6 +147,7 @@ def _internal_init(__self__, __props__ = ProviderArgs.__new__(ProviderArgs) __props__.__dict__["account"] = account + __props__.__dict__["enabled"] = pulumi.Output.from_input(enabled).apply(pulumi.runtime.to_json) if enabled is not None else None __props__.__dict__["feature_flags"] = feature_flags __props__.__dict__["token"] = token super(Provider, __self__).__init__( diff --git a/upstream b/upstream index 79fdfe72..44f2868d 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 79fdfe72ae10c6def412f10ddc4d103a57845d75 +Subproject commit 44f2868d47f84b0187f3f0446b969801e6823a56