Merge pull request #63 from atlassian/release-from-bitbucket

Release from bitbucket

Author: aralozkaya

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.1.8
+
+#### Product:
+
+- Add `delete_default_actions` attribute in the API Integration resource. Fix Order attribute problem on Notification Policy and Alert Policy resources. Handle external deletion of resources by setting their state to Deleted on Read operations. This ensures that the provider can handle resources that have been deleted outside of Terraform, preventing state inconsistencies.
 ## v1.1.7
 
 #### Product:

bitbucket-pipelines.yml

@@ -38,13 +38,16 @@ definitions:
           - golangci-lint run -v
     - step: &replicate-to-github
         name: Replicate main branch to GitHub
+        image: python:3.7
         script:
-          - git fetch --unshallow && git checkout main && git pull
+          - pip install git-filter-repo
+          - git fetch --unshallow --all && git checkout main && git pull
           - git remote rename origin bitbucket
-          - git remote add origin [email protected]:atlassian/terraform-provider-atlassian-operations.git
-          - git pull --rebase
+          - git remote add github [email protected]:atlassian/terraform-provider-atlassian-operations.git
           - git checkout -b release-from-bitbucket
-          - git push --set-upstream origin release-from-bitbucket --force
+          - git pull --rebase --strategy-option=ours github main
+          - git filter-repo --commit-callback 'commit.committer_name = commit.author_name; commit.committer_email = commit.author_email;' --refs $(git merge-base github/main release-from-bitbucket)...HEAD --force
+          - git push --set-upstream github release-from-bitbucket --force
 
 pipelines:
   default:

docs/data-sources/team.md

@@ -26,6 +26,7 @@ Team data source
 
 ### Read-Only
 
+- `delete_default_resources` (Boolean) Set to true to remove default escalation and schedule for newly created team. Be careful its also changes that team routing rule to None. That means you have to define routing rule as well. Defaults to false.
 - `description` (String) A detailed description of the team's purpose, responsibilities, and scope of operations.
 - `display_name` (String) The human-readable name of the team as it appears in the Atlassian interface.
 - `member` (Attributes Set) The set of users who are members of this team. Each member has their own role and permissions. (see [below for nested schema](#nestedatt--member))

docs/resources/api_integration.md

@@ -22,6 +22,7 @@ description: |-
 
 ### Optional
 
+- `delete_default_actions` (Boolean) Set to true to remove default actions for this API integration. This is useful for custom integrations where default actions are not applicable. Defaults to false.
 - `enabled` (Boolean) Whether the API integration is enabled. When disabled, the integration will not process any requests. Defaults to false.
 - `team_id` (String) The ID of the team that owns this API integration. Cannot be changed after creation.
 - `type_specific_properties` (String) JSON object containing integration-specific configuration properties. The schema depends on the integration type.

internal/dto/alert_policy_dto.go

@@ -62,3 +62,16 @@ type ActionDto struct {
 	Type       string                 `json:"type"`
 	Parameters map[string]interface{} `json:"parameters"`
 }
+
+type BaseAlertPolicyDto struct {
+	ID      string  `json:"id,omitempty"`
+	Type    string  `json:"type"`
+	Name    string  `json:"name"`
+	Enabled bool    `json:"enabled"`
+	Order   float64 `json:"order,omitempty"`
+}
+
+type AlertPolicyListDto struct {
+	Values []BaseAlertPolicyDto `json:"values"`
+	Links  LinksDto             `json:"links"`
+}

internal/dto/integration_action_dto.go

@@ -34,3 +34,15 @@ type ActionMappingDto struct {
 	Type      string                 `json:"type"`
 	Parameter map[string]interface{} `json:"parameter,omitempty"`
 }
+
+type BaseIntegrationActionDto struct {
+	ID        string `json:"id,omitempty"`
+	Type      string `json:"type"`
+	Name      string `json:"name"`
+	Direction string `json:"direction"`
+	Domain    string `json:"domain"`
+}
+type IntegrationActionListDto struct {
+	Values []BaseIntegrationActionDto `json:"values"`
+	Links  LinksDto                   `json:"links"`
+}

internal/dto/notification_policy_dto.go

@@ -74,3 +74,16 @@ type NotificationConditionDto struct {
 	ExpectedValue string `json:"expectedValue"`
 	Order         int    `json:"order,omitempty"`
 }
+
+type BaseNotificationPolicyDto struct {
+	ID      string  `json:"id,omitempty"`
+	Type    string  `json:"type"`
+	Name    string  `json:"name"`
+	Enabled bool    `json:"enabled"`
+	Order   float64 `json:"order,omitempty"`
+}
+
+type NotificationPolicyListDto struct {
+	Values []BaseNotificationPolicyDto `json:"values"`
+	Links  LinksDto                    `json:"links"`
+}

internal/provider/alert_policy_resource.go

@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"net/url"
 	"strings"
 
 	"github.com/atlassian/terraform-provider-atlassian-operations/internal/dto"
@@ -113,8 +114,9 @@ func (r *AlertPolicyResource) Create(ctx context.Context, req resource.CreateReq
 		return
 	}
 
+	order := getAlertPolicyOrder(ctx, r.clientConfiguration, data.TeamID.ValueString(), alertPolicyDto.ID)
 	// Update state with response
-	result, _ := AlertPolicyDtoToModel(ctx, alertPolicyDto)
+	result, _ := AlertPolicyDtoToModel(ctx, order, alertPolicyDto)
 	resp.Diagnostics.Append(resp.State.Set(ctx, result)...)
 }
 
@@ -149,6 +151,12 @@ func (r *AlertPolicyResource) Read(ctx context.Context, req resource.ReadRequest
 		return
 	}
 
+	if httpResp.GetStatusCode() == 404 {
+		resp.State.RemoveResource(ctx)
+
+		return
+	}
+
 	if httpResp.IsError() {
 		statusCode := httpResp.GetStatusCode()
 		errorResponse := httpResp.GetErrorBody()
@@ -168,7 +176,9 @@ func (r *AlertPolicyResource) Read(ctx context.Context, req resource.ReadRequest
 		return
 	}
 
-	result, _ := AlertPolicyDtoToModel(ctx, &alertPolicyDto)
+	order := getAlertPolicyOrder(ctx, r.clientConfiguration, data.TeamID.ValueString(), alertPolicyDto.ID)
+
+	result, _ := AlertPolicyDtoToModel(ctx, order, &alertPolicyDto)
 	resp.Diagnostics.Append(resp.State.Set(ctx, result)...)
 }
 
@@ -222,8 +232,8 @@ func (r *AlertPolicyResource) Update(ctx context.Context, req resource.UpdateReq
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to update alert policy, got error: %s", err))
 		return
 	}
-
-	result, _ := AlertPolicyDtoToModel(ctx, alertPolicyDto)
+	order := getAlertPolicyOrder(ctx, r.clientConfiguration, data.TeamID.ValueString(), alertPolicyDto.ID)
+	result, _ := AlertPolicyDtoToModel(ctx, order, alertPolicyDto)
 	resp.Diagnostics.Append(resp.State.Set(ctx, result)...)
 }
 
@@ -287,3 +297,72 @@ func (r *AlertPolicyResource) ImportState(ctx context.Context, req resource.Impo
 		resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("team_id"), idParts[1])...)
 	}
 }
+
+func getAlertPolicyOrder(ctx context.Context, configuration dto.AtlassianOpsProviderModel, teamId string, alertPolicyId string) int64 {
+	// list alert policies find the one we just created, and get its order value
+	listAlertPoliciesResponse := &dto.AlertPolicyListDto{}
+	baseURL := fmt.Sprintf("/v1/teams/%s/policies", teamId)
+	queryParams := map[string]string{
+		"type": "alert",
+	}
+	var order int64
+	doneLooping := false
+
+	for !doneLooping {
+		req := httpClientHelpers.
+			GenerateJsmOpsClientRequest(configuration).
+			JoinBaseUrl(baseURL).
+			Method(httpClient.GET).
+			SetBodyParseObject(&listAlertPoliciesResponse).
+			SetQueryParams(queryParams)
+
+		httpResp, err := req.Send()
+
+		if httpResp == nil {
+			tflog.Error(ctx, "Client Error. Unable to list alert policies, got nil response")
+			return 0
+		}
+		if httpResp.IsError() {
+			statusCode := httpResp.GetStatusCode()
+			errorResponse := httpResp.GetErrorBody()
+			if errorResponse != nil {
+				tflog.Error(ctx, fmt.Sprintf("Client Error. Unable to list alert policies, status code: %d. Got response: %s", statusCode, *errorResponse))
+			} else {
+				tflog.Error(ctx, fmt.Sprintf("Client Error. Unable to list alert policies, got http response: %d", statusCode))
+			}
+			return 0
+		}
+		if err != nil {
+			tflog.Error(ctx, fmt.Sprintf("Client Error. Unable to list alert policies, got error: %s", err))
+			return 0
+		}
+
+		for _, policy := range listAlertPoliciesResponse.Values {
+			if policy.ID == alertPolicyId {
+				order = int64(policy.Order)
+				return order
+			}
+		}
+
+		if listAlertPoliciesResponse.Links.Next == "" {
+			doneLooping = true
+		} else {
+			nextURL := listAlertPoliciesResponse.Links.Next
+			parsedURL, err := url.Parse(nextURL)
+			if err != nil {
+				tflog.Error(ctx, fmt.Sprintf("Client Error. Unable to parse next URL, got error: %s", err))
+				return 0
+			}
+			urlValues := parsedURL.Query()
+			queryParams = make(map[string]string)
+			for key, values := range urlValues {
+				if len(values) > 0 {
+					queryParams[key] = values[0]
+				}
+			}
+			baseURL = parsedURL.Path
+			listAlertPoliciesResponse = &dto.AlertPolicyListDto{}
+		}
+	}
+	return order
+}

internal/provider/alert_policy_resource_test.go

@@ -56,6 +56,7 @@ resource "atlassian-operations_alert_policy" "test" {
   type        = "alert"
   enabled     = true
   message     = "Test alert message"
+  order       = 1
 
   filter = {
     type = "match-any-condition"

internal/provider/api_integration_resource.go

@@ -104,6 +104,15 @@ func (r *ApiIntegrationResource) Create(ctx context.Context, req resource.Create
 		return
 	}
 
+	if data.DeleteDefaultActions.ValueBool() {
+		// List default actions using the API Integration ID then using delete action endpoint delete each action
+		err = listDefaultActionsAndDelete(r.clientConfiguration, dtoObj.Id)
+		if err != nil {
+			tflog.Warn(ctx, fmt.Sprintf("Error deleting default actions for API integration: %s", err))
+			resp.Diagnostics.AddWarning("Error Deleting Default Actions", fmt.Sprintf("Unable to delete default actions for API integration: %s", err))
+		}
+	}
+
 	data = ApiIntegrationDtoToModel(dtoObj, data)
 
 	tflog.Trace(ctx, "Created the ApiIntegrationResource")
@@ -113,6 +122,36 @@ func (r *ApiIntegrationResource) Create(ctx context.Context, req resource.Create
 	tflog.Trace(ctx, "Saved the ApiIntegrationResource into Terraform state")
 }
 
+func listDefaultActionsAndDelete(configuration dto.AtlassianOpsProviderModel, integrationId string) error {
+	defaultActions := dto.IntegrationActionListDto{}
+	httpResp, err := httpClientHelpers.
+		GenerateJsmOpsClientRequest(configuration).
+		JoinBaseUrl(fmt.Sprintf("v1/integrations/%s/actions", integrationId)).
+		Method(httpClient.GET).
+		SetBodyParseObject(&defaultActions).
+		Send()
+	if err != nil {
+		return fmt.Errorf("unable to list default actions, got error: %s couldn't delete default actions automatically. Please delete it through UI", err)
+	}
+	if httpResp.IsError() {
+		return fmt.Errorf("unable to list default actions, couldn't delete default actions automatically, got http response: %d. Please delete it through UI", httpResp.GetStatusCode())
+	}
+	for _, action := range defaultActions.Values {
+		httpResp, err := httpClientHelpers.
+			GenerateJsmOpsClientRequest(configuration).
+			JoinBaseUrl(fmt.Sprintf("v1/integrations/%s/actions/%s", integrationId, action.ID)).
+			Method(httpClient.DELETE).
+			Send()
+		if err != nil {
+			return fmt.Errorf("unable to delete default action %s, got error: %s couldn't delete default actions automatically. Please delete it through UI", action.ID, err)
+		}
+		if httpResp.IsError() {
+			return fmt.Errorf("unable to delete default action %s, couldn't delete default actions automatically, got http response: %d. Please delete it through UI", action.Name, httpResp.GetStatusCode())
+		}
+	}
+	return nil
+}
+
 func (r *ApiIntegrationResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
 	var data dataModels.ApiIntegrationModel
 
@@ -132,6 +171,10 @@ func (r *ApiIntegrationResource) Read(ctx context.Context, req resource.ReadRequ
 	if httpResp == nil {
 		tflog.Error(ctx, "Client Error. Unable to read api integration, got nil response")
 		resp.Diagnostics.AddError("Client Error", "Unable to read api integration, got nil response")
+	} else if httpResp.GetStatusCode() == 404 {
+		resp.State.RemoveResource(ctx)
+
+		return
 	} else if httpResp.IsError() {
 		statusCode := httpResp.GetStatusCode()
 		errorResponse := httpResp.GetErrorBody()