998b6212b3
* Add skills specific telemetry * Remove VisibilityFuture, inline goroutine at call sites The VisibilityFuture/FetchRepoVisibilityAsync/Wait wrapper was an unidiomatic async abstraction built for a single pattern used in exactly two call sites. In Go the channel is already the future; wrapping it in a struct with a Wait(timeout) method adds no value. Delete the abstraction and inline a local visResult struct, buffered channel, goroutine, and select at each call site. Behavior is preserved exactly: err -> "unknown", timeout -> "unknown", success+public -> include skill_names. FetchRepoVisibility (synchronous) is kept as-is. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix nonsense copilot tests * Update telemetry tests for public-only dims and search event removal Production telemetry emission changed: - preview: skill_owner/skill_repo/skill_name (renamed from skill_names) are now emitted only when repo_visibility=public. - install: skill_owner/skill_repo/skill_names are now emitted only when repo_visibility=public. - search: the initial skill_search event was removed entirely; the skill_search_install event no longer carries query/owner dims. Update tests to match: rename skill_names -> skill_name in preview, make owner/repo assertions conditional on public visibility in both preview and install, and reduce the search test to a single event with explicit Empty assertions for the removed query/owner dims so a privacy regression cannot pass silently. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Test CategorizeHost and switch telemetry to skill_host_type Add TestCategorizeHost covering all four classification branches (github.com, ghes, tenancy, uncategorized) with cases verified against the real ghauth implementation rather than guessed. Update install and preview unit tests to assert the new skill_host_type dimension name, and fix a typo in the preview acceptance txtar (skill_hos_type -> skill_host_type). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Shrink visibility wait and test unknown visibility The 2s visibilityWaitTimeout was wildly overprovisioned: by the time telemetry emission reaches the select, the command has already done several serial GitHub REST calls (and for install, a git sparse-checkout plus possibly interactive prompts), so the one-call visibility fetch has almost always completed. Drop the timeout to 200ms — a short safety net for a stalled REST call, not a wait budget for a healthy one. Also adds a table-driven case to TestFetchRepoVisibility covering an unknown/future visibility value from the API, addressing @babakks' review nitpick. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
114 lines
2.8 KiB
Go
114 lines
2.8 KiB
Go
package ghinstance
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
|
|
ghauth "github.com/cli/go-gh/v2/pkg/auth"
|
|
)
|
|
|
|
// DefaultHostname is the domain name of the default GitHub instance.
|
|
const defaultHostname = "github.com"
|
|
|
|
// Localhost is the domain name of a local GitHub instance.
|
|
const localhost = "github.localhost"
|
|
|
|
// TenancyHost is the domain name of a tenancy GitHub instance.
|
|
const tenancyHost = "ghe.com"
|
|
|
|
// Default returns the host name of the default GitHub instance.
|
|
func Default() string {
|
|
return defaultHostname
|
|
}
|
|
|
|
// TenantName extracts the tenant name from tenancy host name and
|
|
// reports whether it found the tenant name.
|
|
func TenantName(h string) (string, bool) {
|
|
normalizedHostName := ghauth.NormalizeHostname(h)
|
|
return strings.CutSuffix(normalizedHostName, "."+tenancyHost)
|
|
}
|
|
|
|
func isGarage(h string) bool {
|
|
return strings.EqualFold(h, "garage.github.com")
|
|
}
|
|
|
|
func HostnameValidator(hostname string) error {
|
|
if len(strings.TrimSpace(hostname)) < 1 {
|
|
return errors.New("a value is required")
|
|
}
|
|
if strings.ContainsRune(hostname, '/') || strings.ContainsRune(hostname, ':') {
|
|
return errors.New("invalid hostname")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func GraphQLEndpoint(hostname string) string {
|
|
if isGarage(hostname) {
|
|
return fmt.Sprintf("https://%s/api/graphql", hostname)
|
|
}
|
|
if ghauth.IsEnterprise(hostname) {
|
|
return fmt.Sprintf("https://%s/api/graphql", hostname)
|
|
}
|
|
if strings.EqualFold(hostname, localhost) {
|
|
return fmt.Sprintf("http://api.%s/graphql", hostname)
|
|
}
|
|
return fmt.Sprintf("https://api.%s/graphql", hostname)
|
|
}
|
|
|
|
func RESTPrefix(hostname string) string {
|
|
if isGarage(hostname) {
|
|
return fmt.Sprintf("https://%s/api/v3/", hostname)
|
|
}
|
|
if ghauth.IsEnterprise(hostname) {
|
|
return fmt.Sprintf("https://%s/api/v3/", hostname)
|
|
}
|
|
if strings.EqualFold(hostname, localhost) {
|
|
return fmt.Sprintf("http://api.%s/", hostname)
|
|
}
|
|
return fmt.Sprintf("https://api.%s/", hostname)
|
|
}
|
|
|
|
func GistPrefix(hostname string) string {
|
|
prefix := "https://"
|
|
if strings.EqualFold(hostname, localhost) {
|
|
prefix = "http://"
|
|
}
|
|
return prefix + GistHost(hostname)
|
|
}
|
|
|
|
func GistHost(hostname string) string {
|
|
if isGarage(hostname) {
|
|
return fmt.Sprintf("%s/gist/", hostname)
|
|
}
|
|
if ghauth.IsEnterprise(hostname) {
|
|
return fmt.Sprintf("%s/gist/", hostname)
|
|
}
|
|
if strings.EqualFold(hostname, localhost) {
|
|
return fmt.Sprintf("%s/gist/", hostname)
|
|
}
|
|
return fmt.Sprintf("gist.%s/", hostname)
|
|
}
|
|
|
|
func HostPrefix(hostname string) string {
|
|
if strings.EqualFold(hostname, localhost) {
|
|
return fmt.Sprintf("http://%s/", hostname)
|
|
}
|
|
return fmt.Sprintf("https://%s/", hostname)
|
|
}
|
|
|
|
func CategorizeHost(host string) string {
|
|
if host == defaultHostname {
|
|
return "github.com"
|
|
}
|
|
|
|
if ghauth.IsEnterprise(host) {
|
|
return "ghes"
|
|
}
|
|
|
|
if ghauth.IsTenancy(host) {
|
|
return "tenancy"
|
|
}
|
|
|
|
return "uncategorized"
|
|
}
|