Refactor users service from go to python

aws/cloudformation-templates/base/_template.yaml

@@ -390,6 +390,10 @@ Outputs:
   ProductsTable:
     Description: DynamoDB Table for Products
     Value: !GetAtt Tables.Outputs.ProductsTable
+
+  UsersTable:
+    Description: DynamoDB Table for Users
+    Value: !GetAtt Tables.Outputs.UsersTable
 
   CategoriesTable:
     Description: DynamoDB Table for Categories

aws/cloudformation-templates/base/cloudfront.yaml

@@ -89,7 +89,10 @@ Resources:
     Type: AWS::CloudFront::OriginAccessControl
     Properties: 
       OriginAccessControlConfig:
-        Name: !Sub 'retaildemostore-${AWS::Region}'
+        Name: !Sub 
+        - 'retaildemostore-${Region}-${SafeStackId}'
+        - Region: !Ref 'AWS::Region'
+          SafeStackId: !Select [4, !Split ['-', !Ref 'AWS::StackId']]
         OriginAccessControlOriginType: s3
         SigningBehavior: always
         SigningProtocol: sigv4
@@ -101,7 +104,10 @@ Resources:
         DefaultTTL: 86400
         MaxTTL: 31536000
         MinTTL: 86400
-        Name: !Sub 'retaildemostore-${AWS::Region}'
+        Name: !Sub 
+        - 'retaildemostore-${Region}-${SafeStackId}'
+        - Region: !Ref 'AWS::Region'
+          SafeStackId: !Select [4, !Split ['-', !Ref 'AWS::StackId']]
         ParametersInCacheKeyAndForwardedToOrigin:
           CookiesConfig:
             CookieBehavior: none
@@ -119,7 +125,10 @@ Resources:
           CookieBehavior: none
         HeadersConfig: 
           HeaderBehavior: none
-        Name: !Sub 'retaildemostore-${AWS::Region}'
+        Name: !Sub 
+        - 'retaildemostore-${Region}-${SafeStackId}'
+        - Region: !Ref 'AWS::Region'
+          SafeStackId: !Select [4, !Split ['-', !Ref 'AWS::StackId']]
         QueryStringsConfig: 
           QueryStringBehavior: all
 

aws/cloudformation-templates/base/tables.yaml

@@ -5,6 +5,61 @@ Description: >
     This template deploys the Retail Demo Store DynamoDB Tables.
 
 Resources:
+  UsersTable:
+    Type: AWS::DynamoDB::Table
+    Properties:
+      AttributeDefinitions:
+        - AttributeName: "id"
+          AttributeType: "S"
+        - AttributeName: "username"
+          AttributeType: "S"
+        - AttributeName: "identity_id"
+          AttributeType: "S"
+        - AttributeName: "claimed_user"
+          AttributeType: "N"
+        - AttributeName: "age_range"
+          AttributeType: "S"
+        - AttributeName: "primary_persona"
+          AttributeType: "S"
+      KeySchema:
+        - AttributeName: "id"
+          KeyType: "HASH"
+      BillingMode: "PAY_PER_REQUEST"
+      GlobalSecondaryIndexes:
+        - IndexName: username-index
+          KeySchema:
+            - AttributeName: "username"
+              KeyType: "HASH"
+          Projection:
+            ProjectionType: ALL
+        - IndexName: identity_id-index
+          KeySchema:
+            - AttributeName: "identity_id"
+              KeyType: "HASH"
+          Projection:
+            ProjectionType: ALL
+        - IndexName: claimed-index
+          KeySchema:
+            - AttributeName: "claimed_user"
+              KeyType: "HASH"
+          Projection:
+            ProjectionType: ALL
+        - IndexName: age_range-index
+          KeySchema:
+            - AttributeName: "age_range"
+              KeyType: "HASH"
+            - AttributeName: "claimed_user"
+              KeyType: "RANGE"
+          Projection:
+            ProjectionType: ALL
+        - IndexName: primary_persona-index
+          KeySchema:
+            - AttributeName: "primary_persona"
+              KeyType: "HASH"
+            - AttributeName: "claimed_user"
+              KeyType: "RANGE"
+          Projection:
+            ProjectionType: ALL
 
   ProductsTable:
     Type: AWS::DynamoDB::Table
