Skip to content

Commit

Permalink
Merge pull request #93 from hudl/skunkworks-2024-logging
Browse files Browse the repository at this point in the history
Add console logging and tweak config
  • Loading branch information
james-vaughn authored Oct 22, 2024
2 parents 57774f6 + a65e80b commit 3266e5f
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 18 deletions.
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ $RECYCLE.BIN/
# End of https://www.gitignore.io/api/node,macos,windows,serverless,visualstudiocode

# Configuration
serverless-config.yml

**/obj/**
**/bin/**
**/bin/**

# JetBrains
.idea/**/*
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"scripts": {
"start": "serverless offline",
"test": "jest",
"debug": "export SLS_DEBUG=* && node --inspect ./node_modules/.bin/serverless offline --noTimeout",
"debug": "export SLS_DEBUG=* && node --inspect ./node_modules/.bin/serverless offline --noTimeout --noPrependStageInUrl",
"debug-tests": "node --inspect ./node_modules/.bin/jest --runInBand --coverage false"
},
"repository": {
Expand Down
13 changes: 13 additions & 0 deletions serverless-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
lambda:
update:
roleName: hudl-cal2slack-lambda-update
policyName: hudl-cal2slack-lambda-update-policy
slackbot:
roleName: hudl-cal2slack-lambda-slackbot
policyName: hudl-cal2slack-lambda-slackbot-policy
secretsPrefix: hudl/internal/cal2slack/slackbot-secrets
testSecret:
roleName: hudl-cal2slack-lambda-slackbot
policyName: hudl-cal2slack-lambda-slackbot-policy
deployment:
bucketName: hudl-calendar2slack-deployment
30 changes: 16 additions & 14 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import { LambdaClient, InvokeCommand } from '@aws-sdk/client-lambda';
import {InvokeCommand, LambdaClient} from '@aws-sdk/client-lambda';
import oauth from 'simple-oauth2';
import { WebClient } from '@slack/web-api';
import { getEventsForUser, CalendarEvent, ShowAs } from './services/calendar';
import {LogLevel, WebClient} from '@slack/web-api';
import {CalendarEvent, getEventsForUser, ShowAs} from './services/calendar';
import {
getAllUserSettings,
getSettingsForUsers,
upsertSlackToken,
upsertCurrentEvent,
removeCurrentEvent,
UserSettings,
setLastReminderEventId,
upsertCurrentEvent,
upsertSlackToken,
UserSettings,
} from './services/dynamo';
import { setUserStatus, setUserPresence, getUserByEmail, postMessage, SlackUser } from './services/slack';
import { Handler } from 'aws-lambda';
import { getStatusForUserEvent } from './utils/mapEventStatus';
import { GraphApiAuthenticationProvider } from './services/calendar/graphApiAuthenticationProvider';
import {getUserByEmail, postMessage, setUserPresence, setUserStatus, SlackUser} from './services/slack';
import {Handler} from 'aws-lambda';
import {getStatusForUserEvent} from './utils/mapEventStatus';
import {GraphApiAuthenticationProvider} from './services/calendar/graphApiAuthenticationProvider';
import config from '../config';
import { getSlackSecretWithKey } from './utils/secrets';
import { authorizeMicrosoftGraphUrl, createUserUrl } from './utils/urls';
import { getUpcomingEventMessage } from './utils/eventHelper';
import {getSlackSecretWithKey} from './utils/secrets';
import {authorizeMicrosoftGraphUrl, createUserUrl} from './utils/urls';
import {getUpcomingEventMessage} from './utils/eventHelper';

const getHighestPriorityEvent = (events: CalendarEvent[]) =>
events.length
Expand Down Expand Up @@ -191,7 +191,9 @@ export const createUser: Handler = async (event: any) => {
const accessToken = oauthClient.accessToken.create(tokenResult);
const tokenStr: string = accessToken.token.access_token;

const slackClient = new WebClient(tokenStr);
console.log(`AccessToken=${JSON.stringify(accessToken)}, TokenStr=${tokenStr}`);

const slackClient = new WebClient(tokenStr, {logLevel: LogLevel.DEBUG});
const userInfo = await slackClient.users.info();

if (userInfo.error) {
Expand Down

0 comments on commit 3266e5f

Please sign in to comment.