Skip to content

Commit

Permalink
feat: prepare for upstream release v0.66.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@muhlba91
muhlba91 committed Oct 4, 2024
1 parent 62cd3c7 commit 797b36a
Show file tree
Hide file tree
Showing 40 changed files with 1,857 additions and 227 deletions.
3 changes: 3 additions & 0 deletions provider/cmd/pulumi-resource-proxmoxve/bridge-metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,9 @@
},
"vga": {
"maxItemsOne": true
},
"watchdog": {
"maxItemsOne": true
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion provider/cmd/pulumi-resource-proxmoxve/schema-embed.json
View file

Large diffs are not rendered by default.

101 changes: 98 additions & 3 deletions provider/cmd/pulumi-resource-proxmoxve/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,16 @@
"description": "The API token for the Proxmox VE API.\n",
"secret": true
},
"authTicket": {
"type": "string",
"description": "The pre-authenticated Ticket for the Proxmox VE API.\n",
"secret": true
},
"csrfPreventionToken": {
"type": "string",
"description": "The pre-authenticated CSRF Prevention Token for the Proxmox VE API.\n",
"secret": true
},
"endpoint": {
"type": "string",
"description": "The endpoint for the Proxmox VE API.\n"
Expand All @@ -91,6 +101,18 @@
"description": "The password for the Proxmox VE API.\n",
"secret": true
},
"randomVmIdEnd": {
"type": "integer",
"description": "The ending number for random VM / Container IDs.\n"
},
"randomVmIdStart": {
"type": "integer",
"description": "The starting number for random VM / Container IDs.\n"
},
"randomVmIds": {
"type": "boolean",
"description": "Whether to generate random VM / Container IDs.\n"
},
"ssh": {
"$ref": "#/types/proxmoxve:config/ssh:ssh",
"description": "The SSH configuration for the Proxmox nodes.\n"
Expand Down Expand Up @@ -1783,19 +1805,19 @@
"properties": {
"dedicated": {
"type": "integer",
"description": "The dedicated memory in megabytes (defaults\nto `512`).\n"
"description": "The dedicated memory in megabytes (defaults to `512`).\n"
},
"floating": {
"type": "integer",
"description": "The floating memory in megabytes (defaults\nto `0`).\n"
"description": "The floating memory in megabytes. The default is `0`, which disables \"ballooning device\" for the VM.\nPlease note that Proxmox has ballooning enabled by default. To enable it, set `floating` to the same value as `dedicated`.\nSee [Proxmox documentation](https://pve.proxmox.com/pve-docs/pve-admin-guide.html#qm_memory) section 10.2.6 for more information.\n"
},
"hugepages": {
"type": "string",
"description": "Enable/disable hugepages memory (defaults to disable).\n"
},
"keepHugepages": {
"type": "boolean",
"description": "Keep hugepages memory after the VM is stopped (defaults\nto `false`).\n\nSettings `hugepages` and `keep_hugepages` are only allowed for `root@pam` authenticated user.\nAnd required `cpu.numa` to be enabled.\n"
"description": "Keep hugepages memory after the VM is stopped (defaults to `false`).\n\nSettings `hugepages` and `keep_hugepages` are only allowed for `root@pam` authenticated user.\nAnd required `cpu.numa` to be enabled.\n"
},
"shared": {
"type": "integer",
Expand Down Expand Up @@ -2013,6 +2035,23 @@
},
"type": "object"
},
"proxmoxve:VM/VirtualMachineWatchdog:VirtualMachineWatchdog": {
"properties": {
"action": {
"type": "string",
"description": "The action to perform if after activation the guest fails to poll the watchdog in time (defaults to `none`).\n"
},
"enabled": {
"type": "boolean",
"description": "Whether the watchdog is enabled (defaults to `false`).\n"
},
"model": {
"type": "string",
"description": "The watchdog type to emulate (defaults to `i6300esb`).\n"
}
},
"type": "object"
},
"proxmoxve:VM/getVirtualMachinesFilter:getVirtualMachinesFilter": {
"properties": {
"name": {
Expand Down Expand Up @@ -2531,6 +2570,16 @@
"description": "The API token for the Proxmox VE API.\n",
"secret": true
},
"authTicket": {
"type": "string",
"description": "The pre-authenticated Ticket for the Proxmox VE API.\n",
"secret": true
},
"csrfPreventionToken": {
"type": "string",
"description": "The pre-authenticated CSRF Prevention Token for the Proxmox VE API.\n",
"secret": true
},
"endpoint": {
"type": "string",
"description": "The endpoint for the Proxmox VE API.\n"
Expand All @@ -2553,6 +2602,18 @@
"description": "The password for the Proxmox VE API.\n",
"secret": true
},
"randomVmIdEnd": {
"type": "integer",
"description": "The ending number for random VM / Container IDs.\n"
},
"randomVmIdStart": {
"type": "integer",
"description": "The starting number for random VM / Container IDs.\n"
},
"randomVmIds": {
"type": "boolean",
"description": "Whether to generate random VM / Container IDs.\n"
},
"ssh": {
"$ref": "#/types/proxmoxve:index/ProviderSsh:ProviderSsh",
"description": "The SSH configuration for the Proxmox nodes.\n"
Expand All @@ -2572,6 +2633,16 @@
"description": "The API token for the Proxmox VE API.\n",
"secret": true
},
"authTicket": {
"type": "string",
"description": "The pre-authenticated Ticket for the Proxmox VE API.\n",
"secret": true
},
"csrfPreventionToken": {
"type": "string",
"description": "The pre-authenticated CSRF Prevention Token for the Proxmox VE API.\n",
"secret": true
},
"endpoint": {
"type": "string",
"description": "The endpoint for the Proxmox VE API.\n"
Expand All @@ -2594,6 +2665,18 @@
"description": "The password for the Proxmox VE API.\n",
"secret": true
},
"randomVmIdEnd": {
"type": "integer",
"description": "The ending number for random VM / Container IDs.\n"
},
"randomVmIdStart": {
"type": "integer",
"description": "The starting number for random VM / Container IDs.\n"
},
"randomVmIds": {
"type": "boolean",
"description": "Whether to generate random VM / Container IDs.\n"
},
"ssh": {
"$ref": "#/types/proxmoxve:index/ProviderSsh:ProviderSsh",
"description": "The SSH configuration for the Proxmox nodes.\n"
Expand Down Expand Up @@ -6020,6 +6103,10 @@
"vmId": {
"type": "integer",
"description": "The VM identifier.\n"
},
"watchdog": {
"$ref": "#/types/proxmoxve:VM/VirtualMachineWatchdog:VirtualMachineWatchdog",
"description": "The watchdog configuration. Once enabled (by a guest action), the watchdog must be periodically polled by an agent inside the guest or else the watchdog will reset the guest (or execute the respective action specified).\n"
}
},
"required": [
Expand Down Expand Up @@ -6262,6 +6349,10 @@
"vmId": {
"type": "integer",
"description": "The VM identifier.\n"
},
"watchdog": {
"$ref": "#/types/proxmoxve:VM/VirtualMachineWatchdog:VirtualMachineWatchdog",
"description": "The watchdog configuration. Once enabled (by a guest action), the watchdog must be periodically polled by an agent inside the guest or else the watchdog will reset the guest (or execute the respective action specified).\n"
}
},
"requiredInputs": [
Expand Down Expand Up @@ -6527,6 +6618,10 @@
"vmId": {
"type": "integer",
"description": "The VM identifier.\n"
},
"watchdog": {
"$ref": "#/types/proxmoxve:VM/VirtualMachineWatchdog:VirtualMachineWatchdog",
"description": "The watchdog configuration. Once enabled (by a guest action), the watchdog must be periodically polled by an agent inside the guest or else the watchdog will reset the guest (or execute the respective action specified).\n"
}
},
"type": "object"
Expand Down
16 changes: 0 additions & 16 deletions provider/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1284,8 +1284,6 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
github.com/bpg/terraform-provider-proxmox v0.65.0 h1:8fsqTs7f0WjAC+0yTABjyI63HXX7itGKWxTJLTzmdlM=
github.com/bpg/terraform-provider-proxmox v0.65.0/go.mod h1:Invk5amZ8vVfWSwfj4kxtINQpIuFjX9IIBeVEIUrZBE=
github.com/bpg/terraform-provider-proxmox v0.66.0 h1:UbhpRfDfiFhFlcLQAc4YwL16eHOUMmxzp52ali3tzoM=
github.com/bpg/terraform-provider-proxmox v0.66.0/go.mod h1:8uAv7gPssibBUk/2PoqOwOAX0S+ezk92z5jTxQRo/2k=
github.com/brianvoe/gofakeit/v7 v7.0.4 h1:Mkxwz9jYg8Ad8NvT9HA27pCMZGFQo08MK6jD0QTKEww=
Expand Down Expand Up @@ -1934,12 +1932,8 @@ github.com/pulumi/providertest v0.0.14 h1:5QlAPAAs82jkQraHsJvq1xgVfC7xtW8sFJwv2p
github.com/pulumi/providertest v0.0.14/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0=
github.com/pulumi/pulumi-java/pkg v0.16.1 h1:orHnDWFbpOERwaBLry9f+6nqPX7x0MsrIkaa5QDGAns=
github.com/pulumi/pulumi-java/pkg v0.16.1/go.mod h1:QH0DihZkWYle9XFc+LJ76m4hUo+fA3RdyaM90pqOaSM=
github.com/pulumi/pulumi-terraform-bridge/pf v0.44.0 h1:132fy7aKhfT3AdftxHFsOIbrh+FqtosXH8+cVFHt0TE=
github.com/pulumi/pulumi-terraform-bridge/pf v0.44.0/go.mod h1:5O1yEvWEP37s12Pu++LWcDcccvQWn87GLHQ4gTvjYh8=
github.com/pulumi/pulumi-terraform-bridge/pf v0.44.1 h1:39UPLBqbnvylm2heU/Rxa1+G++NZHdtW2Qg+hEhp5Wo=
github.com/pulumi/pulumi-terraform-bridge/pf v0.44.1/go.mod h1:Zj4XBf+TuV3um7y82X3xk2yQiP+pnQ7YxMc4fq/rVVw=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.0 h1:E4YTsAI8oAF8cDj5XR1cbHUfINCc1IJxElriOZBdsxE=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.0/go.mod h1:DvueDDtOIbf7W1Or4oH0o7F990ozp/ROmlm/vgLoe+g=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.1 h1:Twh0IKS1pGHP6LHDq1oR0vbHlV52asoUCC7spEJl3Ao=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.1/go.mod h1:DvueDDtOIbf7W1Or4oH0o7F990ozp/ROmlm/vgLoe+g=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 h1:mav2tSitA9BPJPLLahKgepHyYsMzwaTm4cvp0dcTMYw=
Expand All @@ -1948,14 +1942,6 @@ github.com/pulumi/pulumi-yaml v1.10.0 h1:djbgMJCxJBmYMr4kOpAXH5iauxGohYjEuTLfxD3
github.com/pulumi/pulumi-yaml v1.10.0/go.mod h1://lTvwHpgJ+WBKeMGiLrd/jinc4dl3eWV5LZ3G8iCfE=
github.com/pulumi/pulumi/pkg/v3 v3.133.0 h1:j1rd7ToLZIQc5H0427ISOXSbOIIemZ6B0MXtRhQ38Yg=
github.com/pulumi/pulumi/pkg/v3 v3.133.0/go.mod h1:JtMAnrsFIccO138WcMfPdhO0PioDukKihnZC0xTRLwo=
github.com/pulumi/pulumi/sdk/v3 v3.133.0 h1:o+7dbJZY9BVgAjOF5GYIWgjp/zpKAgWZwD4pPjUMXKQ=
github.com/pulumi/pulumi/sdk/v3 v3.133.0/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8=
github.com/pulumi/pulumi/sdk/v3 v3.134.0 h1:jnkRmtB/2Swkdj6b6CdtbDlCVLZTPCqINi8slnN7I/I=
github.com/pulumi/pulumi/sdk/v3 v3.134.0/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8=
github.com/pulumi/pulumi/sdk/v3 v3.134.1 h1:v1zd0d+B9gpUhsdJ483YUMHwHXqDvXvZ+mh/A4HhPWg=
github.com/pulumi/pulumi/sdk/v3 v3.134.1/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8=
github.com/pulumi/pulumi/sdk/v3 v3.135.0 h1:oBP7QsmZv6uUf3eJ9j6av0nrZpipV9IguNu6rVpHlFU=
github.com/pulumi/pulumi/sdk/v3 v3.135.0/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8=
github.com/pulumi/pulumi/sdk/v3 v3.135.1 h1:NvJ6buVtt257X3Bg4/x2vsORAoK21n7BNF0cHOYAhpA=
github.com/pulumi/pulumi/sdk/v3 v3.135.1/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI=
github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo=
Expand All @@ -1978,8 +1964,6 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
Expand Down
50 changes: 50 additions & 0 deletions sdk/dotnet/Config/Config.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,26 @@ public static string? ApiToken
set => _apiToken.Set(value);
}

private static readonly __Value<string?> _authTicket = new __Value<string?>(() => __config.Get("authTicket"));
/// <summary>
/// The pre-authenticated Ticket for the Proxmox VE API.
/// </summary>
public static string? AuthTicket
{
get => _authTicket.Get();
set => _authTicket.Set(value);
}

private static readonly __Value<string?> _csrfPreventionToken = new __Value<string?>(() => __config.Get("csrfPreventionToken"));
/// <summary>
/// The pre-authenticated CSRF Prevention Token for the Proxmox VE API.
/// </summary>
public static string? CsrfPreventionToken
{
get => _csrfPreventionToken.Get();
set => _csrfPreventionToken.Set(value);
}

private static readonly __Value<string?> _endpoint = new __Value<string?>(() => __config.Get("endpoint"));
/// <summary>
/// The endpoint for the Proxmox VE API.
Expand Down Expand Up @@ -92,6 +112,36 @@ public static string? Password
set => _password.Set(value);
}

private static readonly __Value<int?> _randomVmIdEnd = new __Value<int?>(() => __config.GetInt32("randomVmIdEnd"));
/// <summary>
/// The ending number for random VM / Container IDs.
/// </summary>
public static int? RandomVmIdEnd
{
get => _randomVmIdEnd.Get();
set => _randomVmIdEnd.Set(value);
}

private static readonly __Value<int?> _randomVmIdStart = new __Value<int?>(() => __config.GetInt32("randomVmIdStart"));
/// <summary>
/// The starting number for random VM / Container IDs.
/// </summary>
public static int? RandomVmIdStart
{
get => _randomVmIdStart.Get();
set => _randomVmIdStart.Set(value);
}

private static readonly __Value<bool?> _randomVmIds = new __Value<bool?>(() => __config.GetBoolean("randomVmIds"));
/// <summary>
/// Whether to generate random VM / Container IDs.
/// </summary>
public static bool? RandomVmIds
{
get => _randomVmIds.Get();
set => _randomVmIds.Set(value);
}

private static readonly __Value<Pulumi.ProxmoxVE.Config.Types.Ssh?> _ssh = new __Value<Pulumi.ProxmoxVE.Config.Types.Ssh?>(() => __config.GetObject<Pulumi.ProxmoxVE.Config.Types.Ssh>("ssh"));
/// <summary>
/// The SSH configuration for the Proxmox nodes.
Expand Down
64 changes: 64 additions & 0 deletions sdk/dotnet/Provider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@ public partial class Provider : global::Pulumi.ProviderResource
[Output("apiToken")]
public Output<string?> ApiToken { get; private set; } = null!;

/// <summary>
/// The pre-authenticated Ticket for the Proxmox VE API.
/// </summary>
[Output("authTicket")]
public Output<string?> AuthTicket { get; private set; } = null!;

/// <summary>
/// The pre-authenticated CSRF Prevention Token for the Proxmox VE API.
/// </summary>
[Output("csrfPreventionToken")]
public Output<string?> CsrfPreventionToken { get; private set; } = null!;

/// <summary>
/// The endpoint for the Proxmox VE API.
/// </summary>
Expand Down Expand Up @@ -82,6 +94,8 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
AdditionalSecretOutputs =
{
"apiToken",
"authTicket",
"csrfPreventionToken",
"password",
},
};
Expand Down Expand Up @@ -110,6 +124,38 @@ public Input<string>? ApiToken
}
}