@@ -147,6 +202,10 @@ Outputs:
     Description: DynamoDB Table for Products
     Value: !Ref ProductsTable
 
+  UsersTable:
+    Description: DynamoDB Table for Users
+    Value: !Ref UsersTable
+
   CategoriesTable:
     Description: DynamoDB Table for Categories
     Value: !Ref CategoriesTable

aws/cloudformation-templates/deployment-support.yaml

@@ -100,6 +100,10 @@ Parameters:
   ProductsServiceExternalUrl:
     Type: String
 
+  UsersServiceExternalUrl:
+    Type: String
+    Default: none
+
   DeployPersonalizedOffersCampaign:
     Type: String
     Default: No
@@ -185,32 +189,127 @@ Resources:
           import logging
           import cfnresponse
           import os
+          import time
+
 
           logger = logging.getLogger()
           logger.setLevel(logging.INFO)
+          def is_service_ready(url):
+              try:
+                  request = Request(f"{url}/", method='GET')
+                  with urlopen(request) as response:
+                      return response.getcode() == 200
+              except URLError:
+                  return False
 
           def handler(event, context):
             response_data = {}
             response_status = cfnresponse.SUCCESS
 
             if event['RequestType'] in ['Create', 'Update']:     
               url = os.environ['ProductsServiceUrl']
-              request = Request(f"{url}/init", method='POST')
+              max_retries = 10
+              retry_delay = 30  # seconds
+
+              for attempt in range(max_retries):
+                    if is_service_ready(url):
+                        try:
+                            request = Request(f"{url}/init", method='POST')
+                            with urlopen(request) as response:
+                                logger.info(f"Product Service init method success: {response.read()}")
+                                break  # Success, exit the retry loop
+                        except URLError as e:
+                            logger.warning(f"Attempt {attempt + 1}: Error calling product service init: {e.code} : {e.reason}")
+                    else:
+                        logger.warning(f"Attempt {attempt + 1}: Product service not ready yet")
+
+                    if attempt < max_retries - 1:  # Don't sleep on the last attempt
+                        time.sleep(retry_delay)
+                    else:
+                        logger.error(f"Max retries reached. Product service init failed.")
+                        response_status = cfnresponse.FAILED
+                        response_data['Message'] = "Resource creation/update failed: Product service not ready or init failed"
+
+            cfnresponse.send(event, context, response_status, response_data)
+
+  UsersLoadDataLambdaFunction:
+    Type: AWS::Lambda::Function
+    Properties:
+      Description: 'Retail Demo Store deployment utility function that calls the users service init endpoint to load users  into DynamoDB tables'
+      Handler: index.handler
+      Role: !GetAtt LoadDataLambdaRole.Arn
+      Runtime: python3.12
+      MemorySize: 128
+      Timeout: 600
+      VpcConfig:
+        SecurityGroupIds:
+          - !Ref LambdaVpcSecurityGroup
+        SubnetIds:
+          - !Ref Subnet1
+          - !Ref Subnet2
+      Environment:
+        Variables:
+          UsersServiceUrl: !Ref UsersServiceExternalUrl
+      Code:
+        ZipFile: |
+          from urllib.request import Request, urlopen
+          from urllib.error import URLError
+          import logging
+          import cfnresponse
+          import os
+          import time
+
+          logger = logging.getLogger()
+          logger.setLevel(logging.INFO)
+          def is_service_ready(url):
               try:
