Fix posthig resolver name
Signed-off-by: Bryan Frimin <bryan@probo.com>
This commit is contained in:
@@ -34,8 +34,9 @@ type PostHogDriver struct {
|
|||||||
var _ Driver = (*PostHogDriver)(nil)
|
var _ Driver = (*PostHogDriver)(nil)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
posthogMembersEndpoint = "https://app.posthog.com/api/organizations/@current/members/"
|
posthogMembersEndpoint = "https://app.posthog.com/api/organizations/@current/members/"
|
||||||
posthogMembersPageSize = 100
|
posthogOrganizationEndpoint = "https://app.posthog.com/api/organizations/@current/"
|
||||||
|
posthogMembersPageSize = 100
|
||||||
|
|
||||||
posthogMembershipLevelMember = 1
|
posthogMembershipLevelMember = 1
|
||||||
posthogMembershipLevelAdmin = 8
|
posthogMembershipLevelAdmin = 8
|
||||||
@@ -232,6 +233,55 @@ func posthogMFAStatus(twoFAEnabled *bool) coredata.MFAStatus {
|
|||||||
return coredata.MFAStatusDisabled
|
return coredata.MFAStatusDisabled
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// posthogNameResolver resolves the PostHog organization name from the
|
||||||
|
// current organization endpoint, which returns the org an API key belongs to.
|
||||||
|
type posthogNameResolver struct {
|
||||||
|
httpClient *http.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ NameResolver = (*posthogNameResolver)(nil)
|
||||||
|
|
||||||
|
func NewPostHogNameResolver(httpClient *http.Client) NameResolver {
|
||||||
|
return &posthogNameResolver{httpClient: httpClient}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *posthogNameResolver) ResolveInstanceName(ctx context.Context) (string, error) {
|
||||||
|
req, err := http.NewRequestWithContext(
|
||||||
|
ctx,
|
||||||
|
http.MethodGet,
|
||||||
|
posthogOrganizationEndpoint,
|
||||||
|
nil,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("cannot create posthog organization request: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
req.Header.Set("Accept", "application/json")
|
||||||
|
|
||||||
|
httpResp, err := r.httpClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("cannot execute posthog organization request: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
defer func() { _ = httpResp.Body.Close() }()
|
||||||
|
|
||||||
|
// Best-effort: a non-2xx (e.g. a revoked key) must not make the
|
||||||
|
// source-name worker retry forever. Give up gracefully and keep the
|
||||||
|
// generic source name; a dead key surfaces on the next ListAccounts.
|
||||||
|
if httpResp.StatusCode < 200 || httpResp.StatusCode >= 300 {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var resp struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
}
|
||||||
|
if err := json.NewDecoder(httpResp.Body).Decode(&resp); err != nil {
|
||||||
|
return "", fmt.Errorf("cannot decode posthog organization response: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return resp.Name, nil
|
||||||
|
}
|
||||||
|
|
||||||
func parseRFC3339(value string) (time.Time, bool) {
|
func parseRFC3339(value string) (time.Time, bool) {
|
||||||
if value == "" {
|
if value == "" {
|
||||||
return time.Time{}, false
|
return time.Time{}, false
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ package drivers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
@@ -61,6 +63,63 @@ func TestPostHogDriverListAccounts(t *testing.T) {
|
|||||||
require.NotNil(t, admin.CreatedAt)
|
require.NotNil(t, admin.CreatedAt)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestPostHogNameResolver(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
status int
|
||||||
|
body string
|
||||||
|
want string
|
||||||
|
wantErr bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "200 returns name",
|
||||||
|
status: http.StatusOK,
|
||||||
|
body: `{"id":"org-1","name":"Acme Inc","slug":"acme"}`,
|
||||||
|
want: "Acme Inc",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "401 is terminal (no error, no name)",
|
||||||
|
status: http.StatusUnauthorized,
|
||||||
|
body: `{"detail":"Authentication credentials were not provided."}`,
|
||||||
|
want: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "404 is terminal (no error, no name)",
|
||||||
|
status: http.StatusNotFound,
|
||||||
|
body: `{"detail":"Not found."}`,
|
||||||
|
want: "",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range cases {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
assert.Equal(t, http.MethodGet, r.Method)
|
||||||
|
assert.Equal(t, "/api/organizations/@current/", r.URL.Path)
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(tc.status)
|
||||||
|
_, _ = w.Write([]byte(tc.body))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
client := &http.Client{Transport: &hostRewriter{target: srv.URL}}
|
||||||
|
|
||||||
|
got, err := NewPostHogNameResolver(client).ResolveInstanceName(context.Background())
|
||||||
|
if tc.wantErr {
|
||||||
|
require.Error(t, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Equal(t, tc.want, got)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestPostHogRoleFallback(t *testing.T) {
|
func TestPostHogRoleFallback(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
|
|||||||
@@ -31,5 +31,8 @@ func posthogRegistration() *Registration {
|
|||||||
NewDriver: func(_ context.Context, c *http.Client, _ *coredata.Connector, _ *log.Logger) (drivers.Driver, error) {
|
NewDriver: func(_ context.Context, c *http.Client, _ *coredata.Connector, _ *log.Logger) (drivers.Driver, error) {
|
||||||
return drivers.NewPostHogDriver(c), nil
|
return drivers.NewPostHogDriver(c), nil
|
||||||
},
|
},
|
||||||
|
NewNameResolver: func(_ context.Context, c *http.Client, _ *coredata.Connector, _ *log.Logger) drivers.NameResolver {
|
||||||
|
return drivers.NewPostHogNameResolver(c)
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
15
pkg/coredata/migrations/20260529T022423Z.sql
Normal file
15
pkg/coredata/migrations/20260529T022423Z.sql
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
-- Copyright (c) 2026 Probo Inc <hello@getprobo.com>.
|
||||||
|
--
|
||||||
|
-- Permission to use, copy, modify, and/or distribute this software for any
|
||||||
|
-- purpose with or without fee is hereby granted, provided that the above
|
||||||
|
-- copyright notice and this permission notice appear in all copies.
|
||||||
|
--
|
||||||
|
-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||||
|
-- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||||
|
-- AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||||
|
-- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||||
|
-- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||||
|
-- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||||
|
-- PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
|
ALTER TYPE connector_provider ADD VALUE IF NOT EXISTS 'POSTHOG';
|
||||||
Reference in New Issue
Block a user