Haufe-Lexware / wicked.haufe.io

An API Management system based on Mashape Kong
http://wicked.haufe.io
Other
121 stars 37 forks source link

replicating routes-services PR #243

Closed maksimlikharev closed 4 years ago

maksimlikharev commented 4 years ago

producing single PR for routes/services

DonMartin76 commented 4 years ago

Please resolve merge conflicts. Thanks!

maksimlikharev commented 4 years ago

` 21: updateStep21_v1_0_0i,

<<<<<<< HEAD

22: updateStep21_MultiRoutes 

=======

22: updateStep22_v1_0_0m

>>>>>>> 268b2a60b3a34543e989cfdd016512eba3c6dcd8

`

I already moved version from 21 to 22, I cannot move it anymore, routes has to be merged and updateStep22_v1_0_0m should go to version 23

DonMartin76 commented 4 years ago

There are some tests failing, presumably because you also update the API section of the auth servers (which is good), but you didn't adapt the tests for it.

DonMartin76 commented 4 years ago
  1) /auth-server
       /<auth-server-id>
         should only return very few properties when retrieving as non-admin:
     Uncaught AssertionError: Missing config.api property: expected undefined to be truthy
      at Function.assert.isOk (node_modules/chai/lib/chai/interface/assert.js:85:32)
      at Request._callback (test/12_authServerTests.js:75:24)
      at Request.self.callback (node_modules/request/request.js:185:22)
      at Request.<anonymous> (node_modules/request/request.js:1161:10)
      at IncomingMessage.<anonymous> (node_modules/request/request.js:1083:12)
      at endReadableNT (_stream_readable.js:1145:12)
      at process._tickCallback (internal/process/next_tick.js:63:19)

  2) /auth-server
       /<auth-server-id>
         should return all properties when retrieving as admin:
     Uncaught AssertionError: Missing config.api.uris property: expected undefined to be truthy
      at Function.assert.isOk (node_modules/chai/lib/chai/interface/assert.js:85:32)
      at Request._callback (test/12_authServerTests.js:95:24)
      at Request.self.callback (node_modules/request/request.js:185:22)
      at Request.<anonymous> (node_modules/request/request.js:1161:10)
      at IncomingMessage.<anonymous> (node_modules/request/request.js:1083:12)
      at endReadableNT (_stream_readable.js:1145:12)
      at process._tickCallback (internal/process/next_tick.js:63:19)

  3) /auditlog
       auditlog?embed=1
         must be possible to retrieve auditlog as an admin and filter by role and not find any row by 'Admin' role:
     Uncaught AssertionError: expected '1' to equal 0
      at Request._callback (test/19_auditlogTest.js:210:28)
      at Request.self.callback (node_modules/request/request.js:185:22)
      at Request.<anonymous> (node_modules/request/request.js:1161:10)
      at IncomingMessage.<anonymous> (node_modules/request/request.js:1083:12)
      at endReadableNT (_stream_readable.js:1145:12)
      at process._tickCallback (internal/process/next_tick.js:63:19)
maksimlikharev commented 4 years ago

config update is a big mess rightnow, it's getting more and more difficult to deal with it gracefully

maksimlikharev commented 4 years ago

ok, fixed conflicts, fixed unit test as well + other notes

DonMartin76 commented 4 years ago

Regarding the config update: I agree. Open for ideas. But it's not so simple.

DonMartin76 commented 4 years ago

I am pulling this in now; it may still be that I will be requesting changes.