Repo cleanup (#65)

* Create add_subscriber binary

* Remove unused code

* Delete unused method

Author: samshadwell

Cargo.lock

@@ -15,16 +15,15 @@ name = "hndigest-api"
 path = "src/bin/api.rs"
 
 [[bin]]
-name = "migrate-tokens"
-path = "src/bin/migrate_tokens.rs"
+name = "add-subscriber"
+path = "src/bin/add_subscriber.rs"
 
 [dependencies]
 anyhow = "1.0"
 askama = "0.15"
 aws-config = { version = "1.1.7", features = ["rustls"] }
 aws-sdk-dynamodb = "1.16.0"
 aws-sdk-sesv2 = "1.14.0"
-aws_lambda_events = { version = "0.15", default-features = false, features = ["apigw"] }
 chrono = { version = "0.4", features = ["serde"] }
 futures = "0.3"
 lambda_http = "1.0.2"

Cargo.toml

@@ -1,99 +1,4 @@
-# Production outputs
-output "lambda_function_name" {
-  description = "Name of the production Lambda function"
-  value       = aws_lambda_function.hndigest["prod"].function_name
-}
-
-output "lambda_function_arn" {
-  description = "ARN of the production Lambda function"
-  value       = aws_lambda_function.hndigest["prod"].arn
-}
-
-output "dynamodb_table_name" {
-  description = "Name of the production DynamoDB table"
-  value       = aws_dynamodb_table.hndigest["prod"].name
-}
-
-output "dynamodb_table_arn" {
-  description = "ARN of the production DynamoDB table"
-  value       = aws_dynamodb_table.hndigest["prod"].arn
-}
-
-output "eventbridge_rule_arn" {
-  description = "ARN of the EventBridge rule"
-  value       = aws_cloudwatch_event_rule.daily_digest["prod"].arn
-}
-
 output "github_actions_role_arn" {
   description = "ARN of the IAM role for GitHub Actions"
   value       = aws_iam_role.github_actions.arn
 }
-
-# Staging outputs
-output "staging_lambda_function_name" {
-  description = "Name of the staging Lambda function"
-  value       = local.create_staging ? aws_lambda_function.hndigest["staging"].function_name : null
-}
-
-output "staging_lambda_function_arn" {
-  description = "ARN of the staging Lambda function"
-  value       = local.create_staging ? aws_lambda_function.hndigest["staging"].arn : null
-}
-
-output "staging_dynamodb_table_name" {
-  description = "Name of the staging DynamoDB table"
-  value       = local.create_staging ? aws_dynamodb_table.hndigest["staging"].name : null
-}
-
-# Landing page outputs
-output "landing_page_cloudfront_domain" {
-  description = "CloudFront distribution domain name for the landing page"
-  value       = aws_cloudfront_distribution.landing_page["prod"].domain_name
-}
-
-output "landing_page_cloudfront_hosted_zone_id" {
-  description = "CloudFront distribution hosted zone ID (for Route53 alias records)"
-  value       = aws_cloudfront_distribution.landing_page["prod"].hosted_zone_id
-}
-
-output "staging_landing_page_cloudfront_domain" {
-  description = "CloudFront distribution domain name for staging"
-  value       = local.create_staging ? aws_cloudfront_distribution.landing_page["staging"].domain_name : null
-}
-
-output "staging_landing_page_cloudfront_hosted_zone_id" {
-  description = "CloudFront distribution hosted zone ID for staging (for Route53 alias records)"
-  value       = local.create_staging ? aws_cloudfront_distribution.landing_page["staging"].hosted_zone_id : null
-}
-
-output "landing_page_s3_bucket" {
-  description = "S3 bucket name for the landing page"
-  value       = aws_s3_bucket.landing_page.id
-}
-
-output "acm_certificate_validation_records" {
-  description = "DNS records needed for ACM certificate validation"
-  value = {
-    for dvo in aws_acm_certificate.landing_page.domain_validation_options : dvo.domain_name => {
-      name  = dvo.resource_record_name
-      type  = dvo.resource_record_type
-      value = dvo.resource_record_value
-    }
-  }
-}
-
-# API Gateway outputs
-output "api_gateway_url" {
-  description = "API Gateway endpoint URL (production) - used internally by CloudFront"
-  value       = aws_apigatewayv2_api.hndigest["prod"].api_endpoint
-}
-
-output "api_lambda_function_name" {
-  description = "Name of the API Lambda function (production)"
-  value       = aws_lambda_function.hndigest_api["prod"].function_name
-}
-
-output "staging_api_lambda_function_name" {
-  description = "Name of the staging API Lambda function"
-  value       = local.create_staging ? aws_lambda_function.hndigest_api["staging"].function_name : null
-}

infrastructure/outputs.tf

@@ -0,0 +1,47 @@
+use anyhow::{Context, Result};
+use aws_config::BehaviorVersion;
+use chrono::Utc;
+use hndigest::storage_adapter::StorageAdapter;
+use hndigest::strategies::DigestStrategy;
+use hndigest::types::Subscriber;
+use std::env;
+use std::str::FromStr;
+use std::sync::Arc;
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    let args: Vec<String> = env::args().collect();
+    if args.len() < 2 {
+        eprintln!("Usage: cargo run --bin add-subscriber <email> [strategy]");
+        eprintln!(
+            "Example: DYNAMODB_TABLE=HNDigest-staging cargo run --bin add-subscriber test@example.com TOP_N#10"
+        );
+        std::process::exit(1);
+    }
+
+    let email = &args[1];
+    let strategy_str = if args.len() > 2 { &args[2] } else { "TOP_N#10" };
+
+    let strategy = DigestStrategy::from_str(strategy_str).context("Invalid strategy")?;
+
+    let dynamodb_table =
+        env::var("DYNAMODB_TABLE").context("DYNAMODB_TABLE environment variable must be set")?;
+
+    println!("Initializing DynamoDB client...");
+    let config = aws_config::load_defaults(BehaviorVersion::latest()).await;
+    let dynamodb_client = aws_sdk_dynamodb::Client::new(&config);
+    let storage_adapter = Arc::new(StorageAdapter::new(dynamodb_client, dynamodb_table));
+
+    println!("Creating verified subscriber for {}", email);
+    let mut subscriber = Subscriber::new(email.to_string(), strategy);
+    subscriber.verified_at = Some(Utc::now());
+
+    storage_adapter.set_subscriber(&subscriber).await?;
+
+    println!("Successfully added verified subscriber:");
+    println!("  Email: {}", subscriber.email);
+    println!("  Strategy: {}", subscriber.strategy);
+    println!("  Unsubscribe Token: {}", subscriber.unsubscribe_token);
+
+    Ok(())
+}

