fix(infra): fix the remaining terraform constant changes #331

bassrock · 2024-03-22T14:32:34Z

Goal

Cleanup some remaining infrastructure things.

Move away from pocket-ci to a real Github App Bot (allows us to filter out Bot comments/etc) (all future comments will be by it)
Fix shared lists event rule
Fix dynamodb changing the global secondary index (No method to ignore changes in DynamoDB GSI hashicorp/terraform-provider-aws#671)

bassrock · 2024-03-22T14:32:47Z

fix(infra): fix the remaining terraform constant changes #331 👈
fix(lambda): making lambda ignore git_sha changes #329
main

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @bassrock and the rest of your teammates on Graphite

pocket-ci · 2024-03-22T14:37:21Z

Plan Result (account-delete-monitor-cdk)

CI link

No changes. Your infrastructure matches the configuration.

pocket-ci · 2024-03-22T14:37:22Z

Plan Result (sendgrid-data-cdk)

CI link

No changes. Your infrastructure matches the configuration.

pocket-ci · 2024-03-22T14:39:22Z

Plan Result (account-data-deleter-cdk)

CI link

No changes. Your infrastructure matches the configuration.

pocket-ci · 2024-03-22T14:39:28Z

Plan Result (transactional-emails-cdk)

CI link

No changes. Your infrastructure matches the configuration.

pocket-ci · 2024-03-22T14:39:29Z

Plan Result (pocket-event-bridge-cdk)

CI link

⚠️ Resource Deletion will happen ⚠️

This plan contains resource delete operation. Please check the plan result very carefully!

Plan: 1 to add, 1 to change, 1 to destroy.

Create
- aws_cloudwatch_metric_alarm.shareable-list-item-events_shareablelistitemevents-rule-dlq-alarm_0C71CDFB
Update
- aws_cloudwatch_metric_alarm.shareable-list-events_shareablelistevents-rule-dlq-alarm_FBCFA70C
Delete
- aws_cloudwatch_metric_alarm.shareable-list-item-events_shareablelistevents-rule-dlq-alarm_2CE4E6A3

Change Result (Click me)

  # aws_cloudwatch_metric_alarm.shareable-list-events_shareablelistevents-rule-dlq-alarm_FBCFA70C will be updated in-place
  ~ resource "aws_cloudwatch_metric_alarm" "shareable-list-events_shareablelistevents-rule-dlq-alarm_FBCFA70C" {
      ~ dimensions                = {
          ~ "QueueName" = "PocketEventBridge-Prod-SNS-ShareableListItemEvents-Topic-DLQ" -> "PocketEventBridge-Prod-SNS-ShareableListEvents-Topic-DLQ"
        }
        id                        = "PocketEventBridge-Prod-ShareableListEvents-Rule-dlq-alarm"
        tags                      = {}
        # (17 unchanged attributes hidden)
    }

  # aws_cloudwatch_metric_alarm.shareable-list-item-events_shareablelistevents-rule-dlq-alarm_2CE4E6A3 will be destroyed
  # (because aws_cloudwatch_metric_alarm.shareable-list-item-events_shareablelistevents-rule-dlq-alarm_2CE4E6A3 is not in configuration)
  - resource "aws_cloudwatch_metric_alarm" "shareable-list-item-events_shareablelistevents-rule-dlq-alarm_2CE4E6A3" {
      - actions_enabled           = true -> null
      - alarm_actions             = [
          - "arn:aws:sns:us-east-1:996905175585:PocketEventBridge-Prod-Infrastructure-Alarm-Non-Critical",
        ] -> null
      - alarm_description         = "Number of messages >= 10" -> null
      - alarm_name                = "PocketEventBridge-Prod-ShareableListEvents-Rule-dlq-alarm" -> null
      - arn                       = "arn:aws:cloudwatch:us-east-1:996905175585:alarm:PocketEventBridge-Prod-ShareableListEvents-Rule-dlq-alarm" -> null
      - comparison_operator       = "GreaterThanOrEqualToThreshold" -> null
      - datapoints_to_alarm       = 0 -> null
      - dimensions                = {
          - "QueueName" = "PocketEventBridge-Prod-SNS-ShareableListItemEvents-Topic-DLQ"
        } -> null
      - evaluation_periods        = 4 -> null
      - id                        = "PocketEventBridge-Prod-ShareableListEvents-Rule-dlq-alarm" -> null
      - insufficient_data_actions = [] -> null
      - metric_name               = "ApproximateNumberOfMessagesVisible" -> null
      - namespace                 = "AWS/SQS" -> null
      - ok_actions                = [
          - "arn:aws:sns:us-east-1:996905175585:PocketEventBridge-Prod-Infrastructure-Alarm-Non-Critical",
        ] -> null
      - period                    = 300 -> null
      - statistic                 = "Sum" -> null
      - tags                      = {} -> null
      - tags_all                  = {
          - "environment" = "Prod"
          - "service"     = "PocketEventBridge"
        } -> null
      - threshold                 = 10 -> null
      - treat_missing_data        = "missing" -> null
    }

  # aws_cloudwatch_metric_alarm.shareable-list-item-events_shareablelistitemevents-rule-dlq-alarm_0C71CDFB will be created
  + resource "aws_cloudwatch_metric_alarm" "shareable-list-item-events_shareablelistitemevents-rule-dlq-alarm_0C71CDFB" {
      + actions_enabled                       = true
      + alarm_actions                         = [
          + "arn:aws:sns:us-east-1:996905175585:PocketEventBridge-Prod-Infrastructure-Alarm-Non-Critical",
        ]
      + alarm_description                     = "Number of messages >= 10"
      + alarm_name                            = "PocketEventBridge-Prod-ShareableListItemEvents-Rule-dlq-alarm"
      + arn                                   = (known after apply)
      + comparison_operator                   = "GreaterThanOrEqualToThreshold"
      + dimensions                            = {
          + "QueueName" = "PocketEventBridge-Prod-SNS-ShareableListItemEvents-Topic-DLQ"
        }
      + evaluate_low_sample_count_percentiles = (known after apply)
      + evaluation_periods                    = 4
      + id                                    = (known after apply)
      + metric_name                           = "ApproximateNumberOfMessagesVisible"
      + namespace                             = "AWS/SQS"
      + ok_actions                            = [
          + "arn:aws:sns:us-east-1:996905175585:PocketEventBridge-Prod-Infrastructure-Alarm-Non-Critical",
        ]
      + period                                = 300
      + statistic                             = "Sum"
      + tags_all                              = {
          + "environment" = "Prod"
          + "service"     = "PocketEventBridge"
        }
      + threshold                             = 10
      + treat_missing_data                    = "missing"
    }

Plan: 1 to add, 1 to change, 1 to destroy.

pocket-ci · 2024-03-22T14:41:43Z

Plan Result (shareable-lists-api-cdk)

CI link

No changes. Your infrastructure matches the configuration.

pocket-ci · 2024-03-22T14:43:18Z

Plan Result (fxa-webhook-proxy-cdk)

CI link

No changes. Your infrastructure matches the configuration.

pocket-ci · 2024-03-22T14:43:37Z

Plan Result (annotations-api-cdk)

CI link

No changes. Your infrastructure matches the configuration.

bassrock · 2024-03-22T16:34:54Z

.circleci/common.yml

+      - run:
+          name: Get Github Bot Token
+          command: |
+            app_id=$GITHUB_APP_ID


Sadly I couldn't find an orb to do this for us. But this script will take the Github Bot secrets and convert it to a regular access token like we already use, valid for 10 min.

i wish CircleCI let us ask for a github access token like Github Actions do, then this wouldnt be necessary 🤷‍♂️

Cool, we can make this an orb of our own later?

bassrock · 2024-03-22T16:35:23Z

...ocket-event-bridge/src/event-rules/shareable-lists-api-events/shareableListItemEventRules.ts

@@ -52,7 +52,7 @@ export class ShareableListItemEvents extends Construct {
      this,
      pagerDuty,
      this.snsTopicDlq.name,
-      `${eventConfig.shareableList.name}-Rule-dlq-alarm`,
+      `${eventConfig.shareableListItem.name}-Rule-dlq-alarm`,


type was causing the rule to keep changing nams cause one already existed with that name

bassrock · 2024-03-22T16:35:41Z

infrastructure/annotations-api/src/dynamodb.ts

@@ -49,6 +49,16 @@ export class DynamoDB extends Construct {
          },
        ],
      },
