Merge pull request #24 from PostHog/vdekrijger-make-project-id-otional

chore: Make the project_id optional and allow it to be passed to the existing resources

Author: vdekrijger

docs/resources/alert.md

@@ -28,6 +28,7 @@ Manage PostHog alerts. Alerts notify you when an insight's value crosses a thres
 - `condition_type` (String) Condition type: `absolute_value`, `relative_increase`, or `relative_decrease`.
 - `enabled` (Boolean) Whether the alert is enabled. Defaults to true.
 - `name` (String) Name of the alert.
+- `project_id` (String) Project ID (environment) for this resource. Overrides the provider-level project_id.
 - `series_index` (Number) Index of the trend series to monitor (0-based). Used for trends alerts.
 - `skip_weekend` (Boolean) Whether to skip checking the alert on weekends.
 - `threshold_lower` (Number) Lower bound of the threshold. Alert fires when value goes below this.

docs/resources/dashboard.md

@@ -24,6 +24,7 @@ PostHog Dashboard resource
 - `deleted` (Boolean) Whether the dashboard is deleted (soft delete)
 - `description` (String) Dashboard description
 - `pinned` (Boolean) Whether the dashboard is pinned
+- `project_id` (String) Project ID (environment) for this resource. Overrides the provider-level project_id.
 - `tags` (Set of String) Set of tags for the dashboard
 
 ### Read-Only

docs/resources/feature_flag.md

@@ -24,6 +24,7 @@ PostHog Feature Flag resource
 - `active` (Boolean) Whether the feature flag is active
 - `filters` (String) Feature flag filters as JSON
 - `name` (String) Feature flag name/description
+- `project_id` (String) Project ID (environment) for this resource. Overrides the provider-level project_id.
 - `rollout_percentage` (Number) Rollout percentage (0-100)
 - `tags` (Set of String) Set of tags for the feature flag
 

docs/resources/hog_function.md

@@ -27,6 +27,7 @@ Manage PostHog Hog functions. Hog functions enable destinations, webhooks, and t
 - `mappings_json` (String) JSON array of mapping configurations. Each mapping can have its own `name`, `inputs_schema`, `inputs`, and `filters`.
 - `masking_json` (String) JSON object configuring PII masking for the Hog function. Includes `ttl`, `threshold`, and `hash` properties.
 - `name` (String) Name of the Hog function.
+- `project_id` (String) Project ID (environment) for this resource. Overrides the provider-level project_id.
 - `template_id` (String) ID of a template to use as the basis for this Hog function. The template provides default code, inputs schema, and configuration.
 - `type` (String) Type of Hog function: `destination`, `site_destination`, `internal_destination`, `source_webhook`, `site_app`, or `transformation`.
 

docs/resources/insight.md

@@ -27,6 +27,7 @@ Manage PostHog insights via the insights endpoints.
 - `derived_name` (String) Insight derived name. This is auto-generated by PostHog when the name is not set.
 - `description` (String) Insight description.
 - `name` (String) Insight name.
+- `project_id` (String) Project ID (environment) for this resource. Overrides the provider-level project_id.
 - `tags` (Set of String) List of tags to apply to the insight.
 
 ### Read-Only

docs/resources/project.md

@@ -18,7 +18,7 @@ Manages a PostHog project within an organization.
 ### Required
 
 - `name` (String) The name of the project.
-- `organization_id` (String) The identifier of the organization this project belongs to.
+- `organization_id` (String) The identifier of the organization this resource belongs to.
 
 ### Optional
 

internal/data/provider_data.go

