Skip to content

Commit

Permalink
chore: Update pact-core to v11.
Browse files Browse the repository at this point in the history
BREAKING CHANGE:

Since some of the interface of pact-core is exposed, there are some breaking changes:
   * In `VerifierOptions`: replace use of `tags`, `consumerVersionTag` and `providerVersionTag` with the appropriate `consumerVersionTags` or `providerVersionTags` option.
   * The type for consumer version selectors in the verifier options has been corrected. This will affect typescript users who were using consumerVersionSelectors with the fields `pacticipant`, `all` or `version`. These fields never worked, and now will no longer compile in typescript. The correct type is:
    ```
    ConsumerVersionSelector {
      tag?: string;
      latest?: boolean;
      consumer?: string;
      fallbackTag?: string;
    }
    ```
  • Loading branch information
TimothyJones committed May 21, 2021
1 parent 6a2d1f6 commit 9e5a67d
Show file tree
Hide file tree
Showing 7 changed files with 283 additions and 213 deletions.
441 changes: 266 additions & 175 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 6 additions & 10 deletions package.json
Expand Up @@ -101,15 +101,12 @@
]
},
"dependencies": {
"@pact-foundation/pact-core": "^10.12.1",
"@pact-foundation/pact-core": "^11.0.0",
"@types/bluebird": "^3.5.20",
"@types/express": "^4.17.11",
"@types/ramda": "^0.26.43",
"bluebird": "~3.5.1",
"body-parser": "^1.18.2",
"cli-color": "^1.1.0",
"es6-object-assign": "^1.1.0",
"es6-promise": "^4.1.1",
"express": "^4.17.1",
"graphql": "^14.0.0",
"graphql-tag": "^2.9.1",
Expand All @@ -126,14 +123,15 @@
"pino-pretty": "^4.1.0",
"pkginfo": "^0.4.1",
"popsicle": "^9.2.0",
"q": "^1.5.1",
"ramda": "^0.26.1"
},
"devDependencies": {
"@babel/cli": "~7.6.0",
"@babel/core": "^7.6.4",
"@babel/preset-env": "^7.6.3",
"@octokit/rest": "^18.0.3",
"@types/pino": "^6.3.0",
"@types/ramda": "^0.26.43",
"@pact-foundation/pact-js-prettier-config": "^1.0.0",
"@types/chai": "^4.1.2",
"@types/chai-as-promised": "^7.1.1",
Expand All @@ -146,15 +144,13 @@
"@types/mockery": "^1.4.29",
"@types/nock": "^9.1.2",
"@types/node": "^8.0.24",
"@types/pino": "^6.3.0",
"@types/q": "^1.5.2",
"@types/sinon": "^7.0.6",
"@types/sinon-chai": "^2.7.29",
"@types/superagent": "^3.5.7",
"@types/tough-cookie": "^2.3.2",
"@types/underscore": "^1.8.5",
"@typescript-eslint/eslint-plugin": "^4.9.1",
"@typescript-eslint/parser": "^4.9.1",
"@typescript-eslint/eslint-plugin": "4.17.0",
"@typescript-eslint/parser": "^4.17.0",
"babel-eslint": "~10.0.3",
"chai": "~4.1.2",
"chai-as-promised": "^7.1.1",
Expand All @@ -166,7 +162,7 @@
"eslint-config-prettier": "^7.0.0",
"eslint-import-resolver-typescript": "^2.3.0",
"eslint-plugin-chai-friendly": "^0.6.0",
"eslint-plugin-import": "^2.23.2",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-mocha": "^8.1.0",
"eslint-plugin-prettier": "^3.2.0",
"istanbul": "~0.4.5",
Expand Down
11 changes: 0 additions & 11 deletions src/common/utils.ts

This file was deleted.

3 changes: 1 addition & 2 deletions src/dsl/publisher.ts
Expand Up @@ -3,12 +3,11 @@
* @module Publisher
*/
import publisher, { PublisherOptions } from '@pact-foundation/pact-core';
import { qToPromise } from '../common/utils';

export class Publisher {
constructor(private opts: PublisherOptions) {}

public publishPacts(): Promise<string[]> {
return qToPromise<string[]>(publisher.publishPacts(this.opts));
return publisher.publishPacts(this.opts);
}
}
3 changes: 1 addition & 2 deletions src/dsl/verifier/verifier.ts
Expand Up @@ -11,7 +11,6 @@ import logger, { setLogLevel } from '../../common/logger';

import ConfigurationError from '../../errors/configurationError';
import { localAddresses } from '../../common/net';
import { qToPromise } from '../../common/utils';
import { createProxy, waitForServerReady } from './proxy';
import { VerifierOptions } from './types';

Expand Down Expand Up @@ -97,7 +96,7 @@ export class Verifier {
providerBaseUrl: `${this.address}:${server.address().port}`,
};

return qToPromise<string>(serviceFactory.verifyPacts(opts));
return serviceFactory.verifyPacts(opts);
};
}

Expand Down
19 changes: 8 additions & 11 deletions src/messageConsumerPact.ts
Expand Up @@ -6,7 +6,6 @@ import { isEmpty, cloneDeep } from 'lodash';
import serviceFactory from '@pact-foundation/pact-core';
import { AnyJson } from 'common/jsonTypes';
import { extractPayload, AnyTemplate } from './dsl/matchers';
import { qToPromise } from './common/utils';
import {
Metadata,
Message,
Expand Down Expand Up @@ -139,16 +138,14 @@ export class MessageConsumerPact {
handler({ ...clone, contents: extractPayload(clone.contents) })
)
.then(() =>
qToPromise<unknown>(
this.getServiceFactory().createMessage({
consumer: this.config.consumer,
content: JSON.stringify(this.state),
dir: this.config.dir,
pactFileWriteMode: this.config.pactfileWriteMode,
provider: this.config.provider,
spec: 3,
})
)
this.getServiceFactory().createMessage({
consumer: this.config.consumer,
content: JSON.stringify(this.state),
dir: this.config.dir,
pactFileWriteMode: this.config.pactfileWriteMode,
provider: this.config.provider,
spec: 3,
})
);
}

Expand Down
3 changes: 1 addition & 2 deletions src/messageProviderPact.ts
Expand Up @@ -11,7 +11,6 @@ import bodyParser from 'body-parser';
import { MessageDescriptor, MessageProvider } from './dsl/message';
import logger, { setLogLevel } from './common/logger';
import { PactMessageProviderOptions } from './dsl/options';
import { qToPromise } from './common/utils';

// Listens for the server start event
// Converts event Emitter to a Promise
Expand Down Expand Up @@ -75,7 +74,7 @@ export class MessageProviderPact {
...{ providerBaseUrl: `http://localhost:${server.address().port}` },
} as VerifierOptions;

return qToPromise<string>(serviceFactory.verifyPacts(opts));
return serviceFactory.verifyPacts(opts);
};
}

Expand Down

0 comments on commit 9e5a67d

Please sign in to comment.