From c3d9261252c8c61d28c2e8fc1fef2df67e671dff Mon Sep 17 00:00:00 2001 From: Meet Rathod Date: Thu, 15 Jun 2023 02:18:24 +0530 Subject: [PATCH 1/4] Fix trigger tests --- .../triggers/data_source_triggers_test.go | 38 +++++++++---------- .../triggers/resource_triggers_test.go | 38 +++++++++---------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/internal/service/platform/triggers/data_source_triggers_test.go b/internal/service/platform/triggers/data_source_triggers_test.go index 29825fa98..209d35860 100644 --- a/internal/service/platform/triggers/data_source_triggers_test.go +++ b/internal/service/platform/triggers/data_source_triggers_test.go @@ -92,37 +92,37 @@ EOT name = "%[2]s" target_id = harness_platform_pipeline.pipeline.id yaml = <<-EOT - --- trigger: - name: "%[2]s" - identifier: "%[1]s" + name: %[2]s + identifier: %[1]s enabled: true description: "" tags: {} - projectIdentifier: "${harness_platform_project.test.id}" - orgIdentifier: "${harness_platform_project.test.org_id}" - pipelineIdentifier: "${harness_platform_pipeline.pipeline.id}" + projectIdentifier: ${harness_platform_project.test.id} + orgIdentifier: ${harness_platform_project.test.org_id} + pipelineIdentifier: ${harness_platform_pipeline.pipeline.id} source: - type: "Webhook" - pollInterval: "0" + type: Webhook + pollInterval: 0 spec: - type: "Github" + type: Github spec: - type: "Push" + type: Push spec: - connectorRef: "account.Jajoo" + connectorRef: account.Jajoo autoAbortPreviousExecutions: false payloadConditions: - - key: "changedFiles" - operator: "Equals" - value: "fjjfjfjf" - - key: "targetBranch" - operator: "Equals" - value: "fhfhfh" + - key: changedFiles + operator: Equals + value: fjjfjfjf + - key: targetBranch + operator: Equals + value: fhfhfh headerConditions: [] - repoName: "gfgfgf" + repoName: gfgfgf actions: [] - inputYaml: "pipeline: {}\n" + inputYaml: | + pipeline: {}\n EOT } diff --git a/internal/service/platform/triggers/resource_triggers_test.go b/internal/service/platform/triggers/resource_triggers_test.go index bd20ca576..041c2451c 100644 --- a/internal/service/platform/triggers/resource_triggers_test.go +++ b/internal/service/platform/triggers/resource_triggers_test.go @@ -181,37 +181,37 @@ EOT name = "%[2]s" target_id = harness_platform_pipeline.pipeline.id yaml = <<-EOT - --- trigger: - name: "%[2]s" - identifier: "%[1]s" + name: %[2]s + identifier: %[1]s enabled: true description: "" tags: {} - projectIdentifier: "${harness_platform_project.test.id}" - orgIdentifier: "${harness_platform_project.test.org_id}" - pipelineIdentifier: "${harness_platform_pipeline.pipeline.id}" + projectIdentifier: ${harness_platform_project.test.id} + orgIdentifier: ${harness_platform_project.test.org_id} + pipelineIdentifier: ${harness_platform_pipeline.pipeline.id} source: - type: "Webhook" - pollInterval: "0" + type: Webhook + pollInterval: 0 spec: - type: "Github" + type: Github spec: - type: "Push" + type: Push spec: - connectorRef: "account.Jajoo" + connectorRef: account.Jajoo autoAbortPreviousExecutions: false payloadConditions: - - key: "changedFiles" - operator: "Equals" - value: "fjjfjfjf" - - key: "targetBranch" - operator: "Equals" - value: "fhfhfh" + - key: changedFiles + operator: Equals + value: fjjfjfjf + - key: targetBranch + operator: Equals + value: fhfhfh headerConditions: [] - repoName: "gfgfgf" + repoName: gfgfgf actions: [] - inputYaml: "pipeline: {}\n" + inputYaml: | + pipeline: {}\n EOT } `, id, name) From 7c729f478907cb6f395ba6031cad76271d580663 Mon Sep 17 00:00:00 2001 From: Meet Rathod Date: Thu, 15 Jun 2023 02:42:00 +0530 Subject: [PATCH 2/4] Update docs --- docs/resources/platform_triggers.md | 42 +++++++++---------- .../harness_platform_triggers/resource.tf | 35 ++++++++-------- 2 files changed, 37 insertions(+), 40 deletions(-) diff --git a/docs/resources/platform_triggers.md b/docs/resources/platform_triggers.md index 40aa938a9..b2e635e4f 100644 --- a/docs/resources/platform_triggers.md +++ b/docs/resources/platform_triggers.md @@ -1,7 +1,7 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs page_title: "harness_platform_triggers Resource - terraform-provider-harness" -subcategory: "Next Gen" +subcategory: "" description: |- Resource for creating triggers in Harness. --- @@ -10,11 +10,6 @@ description: |- Resource for creating triggers in Harness. -References: -- For details on how to onboard with Terraform, please see [Harness Terraform Provider Overview](https://developer.harness.io/docs/platform/terraform/harness-terraform-provider-overview/) -- To understand how to use the Triggers, please see [Documentation](https://developer.harness.io/docs/category/triggers) -- To get more information about Api, please see [API documentation](https://apidocs.harness.io/tag/Triggers) - ## Example Usage ```terraform @@ -26,34 +21,35 @@ resource "harness_platform_triggers" "example" { target_id = "pipelineIdentifier" yaml = <<-EOT trigger: - name: "name" - identifier: "identifier" + name: name + identifier: identifier enabled: true description: "" tags: {} - projectIdentifier: "projectIdentifier" - orgIdentifier: "orgIdentifer" - pipelineIdentifier: "pipelineIdentifier" + projectIdentifier: projectIdentifier + orgIdentifier: orgIdentifer + pipelineIdentifier: pipelineIdentifier source: - type: "Webhook" + type: Webhook spec: - type: "Github" + type: Github spec: - type: "Push" + type: Push spec: - connectorRef: "account.TestAccResourceConnectorGithub_Ssh_IZBeG" + connectorRef: account.TestAccResourceConnectorGithub_Ssh_IZBeG autoAbortPreviousExecutions: false payloadConditions: - - key: "changedFiles" - operator: "Equals" - value: "value" - - key: "targetBranch" - operator: "Equals" - value: "value" + - key: changedFiles + operator: Equals + value: value + - key: targetBranch + operator: Equals + value: value headerConditions: [] - repoName: "repoName" + repoName: repoName actions: [] - inputYaml: "pipeline: {}\n" + inputYaml: | + pipeline: {}\n EOT } ``` diff --git a/examples/resources/harness_platform_triggers/resource.tf b/examples/resources/harness_platform_triggers/resource.tf index 954da7c4d..107e60e88 100644 --- a/examples/resources/harness_platform_triggers/resource.tf +++ b/examples/resources/harness_platform_triggers/resource.tf @@ -6,33 +6,34 @@ resource "harness_platform_triggers" "example" { target_id = "pipelineIdentifier" yaml = <<-EOT trigger: - name: "name" - identifier: "identifier" + name: name + identifier: identifier enabled: true description: "" tags: {} - projectIdentifier: "projectIdentifier" - orgIdentifier: "orgIdentifer" - pipelineIdentifier: "pipelineIdentifier" + projectIdentifier: projectIdentifier + orgIdentifier: orgIdentifer + pipelineIdentifier: pipelineIdentifier source: - type: "Webhook" + type: Webhook spec: - type: "Github" + type: Github spec: - type: "Push" + type: Push spec: - connectorRef: "account.TestAccResourceConnectorGithub_Ssh_IZBeG" + connectorRef: account.TestAccResourceConnectorGithub_Ssh_IZBeG autoAbortPreviousExecutions: false payloadConditions: - - key: "changedFiles" - operator: "Equals" - value: "value" - - key: "targetBranch" - operator: "Equals" - value: "value" + - key: changedFiles + operator: Equals + value: value + - key: targetBranch + operator: Equals + value: value headerConditions: [] - repoName: "repoName" + repoName: repoName actions: [] - inputYaml: "pipeline: {}\n" + inputYaml: | + pipeline: {}\n EOT } From 2825230b30a02d6c78604dfad8f74599b3c29181 Mon Sep 17 00:00:00 2001 From: Meet Rathod Date: Thu, 15 Jun 2023 02:43:02 +0530 Subject: [PATCH 3/4] Update docs --- docs/resources/platform_triggers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/resources/platform_triggers.md b/docs/resources/platform_triggers.md index b2e635e4f..f0bcc99f2 100644 --- a/docs/resources/platform_triggers.md +++ b/docs/resources/platform_triggers.md @@ -1,7 +1,7 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs page_title: "harness_platform_triggers Resource - terraform-provider-harness" -subcategory: "" +subcategory: "Next Gen" description: |- Resource for creating triggers in Harness. --- From 5c14cb6ef39504b21213584682f34ce03f2b9df7 Mon Sep 17 00:00:00 2001 From: Meet Rathod Date: Thu, 15 Jun 2023 02:44:42 +0530 Subject: [PATCH 4/4] Update docs --- docs/resources/platform_triggers.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/resources/platform_triggers.md b/docs/resources/platform_triggers.md index f0bcc99f2..97fb91758 100644 --- a/docs/resources/platform_triggers.md +++ b/docs/resources/platform_triggers.md @@ -10,6 +10,11 @@ description: |- Resource for creating triggers in Harness. +References: +- For details on how to onboard with Terraform, please see [Harness Terraform Provider Overview](https://developer.harness.io/docs/platform/terraform/harness-terraform-provider-overview/) +- To understand how to use the Triggers, please see [Documentation](https://developer.harness.io/docs/category/triggers) +- To get more information about Api, please see [API documentation](https://apidocs.harness.io/tag/Triggers) + ## Example Usage ```terraform