Verified Commit dafd6fd9 authored by aishahsofea's avatar aishahsofea Committed by GitLab
Browse files

fix(integration): Add missing json tags to ms teams struct 

Changelog: Improvements
parent 740eefcd

integrations.go

+15 −15
Original line number Diff line number Diff line
@@ -457,21 +457,21 @@ func (s *IntegrationsService) GetGroupHarborSettings(gid any, options ...Request 
// GitLab API docs:

// https://docs.gitlab.com/api/group_integrations/#set-up-microsoft-teams-notifications

type SetMicrosoftTeamsNotificationsOptions struct {

	Targets                   *string `url:"targets,omitempty"`

	Webhook                   *string `url:"webhook,omitempty"`

	NotifyOnlyBrokenPipelines *bool   `url:"notify_only_broken_pipelines,omitempty"`

	NotifyOnlyDefaultBranch   *bool   `url:"notify_only_default_branch,omitempty"`

	BranchesToBeNotified      *string `url:"branches_to_be_notified,omitempty"`

	PushEvents                *bool   `url:"push_events,omitempty"`

	IssuesEvents              *bool   `url:"issues_events,omitempty"`

	ConfidentialIssuesEvents  *bool   `url:"confidential_issues_events,omitempty"`

	MergeRequestsEvents       *bool   `url:"merge_requests_events,omitempty"`

	TagPushEvents             *bool   `url:"tag_push_events,omitempty"`

	NoteEvents                *bool   `url:"note_events,omitempty"`

	ConfidentialNoteEvents    *bool   `url:"confidential_note_events,omitempty"`

	PipelineEvents            *bool   `url:"pipeline_events,omitempty"`

	WikiPageEvents            *bool   `url:"wiki_page_events,omitempty"`

	UseInheritedSettings      *bool   `url:"use_inherited_settings,omitempty"`

	Targets                   *string `url:"targets,omitempty" json:"targets,omitempty"`

	Webhook                   *string `url:"webhook,omitempty" json:"webhook,omitempty"`

	NotifyOnlyBrokenPipelines *bool   `url:"notify_only_broken_pipelines,omitempty" json:"notify_only_broken_pipelines,omitempty"`

	NotifyOnlyDefaultBranch   *bool   `url:"notify_only_default_branch,omitempty" json:"notify_only_default_branch,omitempty"`

	BranchesToBeNotified      *string `url:"branches_to_be_notified,omitempty" json:"branches_to_be_notified,omitempty"`

	PushEvents                *bool   `url:"push_events,omitempty" json:"push_events,omitempty"`

	IssuesEvents              *bool   `url:"issues_events,omitempty" json:"issues_events,omitempty"`

	ConfidentialIssuesEvents  *bool   `url:"confidential_issues_events,omitempty" json:"confidential_issues_events,omitempty"`

	MergeRequestsEvents       *bool   `url:"merge_requests_events,omitempty" json:"merge_requests_events,omitempty"`

	TagPushEvents             *bool   `url:"tag_push_events,omitempty" json:"tag_push_events,omitempty"`

	NoteEvents                *bool   `url:"note_events,omitempty" json:"note_events,omitempty"`

	ConfidentialNoteEvents    *bool   `url:"confidential_note_events,omitempty" json:"confidential_note_events,omitempty"`

	PipelineEvents            *bool   `url:"pipeline_events,omitempty" json:"pipeline_events,omitempty"`

	WikiPageEvents            *bool   `url:"wiki_page_events,omitempty" json:"wiki_page_events,omitempty"`

	UseInheritedSettings      *bool   `url:"use_inherited_settings,omitempty" json:"use_inherited_settings,omitempty"`

}



func (s *IntegrationsService) SetGroupMicrosoftTeamsNotifications(gid any, opt *SetMicrosoftTeamsNotificationsOptions, options ...RequestOptionFunc) (*Integration, *Response, error) {

integrations_test.go

+27 −1
Original line number Diff line number Diff line
@@ -276,6 +276,18 @@ func TestSetGroupMicrosoftTeamsNotifications(t *testing.T) { 


	mux.HandleFunc("/api/v4/groups/1/integrations/microsoft-teams", func(w http.ResponseWriter, r *http.Request) {

		testMethod(t, r, http.MethodPut)

		testBodyJSON(t, r, map[string]any{

			"webhook":                      "https://outlook.office.com/webhook/test",

			"notify_only_broken_pipelines": true,

			"branches_to_be_notified":      "all",

			"push_events":                  true,

			"issues_events":                true,

			"merge_requests_events":        true,

			"tag_push_events":              true,

			"note_events":                  true,

			"pipeline_events":              true,

			"wiki_page_events":             false,

		})

		fmt.Fprint(w, `{

			"id": 1,

			"title": "Microsoft Teams",
@@ -301,7 +313,21 @@ func TestSetGroupMicrosoftTeamsNotifications(t *testing.T) { 
			"vulnerability_events": false

		}`)

	})

	integration, resp, err := client.Integrations.SetGroupMicrosoftTeamsNotifications(1, nil)



	opt := &SetMicrosoftTeamsNotificationsOptions{

		Webhook:                   Ptr("https://outlook.office.com/webhook/test"),

		NotifyOnlyBrokenPipelines: Ptr(true),

		BranchesToBeNotified:      Ptr("all"),

		PushEvents:                Ptr(true),

		IssuesEvents:              Ptr(true),

		MergeRequestsEvents:       Ptr(true),

		TagPushEvents:             Ptr(true),

		NoteEvents:                Ptr(true),

		PipelineEvents:            Ptr(true),

		WikiPageEvents:            Ptr(false),

	}



	integration, resp, err := client.Integrations.SetGroupMicrosoftTeamsNotifications(1, opt)

	assert.NoError(t, err)

	assert.NotNil(t, resp)

	createdAt, _ := time.Parse(time.RFC3339, "2023-01-01T00:00:00.000Z")