-                with urlopen(request) as response:
-                  logger.info(f"Product Service init method success: {response.read()}")
-              except URLError as e:
-                logger.error(f"Error calling product service init: {e.code} : {e.reason}")
-                response_status = cfnresponse.FAILED
-                response_data['Message'] = f"Resource {event['RequestType']} failed: {e}"
-
+                  request = Request(f"{url}/health", method='GET')
+                  with urlopen(request) as response:
+                      return response.getcode() == 200
+              except URLError:
+                  return False
+
+
+          def handler(event, context):
+            response_data = {}
+            response_status = cfnresponse.SUCCESS
+
+            if event['RequestType'] in ['Create', 'Update']:     
+                url = os.environ['UsersServiceUrl']
+                max_retries = 10
+                retry_delay = 30  # seconds
+
+                for attempt in range(max_retries):
+                    if is_service_ready(url):
+                        try:
+                            request = Request(f"{url}/users/init", method='POST')
+                            with urlopen(request) as response:
+                                logger.info(f"User Service init method success: {response.read()}")
+                                break  # Success, exit the retry loop
+                        except URLError as e:
+                            logger.warning(f"Attempt {attempt + 1}: Error calling user service init: {e.code} : {e.reason}")
+                    else:
+                        logger.warning(f"Attempt {attempt + 1}: User service not ready yet")
+
+                    if attempt < max_retries - 1:  # Don't sleep on the last attempt
+                        time.sleep(retry_delay)
+                    else:
+                        logger.error(f"Max retries reached. User service init failed.")
+                        response_status = cfnresponse.FAILED
+                        response_data['Message'] = "Resource creation/update failed: User service not ready or init failed"
+
             cfnresponse.send(event, context, response_status, response_data)
-  
+
   CustomLoadDataProducts:
     Type: Custom::CustomLoadData
     Properties:
       ServiceToken: !GetAtt LoadDataLambdaFunction.Arn
 
+  CustomLoadDataUsers:
+    Type: Custom::CustomLoadData
+    Properties:
+      ServiceToken: !GetAtt UsersLoadDataLambdaFunction.Arn
+
   ####################### Pre-Create Personalize Resources #######################
 
   PersonalizePreCreateLambdaFunction:

aws/cloudformation-templates/services/_template.yaml

@@ -89,6 +89,10 @@ Parameters:
     Type: String
     Default: none
 
+  UsersTable:
+    Type: String
+    Default: none
+
   CategoriesTable:
     Type: String
     Default: none
@@ -207,6 +211,7 @@ Resources:
         ParameterPersonalizeEventTrackerId: !Ref ParameterPersonalizeEventTrackerId
         ParameterAmplitudeApiKey: !Ref ParameterAmplitudeApiKey
         ParameterOptimizelySdkKey: !Ref ParameterOptimizelySdkKey
+        UsersTable: !Ref UsersTable
         PinpointAppId: !Ref PinpointAppId
         CleanupBucketLambdaArn: !Ref CleanupBucketLambdaArn
         DeleteRepositoryLambdaArn: !GetAtt DeleteRepositoryLambdaFunction.Arn

aws/cloudformation-templates/services/service/_template.yaml

@@ -152,6 +152,10 @@ Parameters:
     Type: String
     Default: none
 
+  UsersTable:
+    Type: String
+    Default: none
+
   CategoriesTable:
     Type: String
     Default: none
@@ -287,6 +291,7 @@ Resources:
         ParameterIVSVideoChannelMap: !Ref ParameterIVSVideoChannelMap
         UseDefaultIVSStreams: !Ref UseDefaultIVSStreams
         ProductsTable: !Ref ProductsTable
+        UsersTable: !Ref UsersTable
         CategoriesTable: !Ref CategoriesTable
         CartsTable: !Ref CartsTable
         OrdersTable: !Ref OrdersTable

aws/cloudformation-templates/services/service/service.yaml

@@ -98,6 +98,10 @@ Parameters:
     Type: String
     Default: none
 
+  UsersTable:
+    Type: String
+    Default: none
+
   CategoriesTable:
     Type: String
     Default: none
@@ -177,8 +181,10 @@ Resources:
                   - !Sub 'arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${CategoriesTable}'
                   - !Sub 'arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${CartsTable}'
                   - !Sub 'arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${OrdersTable}'
+                  - !Sub 'arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${UsersTable}'
                   - !Sub 'arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${ExperimentStrategyTable}'
                   - !Sub 'arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${ProductsTable}/index/*'
