Added azure blob and http

Author: otterobert

build/newsletter.Dockerfile

@@ -15,7 +15,7 @@ FROM node:21
 WORKDIR /app
 
 # Copy the certificates from the certs stage
-COPY --from=certs /app .
+# COPY --from=certs /app .
 
 # Download and install dependencies
 COPY services/newsletter/package*.json ./

helm/values.yaml

@@ -87,4 +87,4 @@ services:
       USERS_SERVICE_API: https://users-service:7001
       PRODUCTS_SERVICE_API: https://products-service:7002
       CHECKOUT_SERVICE_API: https://checkout-service:7005
-      NEWSLETTER_SERVICE_API: https://newsletter-service:7003
+      NEWSLETTER_SERVICE_API: http://newsletter-service:7003

services/frontend/routes/newsletter.py

@@ -4,7 +4,7 @@
 from fastapi.responses import HTMLResponse
 from fastapi.templating import Jinja2Templates
 
-NEWSLETTER_SERVICE_API = os.environ.get('NEWSLETTER_SERVICE_API') or 'https://localhost:7003'
+NEWSLETTER_SERVICE_API = os.environ.get('NEWSLETTER_SERVICE_API') or 'http://localhost:7003'
 router = APIRouter()
 
 templates = Jinja2Templates(directory="templates")

services/newsletter/index.js

@@ -60,29 +60,28 @@ app.post('/subscribe', async (req, res) => {
   try {
     // Create a new subscriber in the database
     await Subscriber.create({ email });
-
-    // Mock sending email
-    await fetch(`https://otterize.com`,{
-      method: 'POST',
-      body: JSON.stringify({ email }),
-      headers: {'Content-Type': 'application/json'}
-    });
-
-    return res.status(201).json({ message: 'Subscribed successfully' });
   } catch (error) {
-    if (error.name === 'SequelizeUniqueConstraintError') {
-      return res.status(201).json({ message: 'Subscribed successfully' });
+    if (error.name !== 'SequelizeUniqueConstraintError') {
+      console.log(error)
+      return res.status(500).json({ error: 'Failed to subscribe' });
     }
-
-    console.log(error)
-    return res.status(500).json({ error: 'Failed to subscribe' });
   }
+
+  console.log(`Sending welcome email to ${email}`);
+
+  // Mock sending email - over HTTP
+  await fetch(`http://example.com`,{
+    method: 'POST',
+    body: JSON.stringify({ email }),
+    headers: {'Content-Type': 'application/json'}
+  });
+
+  return res.status(201).json({ message: 'Subscribed successfully' });
 });
 
 // Certificate paths
 const certPath = path.join(__dirname, 'server.crt');
 const keyPath = path.join(__dirname, 'server.key');
-console.log(certPath);
 
 // Start the server
 if (fs.existsSync(certPath) && fs.existsSync(keyPath)) {

services/products/go.mod

@@ -3,13 +3,16 @@ module otterize.com/microservices/products
 go 1.23.1
 
 require (
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.5.0
+	github.com/aws/aws-sdk-go-v2 v1.32.2
 	github.com/aws/aws-sdk-go-v2/config v1.28.0
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.66.0
 	github.com/gorilla/mux v1.8.1
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.32.2 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.41 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17 // indirect
@@ -25,4 +28,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.32.2 // indirect
 	github.com/aws/smithy-go v1.22.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 )

services/products/main.go

@@ -16,6 +16,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
 	"github.com/aws/aws-sdk-go-v2/config"
 )
 
@@ -42,33 +43,53 @@ func getEnv(key, fallback string) string {
 	return fallback
 }
 
+func readAzureBlob(client *azblob.Client) ([]byte, error) {
+	log.Printf("Loading products from Azure container: %s\n", BucketName)
+
+	// Download the blob content
+	resp, err := client.DownloadStream(context.TODO(), BucketName, ObjectKey, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to download blob: %w", err)
+	}
+	defer resp.Body.Close()
+
+	return ioutil.ReadAll(resp.Body)
+}
+
+func readS3Object(client *s3.Client) ([]byte, error) {
+	log.Printf("Loading products from S3 bucket: %s\n", BucketName)
+
+	input := &s3.GetObjectInput{
+		Bucket: aws.String(BucketName),
+		Key:    aws.String(ObjectKey),
+	}
+
+	result, err := client.GetObject(context.TODO(), input)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to get object from S3: %v\n", err)
+	}
+	defer result.Body.Close()
+
+	return ioutil.ReadAll(result.Body)
+}
+
 // Load products from the JSON file
-func loadProducts(client *s3.Client) {
+func loadProducts(s3Client *s3.Client, blobClient *azblob.Client) {
 	mu.Lock()
 	defer mu.Unlock()
 
 	var data []byte
 	var err error
 
 	if BucketEnabled == "true" {
-		log.Printf("Loading products from S3 bucket: %s\n", BucketName)
-
-		input := &s3.GetObjectInput{
-			Bucket: aws.String(BucketName),
-			Key:    aws.String(ObjectKey),
-		}
-
-		result, err := client.GetObject(context.TODO(), input)
+		data, err = readS3Object(s3Client)
 		if err != nil {
-			log.Printf("Failed to get object from S3: %v\n", err)
-			return
+			log.Fatalf("Failed to read aws products.json: %v", err)
 		}
-		defer result.Body.Close()
 
-		data, err = ioutil.ReadAll(result.Body)
+		data, err = readAzureBlob(blobClient)
 		if err != nil {
-			log.Printf("Failed to read S3 object body: %v\n", err)
-			return
+			log.Fatalf("Failed to read azure products.json: %v", err)
 		}
 	} else {
 		log.Printf("Loading products from filesystem: %s\n", ObjectKey)
@@ -84,12 +105,12 @@ func loadProducts(client *s3.Client) {
 	}
 }
 
-func reloadProductData(client *s3.Client) {
+func reloadProductData(client *s3.Client, blobClient *azblob.Client) {
 	ticker := time.NewTicker(10 * time.Second)
 	defer ticker.Stop()
 
 	for range ticker.C {
-		loadProducts(client)
+		loadProducts(client, blobClient)
 	}
 }
 
@@ -133,9 +154,15 @@ func main() {
 	}
 	s3Client := s3.NewFromConfig(cfg)
 
+	// Initialize Azure SDK for Blob Storage
+	blobClient, err := azblob.NewClientWithNoCredential("https://ottersidestorage.blob.core.windows.net", nil)
+	if err != nil {
+		log.Fatalf("Unable to load AWS SDK config: %v", err)
+	}
+
 	// Load products
-	loadProducts(s3Client)
-	go reloadProductData(s3Client)
+	loadProducts(s3Client, blobClient)
+	go reloadProductData(s3Client, blobClient)
 
 	// Set up the router
 	r := mux.NewRouter()