src/bin/add_subscriber.rs

@@ -116,25 +116,6 @@ impl StorageAdapter {
             .transpose()
     }
 
-    /// Get a single subscriber by email address.
-    /// Returns None if the subscriber doesn't exist.
-    pub async fn get_subscriber(&self, email: &str) -> Result<Option<Subscriber>> {
-        let output = self
-            .client
-            .get_item()
-            .table_name(&self.table_name)
-            .key(
-                "PK",
-                AttributeValue::S(SUBSCRIBER_PARTITION_KEY.to_string()),
-            )
-            .key("SK", AttributeValue::S(email.to_lowercase()))
-            .send()
-            .await
-            .context("Failed to get subscriber")?;
-
-        output.item.map(subscriber_from_item).transpose()
-    }
-
     /// Get a subscriber by their unsubscribe token.
     /// Returns None if no subscriber exists with this token.
     /// Fails if multiple subscribers have the same token (should never happen).
@@ -232,7 +213,7 @@ impl StorageAdapter {
             ),
             (
                 "unsubscribe_token".to_string(),
-                AttributeValue::S(subscriber.unsubscribe_token.clone()),
+                AttributeValue::S(subscriber.unsubscribe_token.to_string()),
             ),
         ]);
 
@@ -365,15 +346,11 @@ fn subscriber_from_item(item: HashMap<String, AttributeValue>) -> Result<Subscri
         .transpose()
         .context("Invalid verified_at timestamp")?;
 
-    // TODO: After running the migration script (migrate-tokens), remove this fallback.
-    // The unsubscribe_token field should be required, and deserialization should fail
-    // if it's missing. This auto-generation is only here for backwards compatibility
-    // during the migration period.
     let unsubscribe_token = item
         .get("unsubscribe_token")
         .and_then(|v| v.as_s().ok())
-        .cloned()
-        .unwrap_or_else(|| uuid::Uuid::new_v4().to_string());
+        .ok_or_else(|| anyhow::anyhow!("Missing unsubscribe_token field"))?
+        .clone();
 
     Ok(Subscriber {
         email,

src/bin/migrate_tokens.rs

@@ -20,7 +20,6 @@ pub struct Subscriber {
     pub strategy: DigestStrategy,
     pub subscribed_at: DateTime<Utc>,
     pub verified_at: Option<DateTime<Utc>>,
-    /// Unique token for unsubscribe links (UUID v4)
     pub unsubscribe_token: String,
 }
 
@@ -35,9 +34,4 @@ impl Subscriber {
             unsubscribe_token: uuid::Uuid::new_v4().to_string(),
         }
     }
-
-    /// Generate a new unsubscribe token for this subscriber.
-    pub fn regenerate_token(&mut self) {
-        self.unsubscribe_token = uuid::Uuid::new_v4().to_string();
-    }
 }