Fix CodeQL and rebase errors.

lib/mock/http.js

@@ -14,10 +14,9 @@ log.heading = 'node-pre-gyp'; // differentiate node-pre-gyp's logs from npm's
 function http_mock() {
   log.warn('mocking http requests to s3');
 
-  const baseHostname = 's3.us-east-1.amazonaws.com';
   const basePath = `${os.tmpdir()}/mock`;
 
-  nock(new RegExp('^\.*' + baseHostname))
+  nock(new RegExp('([a-z0-9]+[.])*s3[.]us-east-1[.]amazonaws[.]com'))
     .persist()
     .get(() => true) //a function that always returns true is a catch all for nock
     .reply(