Merge branch 'master' into feat/idp-resource

codefresh-io · Feb 28, 2024 · b0a6b99 · b0a6b99
2 parents beb33c5 + 80248af
commit b0a6b99
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/codefresh/resource_pipeline.go b/codefresh/resource_pipeline.go
@@ -606,6 +606,11 @@ Pipeline concurrency policy: Builds on 'Pending Approval' state should be:
 										Type:     schema.TypeBool,
 										Optional: true,
 									},
+									"enable_notifications": {
+										Type:     schema.TypeBool,
+										Optional:    true,
+										Default:     false,
+									},
 								},
 							},
 						},
@@ -768,6 +773,8 @@ func flattenSpec(spec cfclient.Spec) []interface{} {
 				options["keep_pvcs_for_pending_approval"] = valueOption
 			case keyOption == "pendingApprovalConcurrencyApplied":
 				options["pending_approval_concurrency_applied"] = valueOption
+			case keyOption == "enableNotifications":
+				options["enable_notifications"] = valueOption
 			}
 		}
 		resOptions = append(resOptions, options)
@@ -1082,6 +1089,9 @@ func mapResourceToPipeline(d *schema.ResourceData) (*cfclient.Pipeline, error) {
 		if pendingApprovalConcurrencyApplied, ok := d.GetOkExists("spec.0.options.0.pending_approval_concurrency_applied"); ok {
 			pipelineSpecOption["pendingApprovalConcurrencyApplied"] = pendingApprovalConcurrencyApplied.(bool)
 		}
+		if enableNotifications, ok := d.GetOkExists("spec.0.options.0.enable_notifications"); ok {
+			pipelineSpecOption["enableNotifications"] = enableNotifications.(bool)
+		}
 		pipeline.Spec.Options = pipelineSpecOption
 	} else {
 		pipeline.Spec.Options = nil

diff --git a/codefresh/resource_pipeline_test.go b/codefresh/resource_pipeline_test.go
@@ -735,13 +735,14 @@ func TestAccCodefreshPipelineOptions(t *testing.T) {
 		CheckDestroy: testAccCheckCodefreshPipelineDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCodefreshPipelineOptions(name, "codefresh-contrib/react-sample-app", "./codefresh.yml", "master", "git", true, false),
+				Config: testAccCodefreshPipelineOptions(name, "codefresh-contrib/react-sample-app", "./codefresh.yml", "master", "git", true, false, false),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCodefreshPipelineExists(resourceName, &pipeline),
 					resource.TestCheckResourceAttr(resourceName, "name", name),
 					resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.options.*", map[string]string{
 						"keep_pvcs_for_pending_approval":       "true",
 						"pending_approval_concurrency_applied": "false",
+						"enable_notifications":                 "false",
 					}),
 				),
 			},
@@ -1338,7 +1339,7 @@ func TestAccCodefreshPipeline_Contexts(t *testing.T) {
 	})
 }
 
-func testAccCodefreshPipelineOptions(rName, repo, path, revision, context string, keepPVCsForPendingApproval, pendingApprovalConcurrencyApplied bool) string {
+func testAccCodefreshPipelineOptions(rName, repo, path, revision, context string, keepPVCsForPendingApproval, pendingApprovalConcurrencyApplied bool, enableNotifications bool) string {
 	return fmt.Sprintf(`
 resource "codefresh_pipeline" "test" {
 
@@ -1360,10 +1361,11 @@ resource "codefresh_pipeline" "test" {
 	options {
 		keep_pvcs_for_pending_approval = %t
 		pending_approval_concurrency_applied = %t
+		enable_notifications = %t
 	}
   }
 }
-`, rName, repo, path, revision, context, keepPVCsForPendingApproval, pendingApprovalConcurrencyApplied)
+`, rName, repo, path, revision, context, keepPVCsForPendingApproval, pendingApprovalConcurrencyApplied, enableNotifications)
 }
 
 func testAccCodefreshPipelineOnCreateBranchIgnoreTrigger(rName, repo, path, revision, context string, ignoreTrigger bool) string {

diff --git a/docs/resources/pipeline.md b/docs/resources/pipeline.md
@@ -188,6 +188,7 @@ Optional:
 
 Optional:
 
+- `enable_notifications` (Boolean)
 - `keep_pvcs_for_pending_approval` (Boolean) When build enters 'Pending Approval' state, volume should:
 	* Default (attribute not specified): "Use Setting accounts"
 	* true: "Remain (build remains active)"