Skip to content

Commit

Permalink
Revert the AWS signed fetch work
Browse files Browse the repository at this point in the history
This isn't working when we pull it into next-article and it hasn't been
released yet. We don't understand this work enough to debug it and get
it working and it's blocking our n-logger work from being merged and
released. We'd like to revert everything.

As it appeared in two different PRs, I decided to revert it commit by
commit. The PRs are:

  - #86
  - #93

The commit hashes I reverted in order are:

  - 826ca12
  - b848fa4
  - 5f6b1f5
  - ffef3f8
  - ce7e591
  - 8af8c24
  - 2c49ac9
  - 0e5ec8f
  - 2ed8545
  - 698302b
  - 6fd9cd5
  - 6fd9cd5
  - 2f229b8
  - 48f79ce

I'll be installing this branch in next-article before merging so that I
can be sure that I didn't miss anything and that it's safe to install
the latest version of n-es-client in our apps.
  • Loading branch information
rowanmanning committed Jul 12, 2022
1 parent a2c61e0 commit 91333af
Show file tree
Hide file tree
Showing 12 changed files with 19,672 additions and 20,353 deletions.
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,11 @@ unit-test:
unit-test-coverage:
nyc --reporter=$(if $(CIRCLECI),lcovonly,lcov) make unit-test

integration:
export AWS_SIGNED_FETCH_DISABLE_DNS_RESOLUTION=false; \
mocha 'integration-test/*.spec.js'

test:
make verify

ifeq ($(CIRCLECI),true)
make unit-test-coverage && cat ./coverage/lcov.info | ./node_modules/.bin/coveralls; \
make integration;
make unit-test-coverage && cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
else
make unit-test
endif
46 changes: 0 additions & 46 deletions integration-test/search.spec.js

This file was deleted.

2 changes: 1 addition & 1 deletion lib/count.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const signedFetch = require('./helpers/signed-aws-es-fetch');
const signedFetch = require('signed-aws-es-fetch');
const agent = require('./helpers/https-agent');
const handleResponse = require('./helpers/handle-response');

Expand Down
2 changes: 1 addition & 1 deletion lib/get.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const signedFetch = require('./helpers/signed-aws-es-fetch');
const signedFetch = require('signed-aws-es-fetch');
const agent = require('./helpers/https-agent');
const handleResponse = require('./helpers/handle-response');
const stringifyOptions = require('./helpers/stringify-options');
Expand Down
130 changes: 0 additions & 130 deletions lib/helpers/signed-aws-es-fetch.js

This file was deleted.

2 changes: 1 addition & 1 deletion lib/mapping.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const signedFetch = require('./helpers/signed-aws-es-fetch');
const signedFetch = require('signed-aws-es-fetch');
const agent = require('./helpers/https-agent');
const handleResponse = require('./helpers/handle-response');

Expand Down
2 changes: 1 addition & 1 deletion lib/mget.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const signedFetch = require('./helpers/signed-aws-es-fetch');
const signedFetch = require('signed-aws-es-fetch');
const agent = require('./helpers/https-agent');
const handleResponse = require('./helpers/handle-response');
const extractSource = require('./helpers/extract-source');
Expand Down
2 changes: 1 addition & 1 deletion lib/msearch.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const signedFetch = require('./helpers/signed-aws-es-fetch');
const signedFetch = require('signed-aws-es-fetch');
const agent = require('./helpers/https-agent');
const handleResponse = require('./helpers/handle-response');
const extractSource = require('./helpers/extract-source');
Expand Down
2 changes: 1 addition & 1 deletion lib/search.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const signedFetch = require('./helpers/signed-aws-es-fetch');
const signedFetch = require('signed-aws-es-fetch');
const agent = require('./helpers/https-agent');
const handleResponse = require('./helpers/handle-response');
const extractSource = require('./helpers/extract-source');
Expand Down
Loading

0 comments on commit 91333af

Please sign in to comment.