@@ -6,5 +6,6 @@ import (
 
 // ProviderData passes configured client to resources.
 type ProviderData struct {
-	Client httpclient.PosthogClient
+	Client           httpclient.PosthogClient
+	DefaultProjectID string
 }

internal/httpclient/alerts.go

@@ -79,23 +79,23 @@ type AlertCheck struct {
 	TargetsNotified bool     `json:"targets_notified"`
 }
 
-func (c *PosthogClient) CreateAlert(ctx context.Context, input AlertRequest) (Alert, error) {
-	path := fmt.Sprintf("/api/environments/%s/alerts/", c.projectID)
+func (c *PosthogClient) CreateAlert(ctx context.Context, projectID string, input AlertRequest) (Alert, error) {
+	path := fmt.Sprintf("/api/environments/%s/alerts/", projectID)
 	result, _, err := doPost[Alert](c, ctx, path, input)
 	return result, err
 }
 
-func (c *PosthogClient) GetAlert(ctx context.Context, id string) (Alert, HTTPStatusCode, error) {
-	path := fmt.Sprintf("/api/environments/%s/alerts/%s/", c.projectID, id)
+func (c *PosthogClient) GetAlert(ctx context.Context, projectID, id string) (Alert, HTTPStatusCode, error) {
+	path := fmt.Sprintf("/api/environments/%s/alerts/%s/", projectID, id)
 	return doGet[Alert](c, ctx, path)
 }
 
-func (c *PosthogClient) UpdateAlert(ctx context.Context, id string, input AlertRequest) (Alert, HTTPStatusCode, error) {
-	path := fmt.Sprintf("/api/environments/%s/alerts/%s/", c.projectID, id)
+func (c *PosthogClient) UpdateAlert(ctx context.Context, projectID, id string, input AlertRequest) (Alert, HTTPStatusCode, error) {
+	path := fmt.Sprintf("/api/environments/%s/alerts/%s/", projectID, id)
 	return doPatch[Alert](c, ctx, path, input)
 }
 
-func (c *PosthogClient) DeleteAlert(ctx context.Context, id string) (HTTPStatusCode, error) {
-	path := fmt.Sprintf("/api/environments/%s/alerts/%s/", c.projectID, id)
+func (c *PosthogClient) DeleteAlert(ctx context.Context, projectID, id string) (HTTPStatusCode, error) {
+	path := fmt.Sprintf("/api/environments/%s/alerts/%s/", projectID, id)
 	return doDelete(c, ctx, path)
 }

internal/httpclient/client.go

@@ -18,12 +18,11 @@ type HTTPStatusCode int
 type PosthogClient struct {
 	host       string
 	apiKey     string
-	projectID  string
 	version    string
 	httpClient *http.Client
 }
 
-func NewDefaultClient(host, apiKey, projectID, version string, opts ...ClientOption) PosthogClient {
+func NewDefaultClient(host, apiKey, version string, opts ...ClientOption) PosthogClient {
 	httpClient := &http.Client{
 		Timeout: 30 * time.Second,
 		Transport: &http.Transport{
@@ -43,21 +42,19 @@ func NewDefaultClient(host, apiKey, projectID, version string, opts ...ClientOpt
 	return PosthogClient{
 		host:       host,
 		apiKey:     apiKey,
-		projectID:  projectID,
 		version:    version,
 		httpClient: httpClient,
 	}
 }
 
-func NewClient(client *http.Client, host, apiKey, projectID, version string, opts ...ClientOption) PosthogClient {
+func NewClient(client *http.Client, host, apiKey, version string, opts ...ClientOption) PosthogClient {
 	for _, opt := range opts {
 		opt(client)
 	}
 
 	return PosthogClient{
 		host:       host,
 		apiKey:     apiKey,
-		projectID:  projectID,
 		version:    version,
 		httpClient: client,
 	}

internal/httpclient/dashboard.go

@@ -22,25 +22,25 @@ type DashboardRequest struct {
 	Deleted     *bool    `json:"deleted,omitempty"`
 }
 
-func (c *PosthogClient) CreateDashboard(ctx context.Context, input DashboardRequest) (Dashboard, error) {
-	path := fmt.Sprintf("/api/projects/%s/dashboards/", c.projectID)
+func (c *PosthogClient) CreateDashboard(ctx context.Context, projectID string, input DashboardRequest) (Dashboard, error) {
+	path := fmt.Sprintf("/api/projects/%s/dashboards/", projectID)
 	result, _, err := doPost[Dashboard](c, ctx, path, input)
 	return result, err
 }
 
-func (c *PosthogClient) GetDashboard(ctx context.Context, id string) (Dashboard, HTTPStatusCode, error) {
-	path := fmt.Sprintf("/api/projects/%s/dashboards/%s/", c.projectID, id)
+func (c *PosthogClient) GetDashboard(ctx context.Context, projectID, id string) (Dashboard, HTTPStatusCode, error) {
+	path := fmt.Sprintf("/api/projects/%s/dashboards/%s/", projectID, id)
 	return doGet[Dashboard](c, ctx, path)
 }
 
-func (c *PosthogClient) UpdateDashboard(ctx context.Context, id string, input DashboardRequest) (Dashboard, HTTPStatusCode, error) {
-	path := fmt.Sprintf("/api/projects/%s/dashboards/%s/", c.projectID, id)
+func (c *PosthogClient) UpdateDashboard(ctx context.Context, projectID, id string, input DashboardRequest) (Dashboard, HTTPStatusCode, error) {
+	path := fmt.Sprintf("/api/projects/%s/dashboards/%s/", projectID, id)
 	return doPatch[Dashboard](c, ctx, path, input)
 }
 
-func (c *PosthogClient) DeleteDashboard(ctx context.Context, id string) (HTTPStatusCode, error) {
+func (c *PosthogClient) DeleteDashboard(ctx context.Context, projectID, id string) (HTTPStatusCode, error) {
 	deleted := true
 	input := DashboardRequest{Deleted: &deleted}
-	_, statusCode, err := c.UpdateDashboard(ctx, id, input)
+	_, statusCode, err := c.UpdateDashboard(ctx, projectID, id, input)
 	return statusCode, err
 }