Verified Commit ca3f7799 authored by José M. Requena Plens's avatar José M. Requena Plens Committed by GitLab
Browse files

feat(settings): add o11y_provisioner_url and o11y_provisioner_api_key

Changelog: Improvements
parent d25e5507
Loading
Loading
Loading
Loading
+3
Changes for settings.go: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ type Settings struct {
	NotesCreateLimit                                       int64                     `json:"notes_create_limit"`
	NotifyOnUnknownSignIn                                  bool                      `json:"notify_on_unknown_sign_in"`
	NugetSkipMetadataURLValidation                         bool                      `json:"nuget_skip_metadata_url_validation"`
	O11yProvisionerURL                                     string                    `json:"o11y_provisioner_url"`
	OutboundLocalRequestsAllowlistRaw                      string                    `json:"outbound_local_requests_allowlist_raw"`
	OutboundLocalRequestsWhitelist                         []string                  `json:"outbound_local_requests_whitelist"`
	PackageMetadataPURLTypes                               []int64                   `json:"package_metadata_purl_types"`
@@ -848,6 +849,8 @@ type UpdateSettingsOptions struct {
	NotesCreateLimit                                       *int64                                  `url:"notes_create_limit,omitempty" json:"notes_create_limit,omitempty"`
	NotifyOnUnknownSignIn                                  *bool                                   `url:"notify_on_unknown_sign_in,omitempty" json:"notify_on_unknown_sign_in,omitempty"`
	NugetSkipMetadataURLValidation                         *bool                                   `url:"nuget_skip_metadata_url_validation,omitempty" json:"nuget_skip_metadata_url_validation,omitempty"`
	O11yProvisionerAPIKey                                  *string                                 `url:"o11y_provisioner_api_key,omitempty" json:"o11y_provisioner_api_key,omitempty"`
	O11yProvisionerURL                                     *string                                 `url:"o11y_provisioner_url,omitempty" json:"o11y_provisioner_url,omitempty"`
	OutboundLocalRequestsAllowlistRaw                      *string                                 `url:"outbound_local_requests_allowlist_raw,omitempty" json:"outbound_local_requests_allowlist_raw,omitempty"`
	OutboundLocalRequestsWhitelist                         *[]string                               `url:"outbound_local_requests_whitelist,omitempty" json:"outbound_local_requests_whitelist,omitempty"`
	PackageMetadataPURLTypes                               *[]int64                                `url:"package_metadata_purl_types,omitempty" json:"package_metadata_purl_types,omitempty"`
+39
Changes for settings_test.go: 39 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -222,6 +222,45 @@ func TestGetSettings_SearchRateLimitAllowlistRaw(t *testing.T) {
	assert.Equal(t, "root\nfoo.bar", settings.SearchRateLimitAllowlistRaw)
}

func TestUpdateSettings_O11yProvisioner(t *testing.T) {
	t.Parallel()
	mux, client := setup(t)

	mux.HandleFunc("/api/v4/application/settings", func(w http.ResponseWriter, r *http.Request) {
		testMethod(t, r, http.MethodPut)
		testBodyJSON(t, r, map[string]any{
			"o11y_provisioner_api_key": "provisioner-api-key",
			"o11y_provisioner_url":     "https://provisioner.example.com",
		})

		// GitLab does not return the API key.
		fmt.Fprint(w, `{"id":1, "o11y_provisioner_url": "https://provisioner.example.com"}`)
	})

	settings, _, err := client.Settings.UpdateSettings(&UpdateSettingsOptions{
		O11yProvisionerAPIKey: new("provisioner-api-key"),
		O11yProvisionerURL:    new("https://provisioner.example.com"),
	})

	require.NoError(t, err)
	assert.Equal(t, "https://provisioner.example.com", settings.O11yProvisionerURL)
}

func TestGetSettings_O11yProvisionerURL(t *testing.T) {
	t.Parallel()
	mux, client := setup(t)

	mux.HandleFunc("/api/v4/application/settings", func(w http.ResponseWriter, r *http.Request) {
		testMethod(t, r, http.MethodGet)
		fmt.Fprint(w, `{"id":1, "o11y_provisioner_url": "https://provisioner.example.com"}`)
	})

	settings, _, err := client.Settings.GetSettings()

	require.NoError(t, err)
	assert.Equal(t, "https://provisioner.example.com", settings.O11yProvisionerURL)
}

func TestSettings_SentryEnabled(t *testing.T) {
	t.Parallel()
	mux, client := setup(t)