From 0f83eb40dbf08b28949a933d9b0ea2ad1d7cf18b Mon Sep 17 00:00:00 2001 From: VinothDarwin-ZC Date: Fri, 21 Feb 2025 12:55:29 +0530 Subject: [PATCH 1/2] Removing the windows related build file from the build directory. This file will conflict the CI process. --- build/build_terraform_provider_site24x7.cmd | 30 --------------------- 1 file changed, 30 deletions(-) delete mode 100644 build/build_terraform_provider_site24x7.cmd diff --git a/build/build_terraform_provider_site24x7.cmd b/build/build_terraform_provider_site24x7.cmd deleted file mode 100644 index 191a72f..0000000 --- a/build/build_terraform_provider_site24x7.cmd +++ /dev/null @@ -1,30 +0,0 @@ -@echo off - -:: Run the make install command -make install -set OUT=%ERRORLEVEL% -echo The error level is %OUT% -echo APPDATA path is "%APPDATA%" - -:: Check if the previous command was successful -if %OUT%==0 ( - :: Define the correct path for the provider installation - set PLUGIN_DIR=%APPDATA%\.terraform.d\plugins\registry.terraform.io\site24x7\site24x7\1.0.0\windows_amd64\ - echo Plugin directory is "%PLUGIN_DIR%" - - :: Check if the directory exists, if not, create it - if not exist "%PLUGIN_DIR%" ( - mkdir "%PLUGIN_DIR%" - ) - - :: Copy the terraform provider file to the correct directory - copy /y terraform-provider-site24x7.exe "%PLUGIN_DIR%terraform-provider-site24x7_v1.0.0.exe" - - :: Remove the .terraform.lock.hcl file - del /q .terraform.lock.hcl - - :: Initialize terraform - terraform init -) else ( - echo Compilation Error -) From ddc6a3f461e9ba29aba31a341161f937cc0ea9ea Mon Sep 17 00:00:00 2001 From: VinothDarwin-ZC Date: Fri, 21 Feb 2025 13:20:28 +0530 Subject: [PATCH 2/2] ResponseFormat and PathExpression Webhook parameters is not declared on the API document. So I am removing them for now. --- site24x7/integration/webhook.go | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/site24x7/integration/webhook.go b/site24x7/integration/webhook.go index 64ae99a..912faf1 100644 --- a/site24x7/integration/webhook.go +++ b/site24x7/integration/webhook.go @@ -148,17 +148,6 @@ var WebhookIntegrationSchema = map[string]*schema.Schema{ Optional: true, Description: "Configuration to handle ticketing based integration.", }, - "response_format": { - Type: schema.TypeString, - Default: "J", - Optional: true, - Description: "Expected response type for ticketing based integration: J(ason) or X(ml)", - }, - "path_expression": { - Type: schema.TypeString, - Optional: true, - Description: "JSON Path/XPath expression to obtain the ticket id of the request created.", - }, "update_url": { Type: schema.TypeString, Optional: true, @@ -365,8 +354,6 @@ func resourceDataToWebhookIntegration(d *schema.ResourceData) (*api.WebhookInteg Tags: tagIDs, AlertTagIDs: alertTagIDs, ManageTickets: d.Get("manage_tickets").(bool), - ResponseFormat: d.Get("response_format").(string), - PathExpression: d.Get("path_expression").(string), UpdateURL: d.Get("update_url").(string), UpdateMethod: d.Get("update_method").(string), UpdateSendIncidentParameters: d.Get("update_send_incident_parameters").(bool), @@ -429,8 +416,6 @@ func updateWebhookIntegrationResourceData(d *schema.ResourceData, webhookIntegra d.Set("alert_tags_id", webhookIntegration.AlertTagIDs) // Manage tickets configuration d.Set("manage_tickets", webhookIntegration.ManageTickets) - d.Set("response_format", webhookIntegration.ResponseFormat) - d.Set("path_expression", webhookIntegration.PathExpression) // Update Ticket d.Set("update_url", webhookIntegration.UpdateURL) d.Set("update_method", webhookIntegration.UpdateMethod)