[Input("authTicket")]
private Input<string>? _authTicket;

/// <summary>
/// The pre-authenticated Ticket for the Proxmox VE API.
/// </summary>
public Input<string>? AuthTicket
{
get => _authTicket;
set
{
var emptySecret = Output.CreateSecret(0);
_authTicket = Output.Tuple<Input<string>?, int>(value, emptySecret).Apply(t => t.Item1);
}
}

[Input("csrfPreventionToken")]
private Input<string>? _csrfPreventionToken;

/// <summary>
/// The pre-authenticated CSRF Prevention Token for the Proxmox VE API.
/// </summary>
public Input<string>? CsrfPreventionToken
{
get => _csrfPreventionToken;
set
{
var emptySecret = Output.CreateSecret(0);
_csrfPreventionToken = Output.Tuple<Input<string>?, int>(value, emptySecret).Apply(t => t.Item1);
}
}

/// <summary>
/// The endpoint for the Proxmox VE API.
/// </summary>
Expand Down Expand Up @@ -150,6 +196,24 @@ public Input<string>? Password
}
}

/// <summary>
/// The ending number for random VM / Container IDs.
/// </summary>
[Input("randomVmIdEnd", json: true)]
public Input<int>? RandomVmIdEnd { get; set; }

/// <summary>
/// The starting number for random VM / Container IDs.
/// </summary>
[Input("randomVmIdStart", json: true)]
public Input<int>? RandomVmIdStart { get; set; }

/// <summary>
/// Whether to generate random VM / Container IDs.
/// </summary>
[Input("randomVmIds", json: true)]
public Input<bool>? RandomVmIds { get; set; }

/// <summary>
/// The SSH configuration for the Proxmox nodes.
/// </summary>
Expand Down
Loading

0 comments on commit 797b36a

Please sign in to comment.