Merge pull request #4857 from linuxfoundation/unicron-add-v3-e2e-test-coverage-prod

Unicron add v3 e2e test coverage prod

Author: lukaszgryglicki

cla-backend-go/company/handlers.go

@@ -363,7 +363,11 @@ func Configure(api *operations.ClaAPI, service IService, usersService users.Serv
 
 		result, err := service.SearchOrganizationByName(ctx, companyName, websiteName, utils.BoolValue(params.IncludeSigningEntityName), filter)
 		if err != nil {
-			log.Warnf("error occurred while search org %s. error = %s", *params.CompanyName, err.Error())
+			companyName := "<nil>"
+			if params.CompanyName != nil {
+				companyName = *params.CompanyName
+			}
+			log.Warnf("error occurred while search org %s. error = %s", companyName, err.Error())
 			return organization.NewSearchOrganizationInternalServerError().WithXRequestID(reqID).WithPayload(errorResponse(err))
 		}
 		return organization.NewSearchOrganizationOK().WithXRequestID(reqID).WithPayload(result)

cla-backend-go/serverless.yml

@@ -223,6 +223,9 @@ provider:
     AUTH0_DOMAIN: ${file(./env.json):auth0-domain, ssm:/cla-auth0-domain-${opt:stage}}
     AUTH0_CLIENT_ID: ${file(./env.json):auth0-clientId, ssm:/cla-auth0-clientId-${opt:stage}}
     AUTH0_USERNAME_CLAIM: ${file(./env.json):auth0-username-claim, ssm:/cla-auth0-username-claim-${opt:stage}}
+    AUTH0_USERNAME_CLAIM_CLI: ${file(./env.json):auth0-username-cli-claim, ssm:/cla-auth0-username-claim-cli-${opt:stage}}
+    AUTH0_EMAIL_CLAIM_CLI: ${file(./env.json):auth0-email-cli-claim, ssm:/cla-auth0-email-claim-cli-${opt:stage}}
+    AUTH0_NAME_CLAIM_CLI: ${file(./env.json):auth0-name-cli-claim, ssm:/cla-auth0-name-claim-cli-${opt:stage}}
     AUTH0_ALGORITHM: ${file(./env.json):auth0-algorithm, ssm:/cla-auth0-algorithm-${opt:stage}}
     SF_INSTANCE_URL: ${file(./env.json):sf-instance-url, ssm:/cla-sf-instance-url-${opt:stage}}
     SF_CLIENT_ID: ${file(./env.json):sf-client-id, ssm:/cla-sf-consumer-key-${opt:stage}}

cla-backend-go/users/handlers.go

@@ -257,7 +257,10 @@ func Configure(api *operations.ClaAPI, service Service, eventsService events.Ser
 		}
 
 		userModel, err := service.GetUser(params.UserID)
-		if err != nil {
+		if err != nil || userModel == nil {
+			if err == nil {
+				err = fmt.Errorf("user not found for user_id: %s", params.UserID)
+			}
 			log.WithFields(f).Warnf("error retrieving user for user_id: %s, error: %+v", params.UserID, err)
 			return users.NewGetUserCompatBadRequest().WithPayload(errorResponse(err))
 		}

cla-backend/serverless.yml

@@ -312,6 +312,9 @@ provider:
     AUTH0_DOMAIN: ${file(./env.json):auth0-domain, ssm:/cla-auth0-domain-${sls:stage}}
     AUTH0_CLIENT_ID: ${file(./env.json):auth0-clientId, ssm:/cla-auth0-clientId-${sls:stage}}
     AUTH0_USERNAME_CLAIM: ${file(./env.json):auth0-username-claim, ssm:/cla-auth0-username-claim-${sls:stage}}
+    AUTH0_USERNAME_CLAIM_CLI: ${file(./env.json):auth0-username-cli-claim, ssm:/cla-auth0-username-claim-cli-${sls:stage}}
+    AUTH0_EMAIL_CLAIM_CLI: ${file(./env.json):auth0-email-cli-claim, ssm:/cla-auth0-email-claim-cli-${sls:stage}}
+    AUTH0_NAME_CLAIM_CLI: ${file(./env.json):auth0-name-cli-claim, ssm:/cla-auth0-name-claim-cli-${sls:stage}}
     AUTH0_ALGORITHM: ${file(./env.json):auth0-algorithm, ssm:/cla-auth0-algorithm-${sls:stage}}
     SF_INSTANCE_URL: ${file(./env.json):sf-instance-url, ssm:/cla-sf-instance-url-${sls:stage}}
     SF_CLIENT_ID: ${file(./env.json):sf-client-id, ssm:/cla-sf-consumer-key-${sls:stage}}