WIP: Custom support-request form at /support/new with stubbed /api/support backend

content/blog/hidden-costs-of-infrastructure-management/index.md

@@ -99,7 +99,7 @@ With Pulumi IaC, your teams can tackle the growing complexity of modern architec
 
 When you’re scaling your organization, you’ll need an IaC backend that makes team onboarding efficient. DIY backends often involve ad-hoc onboarding with bespoke identity solutions, requiring custom documentation and training to troubleshoot unique problems. This can slow down onboarding and reduce end-user productivity. Additionally, DIY backends place the internal support burden on your team, requiring them to assist users in navigating the system.
 
-In contrast, Pulumi Cloud offers standardized, well-documented capabilities and integrates seamlessly with identity systems, leading to efficient onboarding and increased productivity for new employees. Pulumi Cloud provides [12x5 or 24x7 support](https://support.pulumi.com/hc/en-us), ensuring your organization receives immediate assistance with any architectural, cloud-related, or Pulumi best-practices issues. Furthermore, Pulumi Cloud includes built-in RBAC, simplifying the onboarding and scaling of new users.
+In contrast, Pulumi Cloud offers standardized, well-documented capabilities and integrates seamlessly with identity systems, leading to efficient onboarding and increased productivity for new employees. Pulumi Cloud provides [12x5 or 24x7 support](https://pulumi.com/support/new), ensuring your organization receives immediate assistance with any architectural, cloud-related, or Pulumi best-practices issues. Furthermore, Pulumi Cloud includes built-in RBAC, simplifying the onboarding and scaling of new users.
 
 {{% notes type="tip" %}}
 **BMW Group** used Pulumi to build a scalable and resilient hybrid cloud implementation that could handle more than eleven thousand developers.

content/blog/journaling-ga/index.md

@@ -68,4 +68,4 @@ This data already shows the expected significant improvement in update times, es
 
 While this was an opt-in process using the `PULUMI_ENABLE_JOURNALING` environment variable, this opt-in is no longer required. Just upgrade your Pulumi CLI to v3.225.0+ and use the Pulumi Cloud backend, and journaling will automatically speed up your updates.
 
-If you encounter any issues, reach out on the [Pulumi Community Slack](https://slack.pulumi.com/) or through [Pulumi Support](https://support.pulumi.com/hc/en-us).  You can also set the `PULUMI_DISABLE_JOURNALING=true` env variable to opt out of journaling.
+If you encounter any issues, reach out on the [Pulumi Community Slack](https://slack.pulumi.com/) or through [Pulumi Support](https://pulumi.com/support/new).  You can also set the `PULUMI_DISABLE_JOURNALING=true` env variable to opt out of journaling.

content/blog/journaling/index.md

@@ -325,7 +325,7 @@ The full documentation of the algorithm can be found in our [developer docs](htt
 - We implemented the replay interface inside the `pulumi` CLI, and ran it in parallel with the current snapshotting implementation in our tests. The snapshots were then compared automatically, and tests made to fail when the result didn't match.
 - Since tests can't cover all possible edge cases, the next step was to run the journaler in parallel with the current snapshotting implementation internally. This was still without sending the results to the service. However we would compare the snapshot, and send an error event to the service if the snapshot didn't match. In our data warehouse we could then inspect any mismatches, and fix them. Since this does involve the service in a minor way, we would only do this if the user is using the Cloud backend.
 - Next up was adding a feature flag for the service, so journaling could be turned on selectively for some orgs. At the same time we implemented an opt-in environment variable in the CLI (`PULUMI_ENABLE_JOURNALING`), so the feature could be selectively turned on by users, if both the feature flag is enabled and the user sets the environment variable. This way we could slowly start enabling this in our repos, e.g. first in the integration tests for `pulumi/pulumi`, then in the tests for `pulumi/examples` and `pulumi/templates`, etc.
-- Allow users to start opting in.  If you want to opt-in with your org, please reach out to us, either on the [Community Slack](https://slack.pulumi.com/), or through our [Support channels](https://support.pulumi.com/hc/en-us), and we'll opt your org into the feature flag. Then you can begin seeing the performance improvements by setting the `PULUMI_ENABLE_JOURNALING` env variable to true.
+- Allow users to start opting in.  If you want to opt-in with your org, please reach out to us, either on the [Community Slack](https://slack.pulumi.com/), or through our [Support channels](https://pulumi.com/support/new), and we'll opt your org into the feature flag. Then you can begin seeing the performance improvements by setting the `PULUMI_ENABLE_JOURNALING` env variable to true.
 - Turn on the feature flag for everyone, but still require the `PULUMI_ENABLE_JOURNALING` env variable to be set to true. (We are here right now).
 - Flip the feature on by default, but still allow users to opt out using a `PULUMI_DISABLE_JOURNALING` env variable.
 

content/blog/short-lived-access-tokens/index.md

@@ -62,4 +62,4 @@ curl \
 
 We invite you to try out the new short lived access tokens in Pulumi Cloud. As always, we value your feedback and look forward to hearing how this feature helps streamline your workflows and enhances security.
 
-For more details, check out [our documentation](/docs/administration/access-identity/access-tokens/) and [API reference docs](/docs/reference/cloud-rest-api/). If you have any questions or need assistance, [our support team](https://support.pulumi.com/hc/en-us) is here to help.
+For more details, check out [our documentation](/docs/administration/access-identity/access-tokens/) and [API reference docs](/docs/reference/cloud-rest-api/). If you have any questions or need assistance, [our support team](https://pulumi.com/support/new) is here to help.

content/contact/_index.md

@@ -19,7 +19,7 @@ quick_links:
         - label: Already a customer?
           description: File a support ticket for a fast response from our team.
           cta_label: Get support
-          url: https://support.pulumi.com/hc/en-us/requests/new
+          url: https://pulumi.com/support/new/requests/new
 
 form:
     - key: general
@@ -39,6 +39,6 @@ form:
       hubspot_form_id: cta1
       cta:
         label: Submit a Request
-        url: https://support.pulumi.com/hc/en-us/requests/new
+        url: https://pulumi.com/support/new/requests/new
 
 ---

content/docs/administration/access-identity/saml/auth0.md

@@ -61,4 +61,4 @@ To configure Pulumi with the SAML metadata:
 
 Auth0 troubleshooting: [SAML app error messages](https://auth0.com/docs/troubleshoot/authentication-issues/troubleshoot-saml-configurations)
 
-For additional help, see the [SAML SSO troubleshooting guide](/docs/administration/access-identity/saml/troubleshooting/) or [contact support](https://support.pulumi.com/).
+For additional help, see the [SAML SSO troubleshooting guide](/docs/administration/access-identity/saml/troubleshooting/) or [contact support](https://pulumi.com/support/new/).

content/docs/administration/access-identity/saml/entra.md

@@ -114,4 +114,4 @@ sign in to your Entra ID instance, and then immediately be redirected back to Pu
 
 ## Troubleshooting
 
-For help resolving SAML SSO configuration issues, see the [SAML SSO troubleshooting guide](/docs/administration/access-identity/saml/troubleshooting/) or [contact support](https://support.pulumi.com/).
+For help resolving SAML SSO configuration issues, see the [SAML SSO troubleshooting guide](/docs/administration/access-identity/saml/troubleshooting/) or [contact support](https://pulumi.com/support/new/).

content/docs/administration/access-identity/saml/gsuite.md

@@ -101,4 +101,4 @@ name of your Pulumi organization.
 
 Google Workspace SAML troubleshooting: [SAML app error messages](https://support.google.com/a/answer/6301076)
 
-For additional help, see the [SAML SSO troubleshooting guide](/docs/administration/access-identity/saml/troubleshooting/) or [contact support](https://support.pulumi.com/).
+For additional help, see the [SAML SSO troubleshooting guide](/docs/administration/access-identity/saml/troubleshooting/) or [contact support](https://pulumi.com/support/new/).

content/docs/administration/access-identity/saml/okta.md

@@ -137,4 +137,4 @@ name of your Pulumi organization.
 
 ## Troubleshooting
 
-For help resolving SAML SSO configuration issues, see the [SAML SSO troubleshooting guide](/docs/administration/access-identity/saml/troubleshooting/) or [contact support](https://support.pulumi.com/).
+For help resolving SAML SSO configuration issues, see the [SAML SSO troubleshooting guide](/docs/administration/access-identity/saml/troubleshooting/) or [contact support](https://pulumi.com/support/new/).

content/docs/administration/access-identity/saml/onelogin.md

@@ -109,4 +109,4 @@ name of your Pulumi organization.
 
 ## Troubleshooting
 
-For help resolving SAML SSO configuration issues, see the [SAML SSO troubleshooting guide](/docs/administration/access-identity/saml/troubleshooting/) or [contact support](https://support.pulumi.com/).
+For help resolving SAML SSO configuration issues, see the [SAML SSO troubleshooting guide](/docs/administration/access-identity/saml/troubleshooting/) or [contact support](https://pulumi.com/support/new/).

content/docs/administration/access-identity/saml/troubleshooting.md

@@ -14,7 +14,7 @@ pulumi_cloud_feature: saml-sso
 
 ## Locked out of your organization
 
-If you are locked out of your Pulumi organization due to a SAML configuration error or an expired certificate, a [SAML admin](/docs/administration/access-identity/saml/saml-admin/) can log in using an alternative login method to resolve the issue. If your organization does not have a SAML admin configured, [contact support](https://support.pulumi.com/).
+If you are locked out of your Pulumi organization due to a SAML configuration error or an expired certificate, a [SAML admin](/docs/administration/access-identity/saml/saml-admin/) can log in using an alternative login method to resolve the issue. If your organization does not have a SAML admin configured, [contact support](https://pulumi.com/support/new/).
 
 ## Validation error while trying to save an IdP-provided metadata XML in Pulumi Cloud
 

content/docs/administration/access-identity/scim/troubleshooting.md

@@ -21,7 +21,7 @@ This page describes how to resolve issues that may occur when configuring SCIM p
 
 ## User provisioning failures
 
-These errors can occur when attempting to create (POST), replace (PUT), or update (PATCH) a user. If you encounter difficulties resolving these issues, please contact our [customer support](https://support.pulumi.com/) for assistance.
+These errors can occur when attempting to create (POST), replace (PUT), or update (PATCH) a user. If you encounter difficulties resolving these issues, please contact our [customer support](https://pulumi.com/support/new/) for assistance.
 
 ### Email already in use
 

content/docs/administration/organizations-teams/organizations.md

@@ -112,7 +112,7 @@ To update your organization's display name:
 
 Updating the display name requires the `organization:rename` permission, which is granted to organization admins.
 
-If you need a legal entity name on invoices that is different from your organization's product-facing display name, [contact support](https://support.pulumi.com/).
+If you need a legal entity name on invoices that is different from your organization's product-facing display name, [contact support](https://pulumi.com/support/new/).
 
 ## Transferring stacks
 

content/docs/administration/self-hosting/components/api.md

@@ -73,8 +73,8 @@ between the API and the database. The API also supports [exporting OpenTelemetry
 | PULUMI_DATABASE_NAME     | The name of the database on the database server.                                                                                             |
 | PULUMI_API_DOMAIN        | The internet or network-local domain using which the API service can be reached, e.g. `pulumiapi.acmecorp.com`. Default is `localhost:8080`. |
 | PULUMI_CONSOLE_DOMAIN    | The internet or network-local domain using which the Console can be reached, e.g. `pulumiconsole.acmecorp.com`. Default is `localhost:3000`. |
-| PULUMI_ENGINE_EVENTS_SCHEMA_V2 | Set this environment variable to `true` for fresh installs. **If you have an existing installation and the environment variable is currently not set or set to `false`, contact [Pulumi support](https://support.pulumi.com/) before setting it to `true`.** |
-| PULUMI_ENGINE_EVENTS_LEGACY_WRITE | Set this environment variable to `false` for fresh installs. **If you have an existing installation and the environment variable is currently not set or set to `true` in your installation, contact [Pulumi support](https://support.pulumi.com/) before setting it to `false`.** |
+| PULUMI_ENGINE_EVENTS_SCHEMA_V2 | Set this environment variable to `true` for fresh installs. **If you have an existing installation and the environment variable is currently not set or set to `false`, contact [Pulumi support](https://pulumi.com/support/new/) before setting it to `true`.** |
+| PULUMI_ENGINE_EVENTS_LEGACY_WRITE | Set this environment variable to `false` for fresh installs. **If you have an existing installation and the environment variable is currently not set or set to `true` in your installation, contact [Pulumi support](https://pulumi.com/support/new/) before setting it to `false`.** |
 
 ## Object storage
 

content/docs/iac/get-started/terraform/next-steps.md

@@ -349,7 +349,7 @@ Reach out to us via these support channels:
 
 * **[Pulumi Community Slack](https://slack.pulumi.com/)**: Real-time community support
 * **[GitHub Issues](https://github.com/pulumi/pulumi/issues)**: Bug reports and feature requests
-* **[Pulumi Support](https://support.pulumi.com/)**: Professional support for Pulumi Cloud customers
+* **[Pulumi Support](https://pulumi.com/support/new/)**: Professional support for Pulumi Cloud customers
 
 ### Open source contributions
 

content/docs/iac/guides/building-extending/packages/publishing-packages.md

@@ -80,7 +80,7 @@ If you don't need the full customization of a published package — you just wan
 Popular Terraform providers also surface in the public Pulumi Registry as **dynamically-bridged** listings (for example, [Honeycomb](/registry/packages/honeycombio/) and [Supabase](/registry/packages/supabase/)); consumers still generate the SDK locally with `pulumi package add`. The rest of this guide covers authoring and publishing a full package; if the Any Terraform Provider path fits your needs, follow that guide instead.
 
 {{% notes type="info" %}}
-Registry listings for dynamically-bridged Terraform providers are generated automatically and don't include a logo by default. To have a logo added to your provider's Registry page, reach out to [Pulumi support](https://support.pulumi.com/) with a link to a web-accessible SVG (wordmarks preferred, with all surrounding whitespace removed).
+Registry listings for dynamically-bridged Terraform providers are generated automatically and don't include a logo by default. To have a logo added to your provider's Registry page, reach out to [Pulumi support](https://pulumi.com/support/new/) with a link to a web-accessible SVG (wordmarks preferred, with all surrounding whitespace removed).
 {{% /notes %}}
 
 ## Author your resources or components

content/docs/iac/operations/stack-management/restoring-deleted-stacks.md

@@ -27,7 +27,7 @@ If the stack was deleted with `pulumi stack rm --force` while resources still ex
 
 - Only the **last 25 deleted stacks** in an organization are available for self-service restore.
 - Only **organization administrators** can restore stacks.
-- If you need to restore an older stack that is no longer in the list, [contact Pulumi support](https://support.pulumi.com/).
+- If you need to restore an older stack that is no longer in the list, [contact Pulumi support](https://pulumi.com/support/new/).
 
 ## Restore a stack
 

content/extend-trial/_index.md

@@ -41,7 +41,7 @@ help_links:
         - label: Talk to sales about pricing
           url: /contact/
         - label: Open a support ticket
-          url: https://support.pulumi.com/
+          url: https://pulumi.com/support/new/
         - label: Ask the community on Slack
           url: https://slack.pulumi.com/
 ---

content/support/_index.md

@@ -1,4 +1,4 @@
 ---
-redirect_to: "https://support.pulumi.com/"
+redirect_to: "https://pulumi.com/support/new/"
 block_external_search_index: true
 ---

content/support/new/_index.md

@@ -0,0 +1,68 @@
+---
+title: Submit a Support Request
+meta_desc: Open a support request with the Pulumi support team. Tell us what you're running into and we'll get back to you by email.
+type: page
+layout: support-new
+# Transactional form page. Keep it out of search until the Intercom cutover
+# makes it the canonical support entry point.
+block_external_search_index: true
+
+overview:
+    eyebrow: Pulumi support
+    title: Submit a request
+    description: Tell us what you're running into and the Pulumi support team will get back to you by email. Fields marked with an asterisk (*) are required.
+
+form:
+    fields:
+        email:
+            label: Your email address
+        name:
+            label: Full name
+        organization:
+            label: Pulumi organization name
+            help: https://app.pulumi.com/PULUMI_ORG_NAME
+        priority:
+            label: Priority
+            options:
+                - label: Normal
+                  value: normal
+                - label: Urgent
+                  value: urgent
+        subject:
+            label: Subject
+        description:
+            label: Description
+            help: Please enter the details of your request. It always helps to include code snippets, current behavior, and expected behavior when encountering issues. Markdown is welcome.
+    submit: Submit
+    submitting: Submitting…
+    error_banner: We couldn't send your request just now. Your entries are saved in this browser tab — please try again in a moment, or open a ticket at https://pulumi.com/support/new/.
+
+confirmation:
+    title: Request received. We're on it.
+    description: Your request is with the Pulumi support team. Keep an eye on your inbox — replies come from Pulumi support by email.
+    recap:
+        - label: Organization
+          field: organization
+        - label: Subject
+          field: subject
+    steps:
+        - title: Now.
+          description: Your request has been logged with the Pulumi support team.
+        - title: Next.
+          description: A support engineer reviews it and replies by email, usually within one business day.
+        - title: Then.
+          description: You work the issue together over email. If we need files or more detail, we'll ask there.
+
+help_links:
+    title: Need something else?
+    description: "If this isn't a support request, these get you there faster:"
+    links:
+        - label: Ask the community on Slack
+          url: https://slack.pulumi.com/
+        - label: Browse the documentation
+          url: /docs/
+        - label: Check Pulumi service status
+          url: https://status.pulumi.com/
+        - label: Talk to sales
+          url: /contact/
+---

data/footer.yml

@@ -120,7 +120,7 @@ columns:
         href: https://slack.pulumi.com/
         track: footer-help-slack
       - label: Customer support
-        href: https://support.pulumi.com/
+        href: https://pulumi.com/support/new/
         track: footer-support
       - label: Professional services
         href: /proserv/

infrastructure/Pulumi.meggy.yaml

@@ -0,0 +1,5 @@
+config:
+  www.pulumi.com:intercomTicketTypeId: "4573798"
+  www.pulumi.com:intercomApiKey:
+    secure: AAABAA7KQr1JJ9TWlatqOiROnh8sF6s+AouoBkZeUfqg22GlQ9wut4oQZr2BSC5HyY/LS1npuORxPBaKW85gzRePhX6N4M7xYQ/eqgOWRy/hQk/NDZbdC0qRytc=
+  www.pulumi.com:enableSupportForm: "true"

infrastructure/Pulumi.www-production.yaml

@@ -18,3 +18,4 @@ config:
   www.pulumi.com:enableWaf: "true"
   www.pulumi.com:wafRateLimit: "500"
   www.pulumi.com:enableDataWarehouseAccess: "true"
+  www.pulumi.com:enableSupportForm: "true"

infrastructure/Pulumi.www-testing.yaml

@@ -3,6 +3,7 @@ config:
   www.pulumi.com:addSecurityHeaders: "true"
   www.pulumi.com:certificateArn: "arn:aws:acm:us-east-1:571684982431:certificate/dacf95ab-d4dd-4370-9c93-6ce0b9dda7c0"
   www.pulumi.com:doEdgeRedirects: "true"
+  www.pulumi.com:enableSupportForm: "true"
   www.pulumi.com:hostedZone: www.pulumi-test.io
   www.pulumi.com:makeFallbackBucket: "false"
   www.pulumi.com:pathToOriginBucketMetadata: ../origin-bucket-metadata.json