merge: main -> mntor-4968

Author: flozia

.env

@@ -64,9 +64,6 @@ ONEREP_API_BASE=https://mozilla.api.onerep.com
 ONEREP_API_KEY=
 ONEREP_WEBHOOK_SECRET="unsafe-default-secret-for-dev"
 
-# Moscary API
-MOSCARY_API_BASE=http://localhost:8001
-
 # Firefox Remote Settings
 FX_REMOTE_SETTINGS_WRITER_SERVER=https://settings-writer.prod.mozaws.net/v1
 FX_REMOTE_SETTINGS_WRITER_USER=

.env.local.example

@@ -12,9 +12,6 @@ HIBP_NOTIFY_TOKEN=
 ONEREP_API_KEY=
 ONEREP_WEBHOOK_SECRET=
 
-# Moscary setup
-MOSCARY_API_BEARER_TOKEN=
-
 # Used for `npm run create-location-data`
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
@@ -49,9 +46,6 @@ SUBSCRIPTION_BILLING_AMOUNT_BUNDLE_MONTHLY_US=42
 # HIBP setup
 HIBP_KANON_API_ROOT=https://enterprise.stage-api.haveibeenpwned.com
 
-# Moscary setup
-MOSCARY_API_BASE=http://localhost:8001
-
 # Sentry setup
 SENTRY_DSN=https://[email protected]/4504612374052864
 NEXT_PUBLIC_SENTRY_DSN=https://[email protected]/4504612374052864

.github/workflows/production_deploy.yml

@@ -18,6 +18,7 @@ on:
         description: 'The original image tag that has been deployed'
         required: true
         type: string
+        pattern: '^[a-f0-9]{7,12}$'
 jobs:
   pull_retag_push:
     name: Pull, Retag, and Push Images
@@ -31,6 +32,7 @@ jobs:
       GAR_IMAGE_BASE: ${{ vars.GAR_REPO }}/${{ github.event.repository.name }}
       GAR_REGISTRY: us-docker.pkg.dev # Define GAR registry hostname
       DOCKERHUB_IMAGE: mozilla/blurts-server # Define Docker Hub image name
+      SAFE_IMAGE_TAG: ${{ inputs.originalImageTag }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v5
@@ -60,19 +62,19 @@ jobs:
           password: ${{ steps.gcp-auth.outputs.access_token }}
 
       - name: Pull Docker Hub image
-        run: docker pull ${{ env.DOCKERHUB_IMAGE }}:${{ inputs.originalImageTag }}
+        run: docker pull "${{ env.DOCKERHUB_IMAGE }}:${{ env.SAFE_IMAGE_TAG }}"
 
       - name: Retag Docker Hub image
-        run: docker tag ${{ env.DOCKERHUB_IMAGE }}:${{ inputs.originalImageTag }} ${{ env.DOCKERHUB_IMAGE }}:${{ inputs.environment }}-${{ inputs.originalImageTag }}
+        run: docker tag "${{ env.DOCKERHUB_IMAGE }}:${{ env.SAFE_IMAGE_TAG }}" "${{ env.DOCKERHUB_IMAGE }}:${{ inputs.environment }}-${{ env.SAFE_IMAGE_TAG }}"
 
       - name: Push Docker Hub image
-        run: docker push ${{ env.DOCKERHUB_IMAGE }}:${{ inputs.environment }}-${{ inputs.originalImageTag }}
+        run: docker push "${{ env.DOCKERHUB_IMAGE }}:${{ inputs.environment }}-${{ env.SAFE_IMAGE_TAG }}"
 
       - name: Pull GAR image
-        run: docker pull ${{ env.GAR_IMAGE_BASE }}:${{ inputs.originalImageTag }}
+        run: docker pull "${{ env.GAR_IMAGE_BASE }}:${{ env.SAFE_IMAGE_TAG }}"
 
       - name: Retag GAR image
-        run: docker tag ${{ env.GAR_IMAGE_BASE }}:${{ inputs.originalImageTag }} ${{ env.GAR_IMAGE_BASE }}:${{ inputs.environment }}-${{ inputs.originalImageTag }}
+        run: docker tag "${{ env.GAR_IMAGE_BASE }}:${{ env.SAFE_IMAGE_TAG }}" "${{ env.GAR_IMAGE_BASE }}:${{ inputs.environment }}-${{ env.SAFE_IMAGE_TAG }}"
 
       - name: Push GAR image
-        run: docker push ${{ env.GAR_IMAGE_BASE }}:${{ inputs.environment }}-${{ inputs.originalImageTag }}
+        run: docker push "${{ env.GAR_IMAGE_BASE }}:${{ inputs.environment }}-${{ env.SAFE_IMAGE_TAG }}"

.storybook/preview.tsx

@@ -7,6 +7,7 @@ import { Inter } from "next/font/google";
 import type { Preview } from "@storybook/nextjs";
 import { action } from "storybook/actions";
 import { linkTo } from "@storybook/addon-links";
+import { sb } from "storybook/test";
 import "../src/app/globals.css";
 import { metropolis } from "../src/app/fonts/Metropolis/metropolis";
 import { TestComponentWrapper } from "../src/TestComponentWrapper";
@@ -27,6 +28,8 @@ const AppDecorator: Preview["decorators"] = (storyFn) => {
   return <TestComponentWrapper>{storyFn()}</TestComponentWrapper>;
 };
 
+sb.mock("../src/app/hooks/locationSuggestions.ts");
+
 // Arguments to the `storySort` callback, left as documentation.
 type _SortData = {
   type: "story";

config/nimbus.yaml

@@ -146,20 +146,6 @@ features:
           "enabled": false,
           "variant": default,
         }
-  moscary:
-    description: Use the Moscary API
-    variables:
-      enabled:
-        description: If the feature is enabled
-        type: Boolean
-        default: false
-    defaults:
-      - channel: local
-        value: { "enabled": true }
-      - channel: staging
-        value: { "enabled": false }
-      - channel: production
-        value: { "enabled": false }
 enums:
   OptionalBrokerScanInfoFields:
     description: An enum of optional broker scan info fields

functional-tests/tests/onboarding.spec.ts

@@ -51,12 +51,6 @@ email-first-broker-removal-fixed-cta-label = View dashboard
 
 ## Redesigned breach alert email
 
-email-breach-alert-plus-scan-banner-heading = { -brand-monitor } now protects you even more
-email-breach-alert-plus-scan-banner-content = We can find your personal info on data broker sites that sell it for a profit.
-email-breach-alert-plus-scan-banner-cta-label = Get first scan free
-email-breach-alert-plus-upgrade-banner-heading = Upgrade for extra protection
-email-breach-alert-plus-upgrade-banner-content = { -brand-monitor-plus } can find and remove your phone number, home address, and other personal info from online databases.
-email-breach-alert-plus-upgrade-banner-cta-label = Get { -brand-monitor-plus }
 email-breach-alert-plus-scan-results-heading = Current exposures
 # Variables:
 #   $data_point_count (number) - The number of data exposures that were exposed