-
Notifications
You must be signed in to change notification settings - Fork 544
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1168 from Tinyblargon/cpu_type
refactor: move cpu code to package & deprecate `cpu`
- Loading branch information
Showing
8 changed files
with
151 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package cpu | ||
|
|
||
| import ( | ||
| pveAPI "github.com/Telmate/proxmox-api-go/proxmox" | ||
| "github.com/hashicorp/go-cty/cty" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/diag" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
| ) | ||
|
|
||
| const ( | ||
| Root string = "cpu" | ||
| RootCores string = "cores" | ||
| RootCpuType string = "cpu_type" | ||
| RootNuma string = "numa" | ||
| RootSockets string = "sockets" | ||
| RootVirtualCores string = "vcpus" | ||
| ) | ||
|
|
||
| func SchemaCores() *schema.Schema { | ||
| return &schema.Schema{ | ||
| Type: schema.TypeInt, | ||
| Optional: true, | ||
| Default: 1, | ||
| ValidateDiagFunc: func(i interface{}, p cty.Path) diag.Diagnostics { | ||
| v, ok := i.(int) | ||
| if !ok { | ||
| return diag.Errorf(RootCores + " must be an integer") | ||
| } | ||
| if v < 1 { | ||
| return diag.Errorf(RootCores + " must be greater than 0") | ||
| } | ||
| return diag.FromErr(pveAPI.QemuCpuCores(v).Validate()) | ||
| }} | ||
| } | ||
|
|
||
| func SchemaType(s schema.Schema) *schema.Schema { | ||
| s.Type = schema.TypeString | ||
| s.Optional = true | ||
| return &s | ||
| } | ||
|
|
||
| func SchemaNuma() *schema.Schema { | ||
| return &schema.Schema{ | ||
| Type: schema.TypeBool, | ||
| Optional: true, | ||
| } | ||
| } | ||
|
|
||
| func SchemaSockets() *schema.Schema { | ||
| return &schema.Schema{ | ||
| Type: schema.TypeInt, | ||
| Optional: true, | ||
| Default: 1, | ||
| ValidateDiagFunc: func(i interface{}, p cty.Path) diag.Diagnostics { | ||
| v, ok := i.(int) | ||
| if !ok { | ||
| return diag.Errorf(RootSockets + " must be an integer") | ||
| } | ||
| if v < 1 { | ||
| return diag.Errorf(RootSockets + " must be greater than 0") | ||
| } | ||
| return diag.FromErr(pveAPI.QemuCpuSockets(v).Validate()) | ||
| }} | ||
| } | ||
|
|
||
| func SchemaVirtualCores() *schema.Schema { | ||
| return &schema.Schema{ | ||
| Type: schema.TypeInt, | ||
| Optional: true, | ||
| Default: 0, | ||
| ValidateDiagFunc: func(i interface{}, p cty.Path) diag.Diagnostics { | ||
| v, ok := i.(int) | ||
| if !ok { | ||
| return diag.Errorf(RootVirtualCores + " must be an integer") | ||
| } | ||
| if v < 0 { | ||
| return diag.Errorf(RootVirtualCores + " must be greater than or equal to 0") | ||
| } | ||
| return nil | ||
| }, | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package cpu | ||
|
|
||
| import ( | ||
| pveAPI "github.com/Telmate/proxmox-api-go/proxmox" | ||
| "github.com/Telmate/terraform-provider-proxmox/v2/proxmox/Internal/util" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
| ) | ||
|
|
||
| func SDK(d *schema.ResourceData) *pveAPI.QemuCPU { | ||
| var cpuType pveAPI.CpuType | ||
| if v, ok := d.GetOk(Root); ok { | ||
| cpuType = pveAPI.CpuType(v.(string)) | ||
| } else { | ||
| v := d.Get(RootCpuType) | ||
| cpuType = pveAPI.CpuType(v.(string)) | ||
| } | ||
| return &pveAPI.QemuCPU{ | ||
| Cores: util.Pointer(pveAPI.QemuCpuCores(d.Get(RootCores).(int))), | ||
| Numa: util.Pointer(d.Get(RootNuma).(bool)), | ||
| Sockets: util.Pointer(pveAPI.QemuCpuSockets(d.Get(RootSockets).(int))), | ||
| Type: util.Pointer(cpuType), | ||
| VirtualCores: util.Pointer(pveAPI.CpuVirtualCores(d.Get(RootVirtualCores).(int)))} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package cpu | ||
|
|
||
| import ( | ||
| pveAPI "github.com/Telmate/proxmox-api-go/proxmox" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
| ) | ||
|
|
||
| func Terraform(config pveAPI.QemuCPU, d *schema.ResourceData) { | ||
| if config.Cores != nil { | ||
| d.Set(RootCores, int(*config.Cores)) | ||
| } | ||
| if config.Numa != nil { | ||
| d.Set(RootNuma, *config.Numa) | ||
| } | ||
| if config.Sockets != nil { | ||
| d.Set(RootSockets, int(*config.Sockets)) | ||
| } | ||
| if _, ok := d.GetOk(Root); ok { | ||
| d.Set(Root, string(*config.Type)) | ||
| } else { | ||
| d.Set(RootCpuType, string(*config.Type)) | ||
| } | ||
| if config.VirtualCores != nil { | ||
| d.Set(RootVirtualCores, int(*config.VirtualCores)) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters