Fix the issue for https host (#60)

- Fixed an issue where if we would enable the https for a host and registered it with a orchestrator it would fail due to wrong port - Added the new resource called vm_state to set a existing vm to a state - Fixed an issue in the telemetry not being sent correctly
Parallels · Nov 12, 2024 · 69b0a88 · 69b0a88
1 parent c8f17c4
commit 69b0a88
Show file tree

Hide file tree

Showing 11 changed files with 353 additions and 57 deletions.
diff --git a/docs/resources/vm_state.md b/docs/resources/vm_state.md
@@ -0,0 +1,43 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "parallels-desktop_vm_state Resource - terraform-provider-parallels-desktop"
+subcategory: ""
+description: |-
+  Parallels Virtual Machine State Resource
+  Use this to set a virtual machine to a desired state.
+---
+
+# parallels-desktop_vm_state (Resource)
+
+Parallels Virtual Machine State Resource
+ Use this to set a virtual machine to a desired state.
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `id` (String) Virtual Machine Id
+- `operation` (String) Virtual Machine desired state
+
+### Optional
+
+- `authenticator` (Block, Optional) Authenticator block, this is used to authenticate with the Parallels Desktop API, if empty it will try to use the root password (see [below for nested schema](#nestedblock--authenticator))
+- `ensure_state` (Boolean) Ensure the virtual machine is in the desired state
+- `host` (String) Parallels Desktop DevOps Host
+- `orchestrator` (String) Parallels Desktop DevOps Orchestrator
+
+### Read-Only
+
+- `current_state` (String) Virtual Machine current state
+
+<a id="nestedblock--authenticator"></a>
+### Nested Schema for `authenticator`
+
+Optional:
+
+- `api_key` (String, Sensitive) Parallels desktop API API Key
+- `password` (String, Sensitive) Parallels desktop API Password
+- `username` (String) Parallels desktop API Username
diff --git a/internal/deploy/models/resource_models_v2.go b/internal/deploy/models/resource_models_v2.go
@@ -2,7 +2,6 @@ package models
 
 import (
 	"strings"
-
 	"terraform-provider-parallels-desktop/internal/apiclient"
 	"terraform-provider-parallels-desktop/internal/models"
 	"terraform-provider-parallels-desktop/internal/schemas/authenticator"
@@ -127,15 +126,19 @@ func (o *DeployResourceModelV2) GenerateApiHostConfig(provider *models.Parallels
 
 		DisableTlsValidation: provider.DisableTlsValidation.ValueBool(),
 	}
+
 	api_port := strings.ReplaceAll(o.ApiConfig.Port.ValueString(), "\"", "")
 	api_schema := "http"
 
-	if api_port != "" {
-		hostConfig.Host = hostConfig.Host + ":" + api_port
-	}
 	if o.ApiConfig.EnableTLS.ValueBool() {
 		api_schema = "https"
+		api_port = strings.ReplaceAll(o.ApiConfig.TLSPort.ValueString(), "\"", "")
 	}
+
+	if api_port != "" {
+		hostConfig.Host = hostConfig.Host + ":" + api_port
+	}
+
 	hostConfig.Host = api_schema + "://" + hostConfig.Host
 
 	return hostConfig

diff --git a/internal/deploy/resource.go b/internal/deploy/resource.go
@@ -5,9 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"strings"
-
 	"terraform-provider-parallels-desktop/internal/common"
-	deploy_models "terraform-provider-parallels-desktop/internal/deploy/models"
 	"terraform-provider-parallels-desktop/internal/deploy/schemas"
 	"terraform-provider-parallels-desktop/internal/interfaces"
 	"terraform-provider-parallels-desktop/internal/localclient"
@@ -16,9 +14,10 @@ import (
 	"terraform-provider-parallels-desktop/internal/schemas/orchestrator"
 	"terraform-provider-parallels-desktop/internal/schemas/reverseproxy"
 	"terraform-provider-parallels-desktop/internal/ssh"
-
 	"terraform-provider-parallels-desktop/internal/telemetry"
 
+	deploy_models "terraform-provider-parallels-desktop/internal/deploy/models"
+
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/path"
@@ -1011,6 +1010,7 @@ func (r *DeployResource) registerWithOrchestrator(ctx context.Context, data, cur
 	password := strings.ReplaceAll(data.ApiConfig.RootPassword.String(), "\"", "")
 	if data.ApiConfig.EnableTLS.ValueBool() {
 		schema = "https"
+		port = strings.ReplaceAll(data.ApiConfig.TLSPort.String(), "\"", "")
 	}
 
 	if currentData != nil {

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -10,6 +10,7 @@ import (
 	"terraform-provider-parallels-desktop/internal/remoteimage"
 	"terraform-provider-parallels-desktop/internal/vagrantbox"
 	"terraform-provider-parallels-desktop/internal/virtualmachine"
+	"terraform-provider-parallels-desktop/internal/virtualmachinestate"
 
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/path"
@@ -122,7 +123,7 @@ func (p *ParallelsProvider) DataSources(_ context.Context) []func() datasource.D
 // Resources defines the resources implemented in the provider.
 func (p *ParallelsProvider) Resources(_ context.Context) []func() resource.Resource {
 	return []func() resource.Resource{
-		// virtualmachinestate.NewVirtualMachineStateResource,
+		virtualmachinestate.NewVirtualMachineStateResource,
 		deploy.NewDeployResource,
 		// packertemplate.NewPackerTemplateVirtualMachineResource,
 		authorization.NewAuthorizationResource,

diff --git a/internal/remoteimage/resource.go b/internal/remoteimage/resource.go
@@ -202,6 +202,11 @@ func (r *RemoteVmResource) Create(ctx context.Context, req resource.CreateReques
 		return
 	}
 
+	if createdVM == nil {
+		resp.Diagnostics.AddError("VM not found", "There was an issue creating the VM, we could not find it in the host")
+		return
+	}
+
 	hostConfig.HostId = createdVM.HostId
 
 	// stopping the machine as it might need some operations where the machine needs to be stopped

diff --git a/internal/telemetry/events.go b/internal/telemetry/events.go
@@ -3,10 +3,12 @@ package telemetry
 type TelemetryEvent string
 
 const (
-	EventDeploy      TelemetryEvent = "PD-TERRAFORM-PROVIDER::DEPLOY"
-	EventVagrant     TelemetryEvent = "PD-TERRAFORM-PROVIDER::VAGRANT"
-	EventRemoteImage TelemetryEvent = "PD-TERRAFORM-PROVIDER::REMOTE_IMAGE"
-	EventCloneVm     TelemetryEvent = "PD-TERRAFORM-PROVIDER::CLONE_VM"
+	EventDeploy              TelemetryEvent = "PD-TERRAFORM-PROVIDER::DEPLOY"
+	EventVagrant             TelemetryEvent = "PD-TERRAFORM-PROVIDER::VAGRANT"
+	EventRemoteImage         TelemetryEvent = "PD-TERRAFORM-PROVIDER::REMOTE_IMAGE"
+	EventCloneVm             TelemetryEvent = "PD-TERRAFORM-PROVIDER::CLONE_VM"
+	EventDataSourceVm        TelemetryEvent = "PD-TERRAFORM-PROVIDER::DATA_SOURCE_VM"
+	EventVirtualMachineState TelemetryEvent = "PD-TERRAFORM-PROVIDER::VIRTUAL_MACHINE_STATE"
 )
 
 type TelemetryEventMode string

diff --git a/internal/telemetry/main.go b/internal/telemetry/main.go
@@ -34,7 +34,7 @@ func New(context context.Context) *TelemetryService {
 
 	config := amplitude.NewConfig(key)
 	config.FlushQueueSize = 100
-	config.FlushInterval = time.Second * 5
+	config.FlushInterval = time.Second * 3
 	// adding a callback to read what is the status
 	config.ExecuteCallback = func(result types.ExecuteResult) {
 		svc.Callback(result)

diff --git a/internal/telemetry/telemetry_item.go b/internal/telemetry/telemetry_item.go
@@ -41,5 +41,7 @@ func NewTelemetryItem(ctx context.Context, userId string, eventType TelemetryEve
 		item.Properties["user_id"] = hashedUserId
 	}
 
+	item.UserID = hashedUserId
+
 	return item
 }
diff --git a/internal/virtualmachinestate/models/resource_model_v1.go b/internal/virtualmachinestate/models/resource_model_v1.go
@@ -14,4 +14,5 @@ type VirtualMachineStateResourceModelV1 struct {
 	ID            types.String                  `tfsdk:"id"`
 	Operation     types.String                  `tfsdk:"operation"`
 	CurrentState  types.String                  `tfsdk:"current_state"`
+	EnsureState   types.Bool                    `tfsdk:"ensure_state"`
 }