Skip to content

Commit

Permalink
chore(deps): bump axios from 1.2.2 to 1.2.3 (#3388)
Browse files Browse the repository at this point in the history
* chore(deps): bump axios from 1.2.2 to 1.2.3

Bumps [axios](https://github.com/axios/axios) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@1.2.2...v1.2.3)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Replace AxiosRequestConfig with RawAxiosRequestConfig

See axios/axios#5420

* Lint, eslint-disable-next-line import/named

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Florian Wilhelm <florian.wilhelm02@sap.com>
  • Loading branch information
dependabot[bot] and fwilhe committed Jan 19, 2023
1 parent 31c1378 commit cd131bf
Show file tree
Hide file tree
Showing 15 changed files with 51 additions and 49 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"@types/voca": "^1.4.0",
"@typescript-eslint/eslint-plugin": "^5.48.2",
"@typescript-eslint/parser": "^5.48.2",
"axios": "^1.2.2",
"axios": "^1.2.3",
"compare-versions": "^5.0.3",
"depcheck": "^1.0.0",
"eslint": "^8.32.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/connectivity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@sap-cloud-sdk/resilience": "^2.11.0",
"@sap/xsenv": "^3.4.0",
"@sap/xssec": "^3.2.15",
"axios": "^1.2.2",
"axios": "^1.2.3",
"http-proxy-agent": "^5.0.0",
"https-proxy-agent": "^5.0.0",
"jsonwebtoken": "^9.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
import nock from 'nock';
import * as jwt123 from 'jsonwebtoken';
import nock from 'nock';
// eslint-disable-next-line import/named
import axios, { AxiosRequestConfig } from 'axios';
import * as resilienceMethods from '@sap-cloud-sdk/resilience/internal';
import { HttpsProxyAgent } from 'https-proxy-agent';
import { createLogger } from '@sap-cloud-sdk/util';
import { circuitBreakers } from '@sap-cloud-sdk/resilience/internal';
import { createLogger } from '@sap-cloud-sdk/util';
// eslint-disable-next-line import/named
import axios, { RawAxiosRequestConfig } from 'axios';
import { HttpsProxyAgent } from 'https-proxy-agent';
import { mockCertificateCall } from '../../../../../test-resources/test/test-util';
import { destinationServiceUri } from '../../../../../test-resources/test/test-util/environment-mocks';
import { privateKey } from '../../../../../test-resources/test/test-util/keys';
import { mockCertificateCall } from '../../../../../test-resources/test/test-util';
import { Destination } from './destination-service-types';
import { DestinationConfiguration, parseDestination } from './destination';
import {
fetchCertificate,
fetchDestination,
fetchInstanceDestinations,
fetchSubaccountDestinations,
fetchCertificate
fetchSubaccountDestinations
} from './destination-service';
import { DestinationConfiguration, parseDestination } from './destination';
import { Destination } from './destination-service-types';

const jwt = jwt123.sign(
JSON.stringify({ user_id: 'user', zid: 'tenant' }),
Expand Down Expand Up @@ -531,7 +532,7 @@ describe('destination service', () => {
const result = await fetchDestination(destinationServiceUri, jwt, {
destinationName
});
const expectedConfig: AxiosRequestConfig = {
const expectedConfig: RawAxiosRequestConfig = {
baseURL:
'https://destination.example.com/destination-configuration/v1/destinations/HTTP-OAUTH',
method: 'get',
Expand Down Expand Up @@ -609,7 +610,7 @@ describe('destination service', () => {
await fetchDestination(destinationServiceUri, jwt, {
destinationName
});
const expectedConfig: AxiosRequestConfig = {
const expectedConfig: RawAxiosRequestConfig = {
baseURL:
'https://destination.example.com/destination-configuration/v1/destinations/HTTP-OAUTH',
headers: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@ import {
removeTrailingSlashes
} from '@sap-cloud-sdk/util';
// eslint-disable-next-line import/named
import axios, { AxiosRequestConfig, AxiosResponse, AxiosError } from 'axios';
import { executeWithMiddleware } from '@sap-cloud-sdk/resilience/internal';
import {
Context,
resilience,
HttpMiddlewareContext,
Middleware
Middleware,
resilience
} from '@sap-cloud-sdk/resilience';
import { executeWithMiddleware } from '@sap-cloud-sdk/resilience/internal';
import * as asyncRetry from 'async-retry';
import { decodeJwt, wrapJwtInHeader } from '../jwt';
// eslint-disable-next-line import/named
import axios, { AxiosError, AxiosResponse, RawAxiosRequestConfig } from 'axios';
import { urlAndAgent } from '../../http-agent';
import { getSubdomainAndZoneId } from '../xsuaa-service';
import { buildAuthorizationHeaders } from '../authorization-header';
import { decodeJwt, wrapJwtInHeader } from '../jwt';
import { getSubdomainAndZoneId } from '../xsuaa-service';
import {
DestinationConfiguration,
DestinationJson,
Expand All @@ -26,12 +27,12 @@ import {
parseDestination,
validateDestinationConfig
} from './destination';
import { DestinationFetchOptions } from './destination-accessor-types';
import { destinationServiceCache } from './destination-service-cache';
import {
Destination,
DestinationCertificate
} from './destination-service-types';
import { destinationServiceCache } from './destination-service-cache';
import { DestinationFetchOptions } from './destination-accessor-types';

const logger = createLogger({
package: 'connectivity',
Expand Down Expand Up @@ -400,7 +401,7 @@ async function callDestinationService(
> {
const { destinationName, retry } = options || {};

const config: AxiosRequestConfig = {
const config: RawAxiosRequestConfig = {
...urlAndAgent(context.uri),
proxy: false,
method: 'get',
Expand Down
2 changes: 1 addition & 1 deletion packages/http-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@sap-cloud-sdk/connectivity": "^2.11.0",
"@sap-cloud-sdk/resilience": "^2.11.0",
"@sap-cloud-sdk/util": "^2.11.0",
"axios": "^1.2.2"
"axios": "^1.2.3"
},
"devDependencies": {
"@sap-cloud-sdk/test-services-odata-common": "^2.11.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/http-client/src/http-client-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export type Method =
| 'PATCH';

/**
* This interface is compatible with AxiosRequestConfig.
* This interface is compatible with RawAxiosRequestConfig.
*/
export type HttpRequestConfig = HttpRequestConfigBase & {
params?: Record<string, any>;
Expand Down
4 changes: 2 additions & 2 deletions packages/http-client/src/http-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
getSubdomainAndZoneId,
resolveDestination
} from '@sap-cloud-sdk/connectivity/internal';
import { executeWithMiddleware } from '@sap-cloud-sdk/resilience/internal';
import {
createLogger,
ErrorWithCause,
Expand All @@ -24,7 +25,6 @@ import {
unixEOL
} from '@sap-cloud-sdk/util';
import axios from 'axios';
import { executeWithMiddleware } from '@sap-cloud-sdk/resilience/internal';
import { buildCsrfHeaders } from './csrf-token-header';
import {
DestinationHttpRequestConfig,
Expand Down Expand Up @@ -456,7 +456,7 @@ function executeWithAxios(request: HttpRequest): Promise<HttpResponse> {

/**
* Builds an Axios config with default configuration i.e. no_proxy, default http and https agent and GET as request method.
* @returns AxiosRequestConfig with default parameters
* @returns RawAxiosRequestConfig with default parameters
* @internal
*/
export function getAxiosConfigWithDefaults(): HttpRequestConfig {
Expand Down
2 changes: 1 addition & 1 deletion packages/openapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@sap-cloud-sdk/http-client": "^2.11.0",
"@sap-cloud-sdk/resilience": "^2.11.0",
"@sap-cloud-sdk/util": "^2.11.0",
"axios": "^1.2.2"
"axios": "^1.2.3"
},
"devDependencies": {
"nock": "^13.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/resilience/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@sap-cloud-sdk/util": "^2.12.0",
"@types/async-retry": "^1.4.5",
"async-retry": "^1.3.3",
"axios": "^1.2.2"
"axios": "^1.2.3"
},
"devDependencies": {
"nock": "^13.3.0",
Expand Down
18 changes: 9 additions & 9 deletions packages/resilience/src/circuit-breaker.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// eslint-disable-next-line import/named
import axios, { AxiosRequestConfig, AxiosResponse } from 'axios';
import axios, { AxiosResponse, RawAxiosRequestConfig } from 'axios';
import nock from 'nock';
import { executeWithMiddleware, HttpMiddlewareContext } from './middleware';
import { circuitBreakerHttp, circuitBreakers } from './circuit-breaker';
import { executeWithMiddleware, HttpMiddlewareContext } from './middleware';

describe('circuit-breaker', () => {
beforeEach(() => {
Expand All @@ -17,7 +17,7 @@ describe('circuit-breaker', () => {
.get(/failing-500/)
.reply(500);

const requestConfig: AxiosRequestConfig = {
const requestConfig: RawAxiosRequestConfig = {
method: 'get',
baseURL: host,
url: 'failing-500'
Expand Down Expand Up @@ -63,7 +63,7 @@ describe('circuit-breaker', () => {
.times(10)
.reply(404);

const requestConfig: AxiosRequestConfig = {
const requestConfig: RawAxiosRequestConfig = {
method: 'get',
baseURL: host,
url: 'failing-ignore'
Expand Down Expand Up @@ -92,7 +92,7 @@ describe('circuit-breaker', () => {
it('creates circuit breaker for each tenant', async () => {
nock(host, {}).get(/ok/).times(2).reply(200);

const requestConfig: AxiosRequestConfig = {
const requestConfig: RawAxiosRequestConfig = {
method: 'get',
baseURL: host,
url: 'ok'
Expand Down Expand Up @@ -128,19 +128,19 @@ describe('circuit-breaker', () => {
.get(/path-2/)
.reply(200);

const requestConfigPath1: AxiosRequestConfig = {
const requestConfigPath1: RawAxiosRequestConfig = {
method: 'get',
baseURL: host,
url: 'path-1'
};
const requestConfigPath2: AxiosRequestConfig = {
const requestConfigPath2: RawAxiosRequestConfig = {
method: 'get',
baseURL: host,
url: 'path-2'
};
const request = requestConfig => () => axios.request(requestConfig);
const context: (
requestConfig: AxiosRequestConfig
requestConfig: RawAxiosRequestConfig
) => HttpMiddlewareContext = requestConfig => ({
requestConfig,
uri: host,
Expand All @@ -167,7 +167,7 @@ describe('circuit-breaker', () => {
.times(10)
.reply(401);

const requestConfig: AxiosRequestConfig = {
const requestConfig: RawAxiosRequestConfig = {
method: 'post',
baseURL: host,
url: '/oauth/token',
Expand Down
4 changes: 2 additions & 2 deletions packages/resilience/src/middleware.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// eslint-disable-next-line import/named
import { AxiosRequestConfig } from 'axios';
import { RawAxiosRequestConfig } from 'axios';

/**
* Context for HttpRequests of the middleware.
Expand All @@ -16,7 +16,7 @@ export interface HttpMiddlewareContext extends Context {
/**
* Request config.
*/
requestConfig: AxiosRequestConfig;
requestConfig: RawAxiosRequestConfig;
}

/**
Expand Down
8 changes: 4 additions & 4 deletions packages/resilience/src/resilience.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// eslint-disable-next-line import/named
import axios, { AxiosRequestConfig, AxiosResponse } from 'axios';
import axios, { AxiosResponse, RawAxiosRequestConfig } from 'axios';
import nock from 'nock';
import { circuitBreakers } from './circuit-breaker';
import { executeWithMiddleware, HttpMiddlewareContext } from './middleware';
Expand Down Expand Up @@ -79,7 +79,7 @@ describe('combined resilience features', () => {
.delay(delay)
.reply(200);

const requestConfig: AxiosRequestConfig = {
const requestConfig: RawAxiosRequestConfig = {
method: 'get',
baseURL: host,
url: 'with-delay'
Expand Down Expand Up @@ -124,7 +124,7 @@ describe('combined resilience features', () => {
.get(/with-retry/)
.reply(HTTP_STATUS.UNAUTHORIZED);

const requestConfig: AxiosRequestConfig = {
const requestConfig: RawAxiosRequestConfig = {
method: 'get',
baseURL: host,
url: 'with-retry'
Expand Down Expand Up @@ -155,7 +155,7 @@ describe('combined resilience features', () => {
.get(/with-retry/)
.reply(HTTP_STATUS.OK);

const requestConfig: AxiosRequestConfig = {
const requestConfig: RawAxiosRequestConfig = {
method: 'get',
baseURL: host,
url: 'with-retry'
Expand Down
2 changes: 1 addition & 1 deletion packages/util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"readme": "ts-node ../../scripts/replace-common-readme.ts"
},
"dependencies": {
"axios": "^1.2.2",
"axios": "^1.2.3",
"chalk": "^4.1.0",
"logform": "^2.4.2",
"promise.allsettled": "^1.0.6",
Expand Down
2 changes: 1 addition & 1 deletion test-packages/e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@sap-cloud-sdk/util": "^2.11.0",
"@sap/cds": "^6.4.1",
"@sap/cds-dk": "6.4.0",
"axios": "^1.2.2",
"axios": "^1.2.3",
"execa": "^5.0.0",
"express": "^4.18.2",
"fs-extra": "^11.1.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2250,10 +2250,10 @@ aws4@^1.8.0:
resolved "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3"
integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==

axios@>=0.21, axios@>=0.27.2, axios@^1.2.2:
version "1.2.2"
resolved "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz#72681724c6e6a43a9fea860fc558127dbe32f9f1"
integrity sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==
axios@>=0.21, axios@>=0.27.2, axios@^1.2.3:
version "1.2.3"
resolved "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz#31a3d824c0ebf754a004b585e5f04a5f87e6c4ff"
integrity sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==
dependencies:
follow-redirects "^1.15.0"
form-data "^4.0.0"
Expand Down

0 comments on commit cd131bf

Please sign in to comment.