+                  - !Sub 'arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${UsersTable}/index/*'
                   - !Sub 'arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${PersonalisedProductsTable}/index/*'
                   - !Sub 'arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${CategoriesTable}/index/*'
                   - !Sub 'arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${CartsTable}/index/*'
@@ -393,6 +399,8 @@ Resources:
               Value: '443'
             - Name: DDB_TABLE_PRODUCTS
               Value: !Ref ProductsTable
+            - Name: DDB_TABLE_USERS
+              Value: !Ref UsersTable
             - Name: DDB_TABLE_PERSONALISED_PRODUCTS
               Value: !Ref PersonalisedProductsTable
             - Name: DDB_TABLE_CATEGORIES

aws/cloudformation-templates/template.yaml

@@ -667,6 +667,7 @@ Resources:
         EnvOpenSearchDomainEndpoint: !GetAtt Base.Outputs.OpenSearchDomainEndpoint
         PinpointAppId: !GetAtt Base.Outputs.PinpointAppId
         ProductsTable: !GetAtt Base.Outputs.ProductsTable
+        UsersTable: !GetAtt Base.Outputs.UsersTable
         CategoriesTable: !GetAtt Base.Outputs.CategoriesTable
         CartsTable: !GetAtt Base.Outputs.CartsTable
         OrdersTable: !GetAtt Base.Outputs.OrdersTable
@@ -905,6 +906,7 @@ Resources:
         PinpointEmailFromName: !Ref PinpointEmailFromName
         UseDefaultIVSStreams: !Ref UseDefaultIVSStreams
         ProductsServiceExternalUrl: !GetAtt Services.Outputs.ProductsServiceUrl
+        UsersServiceExternalUrl: !GetAtt Services.Outputs.UsersServiceUrl
         DeployPersonalizedOffersCampaign: !Ref DeployPersonalizedOffersCampaign
         PersonalizeRoleArn: !GetAtt Base.Outputs.PersonalizeRoleArn
         StackBucketName: !GetAtt Base.Outputs.StackBucketName
@@ -1116,6 +1118,7 @@ Outputs:
 
         # Users service
         AWS_REGION=${AWS::Region}
+        DDB_TABLE_USERS=${Base.Outputs.UsersTable}
 
         # Locations service
         RESOURCE_BUCKET=${ResourceBucket}

generators/generate_interactions_personalize.py

@@ -60,8 +60,8 @@
 DISCOUNT_PROBABILITY_WITH_PREFERENCE = 0.5
 
 IN_PRODUCTS_FILENAME = "src/products/data/products.yaml"
-IN_USERS_FILENAMES = ["src/users/src/users-service/data/users.json.gz",
-                      "src/users/src/users-service/data/cstore_users.json.gz"]
+IN_USERS_FILENAMES = ["src/users/data/users.json.gz",
+                      "src/users/data/cstore_users.json.gz"]
 
 PROGRESS_MONITOR_SECONDS_UPDATE = 30
 

generators/generate_interactions_personalize_offers.py

@@ -16,7 +16,7 @@
 RANDOM_SEED = 1
 
 IN_PRODUCTS_FILENAME = "src/products/data/products.yaml"
-IN_USERS_FILENAME = "src/users/src/users-service/data/users.json.gz"
+IN_USERS_FILENAME = "src/users/data/users.json.gz"
 IN_OFFERS_FILENAME = "src/offers/src/offers-service/data/offers.json"
 
 # Where to put the generated data so that it is picked up by stage.sh

src/.env.template

@@ -30,6 +30,11 @@ DDB_TABLE_CATEGORIES=categories
 DDB_TABLE_PERSONALISED_PRODUCTS=personalisedproducts
 DDB_TABLE_CARTS=carts
 DDB_TABLE_ORDERS=orders
+
+# Users service variables:
+# DynamoDB table names (if connecting to DDB in your AWS account, change accordingly)
+DDB_TABLE_USERS=users
+
 # Root URL to use when building fully qualified URLs to product detail view
 WEB_ROOT_URL=http://localhost:8080
 # Image root URL to use when building fully qualified URLs to product images