Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(cx-api): bump cli <=> cdk protocol version #2956

Merged
merged 4 commits into from
Jun 23, 2019
Merged

refactor(cx-api): bump cli <=> cdk protocol version #2956

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6683cd2
refactor(cx-api): bump cli <=> cdk protocol version
Jun 20, 2019
30c35d1
fix test message
Jun 23, 2019
4d55e18
chore: fix build break caused by parallel PRs
Jun 23, 2019
f531a77
Merge branch 'eladb-patch-2' into benisrae/bump-cx
Jun 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cdk/test/test.synthesis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export = {
]);
test.deepEqual(readJson(session.directory, 'foo.json'), { bar: 123 });
test.deepEqual(session.manifest, {
version: '0.34.0',
version: '0.36.0',
artifacts: {
'my-random-construct': {
type: 'aws:cloudformation:stack',
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/lib/cloud-assembly.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ export class CloudAssemblyBuilder {

// "backwards compatibility": in order for the old CLI to tell the user they
// need a new version, we'll emit the legacy manifest with only "version".
// this will result in an error "CDK Toolkit >= 0.34.0 is required in order to interact with this program."
// this will result in an error "CDK Toolkit >= CLOUD_ASSEMBLY_VERSION is required in order to interact with this program."
fs.writeFileSync(path.join(this.outdir, 'cdk.out'), JSON.stringify({ version: CLOUD_ASSEMBLY_VERSION }));

return new CloudAssembly(this.outdir);
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/lib/versioning.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import semver = require('semver');
* updated (as the current verison in package.json has already been released!)
* - The request does not have versioning yet, only the response.
*/
export const CLOUD_ASSEMBLY_VERSION = '0.34.0';
export const CLOUD_ASSEMBLY_VERSION = '0.36.0';

/**
* Look at the type of response we get and upgrade it to the latest expected version
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/__snapshots__/cloud-assembly.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Array [

exports[`empty assembly 1`] = `
Object {
"version": "0.34.0",
"version": "0.36.0",
}
`;

Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/cx-api/test/cloud-assembly.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ test('fails for invalid dependencies', () => {
});

test('verifyManifestVersion', () => {
verifyManifestVersion('0.34.0');
expect(() => verifyManifestVersion('0.31.0')).toThrow('CDK CLI can only be used with apps created by CDK >= 0.34.0');
expect(() => verifyManifestVersion('0.35.0')).toThrow('CDK CLI >= 0.35.0 is required to interact with this app');
verifyManifestVersion(CLOUD_ASSEMBLY_VERSION);
expect(() => verifyManifestVersion('0.31.0')).toThrow(`CDK CLI can only be used with apps created by CDK >= ${CLOUD_ASSEMBLY_VERSION}`);
expect(() => verifyManifestVersion('99.99.99')).toThrow(`CDK CLI >= ${CLOUD_ASSEMBLY_VERSION} is required to interact with this app`);
});
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/fixtures/assets/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.34.0",
"version": "0.36.0",
"artifacts": {
"MyStackName": {
"type": "aws:cloudformation:stack",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/fixtures/depends/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.34.0",
"version": "0.36.0",
"artifacts": {
"StackA": {
"type": "aws:cloudformation:stack",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/fixtures/empty/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "0.34.0"
"version": "0.36.0"
}
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/fixtures/invalid-artifact-type/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.34.0",
"version": "0.36.0",
"artifacts": {
"MyArt": {
"type": "who:am:i",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/fixtures/invalid-depends/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.34.0",
"version": "0.36.0",
"artifacts": {
"StackA": {
"type": "aws:cloudformation:stack",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/fixtures/invalid-env-format/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.34.0",
"version": "0.36.0",
"artifacts": {
"MyStackName": {
"type": "aws:cloudformation:stack",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/fixtures/logical-id-map/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.34.0",
"version": "0.36.0",
"artifacts": {
"MyStackName": {
"type": "aws:cloudformation:stack",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/fixtures/messages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.34.0",
"version": "0.36.0",
"artifacts": {
"MyStackName": {
"type": "aws:cloudformation:stack",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/fixtures/missing-context/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.34.0",
"version": "0.36.0",
"missing": {
"key": "missing:context:key",
"provider": "context-provider",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/fixtures/multiple-stacks/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.34.0",
"version": "0.36.0",
"artifacts": {
"MyStackName": {
"type": "aws:cloudformation:stack",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/fixtures/single-stack/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.34.0",
"version": "0.36.0",
"artifacts": {
"MyStackName": {
"type": "aws:cloudformation:stack",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cx-api/test/fixtures/stack-without-params/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.34.0",
"version": "0.36.0",
"artifacts": {
"MyStackName": {
"type": "aws:cloudformation:stack",
Expand Down