+      lifecycle: {
+        ignoreChanges: [
+          // Bug in terraform with DynamoDB and global secondary indexes


😮‍💨

from 2017? yikes

I linked it in the PR description so that it gets cross-referenced by gh

github-actions · 2024-03-22T17:55:35Z

🎉 This PR is included in version @pocket-tools/terraform-modules-v5.9.6 🎉

The release is available on:

Your semantic-release bot 📦🚀

bassrock added 11 commits March 21, 2024 12:50

fix(lambda): making lambda ignore git_sha changes

63ab645

fix(lambda): rotate env vars

5f06c12

fix(lambda): ignore git_sha

df75eb8

fix(formatting): updating format and tests

acbc063

Merge branch 'main' into fixup/lambda-deploys

3ca448e

fix(gateway): making gateway not always redeploy

815dcef

fix(wait): adding in a wait command

776b7c2

fix(tfcmt): adding a custom tfcmt

b9c9be2

fix(variables): cleaning up environment variables

6315a16

fix(tfcmt): turning off tfcmt applies

0de68a2

fix(shared-lists): making shared lists not recreate alarms

91abaa5

pocket-ci added the account-delete-monitor-cdk/add-or-update label Mar 22, 2024

pocket-ci added the sendgrid-data-cdk/destroy label Mar 22, 2024

bassrock changed the title ~~fix(shared-lists): making shared lists not recreate alarms~~ fix(infra): fix the remaining terraform constant changes Mar 22, 2024

pocket-ci added the account-data-deleter-cdk/add-or-update label Mar 22, 2024

pocket-ci added the transactional-emails-cdk/add-or-update label Mar 22, 2024

pocket-ci added the pocket-event-bridge-cdk/destroy label Mar 22, 2024

pocket-ci added shareable-lists-api-cdk/add-or-update fxa-webhook-proxy-cdk/destroy labels Mar 22, 2024

pocket-ci added the annotations-api-cdk/add-or-update label Mar 22, 2024

bassrock force-pushed the 03-22-remaining_infra_changes branch from 5629b20 to 8e4612c Compare March 22, 2024 15:17

bassrock force-pushed the 03-22-remaining_infra_changes branch from 8e4612c to c403588 Compare March 22, 2024 15:37

fix(bot): moving to a github bot

f8b5a75

bassrock force-pushed the 03-22-remaining_infra_changes branch from c403588 to f8b5a75 Compare March 22, 2024 15:49

bassrock added 2 commits March 22, 2024 09:14

fix(dynamodb): ignoring global secondary index changes

635b66f

fix(shareable-lists): fixing typo in shareable list name

beefb25

bassrock marked this pull request as ready for review March 22, 2024 16:27

bassrock requested a review from a team as a code owner March 22, 2024 16:27

bassrock requested review from marcin-kozinski and removed request for a team March 22, 2024 16:27

bassrock commented Mar 22, 2024

View reviewed changes

Base automatically changed from fixup/lambda-deploys to main March 22, 2024 17:27

Merge branch 'main' into 03-22-remaining_infra_changes

5c34139

kschelonka approved these changes Mar 22, 2024

View reviewed changes

pocket-github-bot bot removed account-delete-monitor-cdk/add-or-update transactional-emails-cdk/add-or-update sendgrid-data-cdk/destroy account-data-deleter-cdk/add-or-update shareable-lists-api-cdk/add-or-update fxa-webhook-proxy-cdk/destroy annotations-api-cdk/add-or-update labels Mar 22, 2024

bassrock merged commit 610d319 into main Mar 22, 2024
84 checks passed

bassrock deleted the 03-22-remaining_infra_changes branch March 22, 2024 17:50

github-actions bot added the released label Mar 22, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(infra): fix the remaining terraform constant changes #331

fix(infra): fix the remaining terraform constant changes #331

bassrock commented Mar 22, 2024 •

edited by kschelonka

Loading

bassrock commented Mar 22, 2024 •

edited

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

bassrock Mar 22, 2024

kschelonka Mar 22, 2024

bassrock Mar 22, 2024

bassrock Mar 22, 2024

kschelonka Mar 22, 2024

kschelonka Mar 22, 2024

github-actions bot commented Mar 22, 2024

fix(infra): fix the remaining terraform constant changes #331

fix(infra): fix the remaining terraform constant changes #331

Conversation

bassrock commented Mar 22, 2024 • edited by kschelonka Loading

Goal

bassrock commented Mar 22, 2024 • edited Loading

pocket-ci commented Mar 22, 2024 • edited by pocket-github-bot bot Loading

Plan Result (account-delete-monitor-cdk)

pocket-ci commented Mar 22, 2024 • edited by pocket-github-bot bot Loading

Plan Result (sendgrid-data-cdk)

pocket-ci commented Mar 22, 2024 • edited by pocket-github-bot bot Loading

Plan Result (account-data-deleter-cdk)

pocket-ci commented Mar 22, 2024 • edited by pocket-github-bot bot Loading

Plan Result (transactional-emails-cdk)

pocket-ci commented Mar 22, 2024 • edited by pocket-github-bot bot Loading

Plan Result (pocket-event-bridge-cdk)

⚠️ Resource Deletion will happen ⚠️

pocket-ci commented Mar 22, 2024 • edited by pocket-github-bot bot Loading

Plan Result (shareable-lists-api-cdk)

pocket-ci commented Mar 22, 2024 • edited by pocket-github-bot bot Loading

Plan Result (fxa-webhook-proxy-cdk)

pocket-ci commented Mar 22, 2024 • edited by pocket-github-bot bot Loading

Plan Result (annotations-api-cdk)

bassrock Mar 22, 2024

Choose a reason for hiding this comment

kschelonka Mar 22, 2024

Choose a reason for hiding this comment

bassrock Mar 22, 2024

Choose a reason for hiding this comment

bassrock Mar 22, 2024

Choose a reason for hiding this comment

kschelonka Mar 22, 2024

Choose a reason for hiding this comment

kschelonka Mar 22, 2024

Choose a reason for hiding this comment

github-actions bot commented Mar 22, 2024

bassrock commented Mar 22, 2024 •

edited by kschelonka

Loading

bassrock commented Mar 22, 2024 •

edited

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading

pocket-ci commented Mar 22, 2024 •

edited by pocket-github-bot bot

Loading