Skip to content

Merging work to main after MVP #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 147 commits into from
Jun 18, 2022
Merged

Merging work to main after MVP #49

merged 147 commits into from
Jun 18, 2022

Conversation

@evanmcneely
Copy link
Contributor

@evanmcneely evanmcneely commented Jun 17, 2022

Summary

Merging work to main after MVP

Type of Change

  • New feature (non-breaking change which adds functionality)

shalarewicz and others added 30 commits May 14, 2022 10:22
@shalarewicz
Initial commit
f68803e
@evanmcneely
added prettier config settings
0903e2e
@shalarewicz
Merge pull request #1 from oslabs-beta/sh/env-setup
bb3a2f1 
Environment setup
@shalarewicz
intitial jest and typescript config
07d76bc
@shalarewicz
RateLimiter spec closes #9. Test for token bucket algorithm closes #4.
0656e58
@shalarewicz
updated test script to pass without any tests
778f0a6
@shalarewicz
eslint/prettier config. Name change
53b01c9
@shalarewicz
tsconfig tweak
c3367cf
@evanmcneely
resolving some errors with eslint and ts
37012d2
@evanmcneely
Created types and function definitions for the get type weights function
2aaf2f4
@evanmcneely
renamed the file to buildTypeWeights
7973e37
@evanmcneely
started to layout the test structure for buildTypeWeight function
7f5f655
@shalarewicz
Added redis-mock for testing. Updated RateLimiter and TokenBucket spe…
3836d66 
…cs. Added new tests
@shalarewicz
added reset tests for rate limiter
62b89b6 
updated timestamps to use UNIX format
@shalarewicz
corrected jest config
c12b9e6
@evanmcneely
added a default type weights configuration to the function parameters
094847e
@evanmcneely
moved types to @types folder
06a119c
@evanmcneely
wrote tests for buildTypeWeights functionality and configurability
f3c1118
@shalarewicz
Create pull_request_template.md
45c0a61 
Adding a PR template
@evanmcneely
added some tests and reworked expected output
96ab047
@evanmcneely
finish writing and proof reading tests
43e0dd2
@evanmcneely
finished writing an overview of implementation for buildTypeWeightsFr…
7b05588 
…omSchema function
@shalarewicz
added timestamp to processRequest for RateLimiters and overahauled To…
ee63bb7 
…kenBucket test suite to accomodate
@evanmcneely
fixed a ts error in tokenBucket.ts
6f9d873
@evanmcneely
skipped all tests for now
1164121
@shalarewicz
Fixed test for negative tokenbucket refillRate and capacity
572987a
@shalarewicz
disabled TokenBucket tests for travis build
f579f1a
@evanmcneely
added types to varibales in token bucket tests
9d08980
@shalarewicz
Made RateLimiter.processRequest async and updated TokenBucket tests a…
e88e0c1 
…ccordingly
@feiw101
Merge pull request #13 from oslabs-beta/shalarewicz-patch-2
350a000 
Create pull_request_template.md
evanmcneely and others added 27 commits June 2, 2022 09:12
@evanmcneely
type complexity analysis working for first test. changed i + 1 to i += 1
57a8cd8
@evanmcneely
passing all test up to and including aliases
9beb1ce
@evanmcneely
changed hard coded numbers to to the proper variables
e55e2fe
@evanmcneely
Merge branch 'dev' of https://github.com/oslabs-beta/GraphQL-Gate int…
b6a7c0a 
…o em/tokenBucketAlgo
@evanmcneely
refactoring middleware tests to use ioredis
82bd25b
@evanmcneely
refactored redis options in tests to work with ioredis
cfbf8b9
@evanmcneely
Merge pull request #29 from oslabs-beta/em/tokenBucketAlgo
c118dc3 
Token bucket algorithm
@evanmcneely
resolved mergo conflicts from dev
9175747
@evanmcneely
refactored the import of express rate limeter to work in test file
2eedcbe
@evanmcneely
resolved merge conflicts with dev
6923c53
@evanmcneely
added a chart to describe the AST node connections
8d09a5c
@evanmcneely
added a description for redis client options
92aa047
@shalarewicz
converted type weight keys to lowercase
1a75e56
@shalarewicz
updated parameters for weight function in typeComplexity tests
6e6a4fd
@shalarewicz
comment cleanup for type weight tests
11de437
@shalarewicz
modularized typeWeight algorithm
985d3b2
@shalarewicz
added support for scalars and enums in type weight function
706861a
@shalarewicz
Merge branch 'dev' of github.com:oslabs-beta/GraphQL-Gate into sh/bui…
b92e08d 
…ld-type-weights
@shalarewicz
import cleanup
c3f5e1e
@shalarewicz
Merge pull request #32 from oslabs-beta/em/middleware
3cfbef4 
Implementation of express rate limiting middleware
@shalarewicz
Merge branch 'dev' of github.com:oslabs-beta/GraphQL-Gate into em/typ…
c464162 
…eComplexityAlgo
@shalarewicz
Merge branch 'dev' into sh/build-type-weights
39473b5
@jondeweydev
Merge pull request #33 from oslabs-beta/sh/build-type-weights
4cd7382 
Type Weights Parser
@shalarewicz
Merge branch 'dev' into em/typeComplexityAlgo
ece955b 
Revsoled weight function conflict in complexity algo
@shalarewicz
exported types for succesful typescript build.
4ea037f
@shalarewicz
lint fix
9ef5624
@evanmcneely
Merge pull request #34 from oslabs-beta/em/typeComplexityAlgo
1b0ac1b 
Type complexity algorithm
@evanmcneely evanmcneely requested a review from shalarewicz June 17, 2022 17:21
@evanmcneely evanmcneely merged commit 0df8e83 into main Jun 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@shalarewicz shalarewicz shalarewicz approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@evanmcneely @shalarewicz @feiw101 @jondeweydev