changes in serverless and removing conf vars which not needed

Author: Sachin Maheshwari

config/default.js

@@ -1,8 +1,4 @@
 module.exports = {
-  // The valid issuer of tokens, a json array contains valid issuer.
-  VALID_ISSUERS: process.env.VALID_ISSUERS || '["https://api.topcoder-dev.com", "https://api.topcoder.com", "https://topcoder-dev.auth0.com/", "https://auth.topcoder-dev.com/"]',
-  // Auth0 token cache time, used to get TC M2M token
-  TOKEN_CACHE_TIME: process.env.TOKEN_CACHE_TIME,
   // Proxy Auth0 URL, used to get TC M2M token
   AUTH0_PROXY_SERVER_URL: process.env.AUTH0_PROXY_SERVER_URL,
   // Auth0 URL, used to get TC M2M token

serverless.yml

@@ -1,25 +1,28 @@
 service: lambda-member-v5user-skill-sync
-disabledDeprecations:
-  - LOAD_VARIABLES_FROM_ENV_FILES
 provider:
   name: aws
   stage: ${opt:stage, 'dev'}
+  role: ${file(./config/${self:provider.stage}.json):LAMBDA_ROLE}
   runtime: nodejs12.x
   memorySize: 256
-  timeout: 100
-  lambdaHashingVersion: 20201221
-
-package:
-  patterns:
-    - src/**
-    - '!.git/**'
-    - '!test/**'
-
-plugins:
-  - serverless-dotenv-plugin
+  timeout: 15
+  environment:
+   DB_AGGREGATED_SKILLS_STREAM: ${file(./config/${self:provider.stage}.json):DB_AGGREGATED_SKILLS_STREAM}
+   DB_ENTERED_SKILLS_STREAM: ${file(./config/${self:provider.stage}.json):DB_ENTERED_SKILLS_STREAM}
+   TC_API_URL: ${file(./config/${self:provider.stage}.json):TC_API_URL}
+   AUTH0_PROXY_SERVER_URL: ${file(./config/${self:provider.stage}.json):AUTH0_PROXY_SERVER_URL}
+   AUTH0_URL: ${file(./config/${self:provider.stage}.json):AUTH0_URL}
+   AUTH0_TOPCODER_AUDIENCE: ${file(./config/${self:provider.stage}.json):AUTH0_TOPCODER_AUDIENCE}
+   AUTH0_UBAHN_AUDIENCE: ${file(./config/${self:provider.stage}.json):AUTH0_UBAHN_AUDIENCE}
+   AUTH0_CLIENT_ID: ${file(./config/${self:provider.stage}.json):AUTH0_CLIENT_ID}
+   AUTH0_CLIENT_SECRET: ${file(./config/${self:provider.stage}.json):AUTH0_CLIENT_SECRET}
+   UBAHN_API_URL: ${file(./config/${self:provider.stage}.json):UBAHN_API_URL}
+   SKILL_PROVIDER_NAME: ${file(./config/${self:provider.stage}.json):SKILL_PROVIDER_NAME}
 
 functions:
-  syncSkills:
-    handler: index.handle
-    name: member-v5user-skill-sync
-    description: member-v5user-skill-sync
+ handler:
+   handler: index.handle
+   name: member-v5user-skill-sync # optional, Deployed Lambda name
+   description: member-v5user-skill-sync # The description of your function.
+   events:
+    - http: ANY /

src/common/helper.js

@@ -10,12 +10,12 @@ const m2mAuth = require('tc-core-library-js').auth.m2m
 
 const m2mForTopcoder = m2mAuth({
   AUTH0_AUDIENCE: config.AUTH0_TOPCODER_AUDIENCE,
-  ..._.pick(config, ['AUTH0_URL', 'TOKEN_CACHE_TIME', 'AUTH0_CLIENT_ID', 'AUTH0_CLIENT_SECRET', 'AUTH0_PROXY_SERVER_URL'])
+  ..._.pick(config, ['AUTH0_URL', 'AUTH0_CLIENT_ID', 'AUTH0_CLIENT_SECRET', 'AUTH0_PROXY_SERVER_URL'])
 })
 
 const m2mForUbahn = m2mAuth({
   AUTH0_AUDIENCE: config.AUTH0_UBAHN_AUDIENCE,
-  ..._.pick(config, ['AUTH0_URL', 'TOKEN_CACHE_TIME', 'AUTH0_CLIENT_ID', 'AUTH0_CLIENT_SECRET', 'AUTH0_PROXY_SERVER_URL'])
+  ..._.pick(config, ['AUTH0_URL', 'AUTH0_CLIENT_ID', 'AUTH0_CLIENT_SECRET', 'AUTH0_PROXY_SERVER_URL'])
 })
 
 /**