Skip to content

Commit

Permalink
Upgrade CDK version.
Browse files Browse the repository at this point in the history
  • Loading branch information
lordjabez committed Sep 14, 2022
1 parent c4b2c25 commit 513db41
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .projenrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
copyrightOwner: 'Amazon.com, Inc. or its affiliates. All Rights Reserved.',
defaultReleaseBranch: 'main',
repositoryUrl: 'https://github.com/cdklabs/cdk-hyperledger-fabric-network.git',
cdkVersion: '2.33.0',
cdkVersion: '2.24.1',
autoApproveUpgrades: true,
autoApproveOptions: {
allowedUsernames: ['cdklabs-automation'],
Expand Down
12 changes: 9 additions & 3 deletions API.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import * as user from './user';
import * as utilities from './utilities';


/*
/**
* Define which Hyperledger Fabric framework to use
*/
export enum FrameworkVersion {
Expand All @@ -24,7 +24,7 @@ export enum FrameworkVersion {
VERSION_2_2 = '2.2',
}

/*
/**
* Starter networks are cheaper, but are limited to 2 nodes that
* can only be from a subset of types (see node.ts for the list)
*/
Expand All @@ -33,7 +33,7 @@ export enum NetworkEdition {
STANDARD = 'STANDARD',
}

/*
/**
* Constants to define ties in voting for new members
*/
export enum ThresholdComparator {
Expand Down
6 changes: 3 additions & 3 deletions src/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export interface HyperledgerFabricNodeProps {
*/
export class HyperledgerFabricNode extends constructs.Construct {

/*
/**
* Build out a list of HyperledgerFabricNode constructs given a list of input property
* objects; additionally checks to ensure node count is supported given the network type
*/
Expand Down Expand Up @@ -175,7 +175,7 @@ export class HyperledgerFabricNode extends constructs.Construct {

}

/*
/**
* Configure logging for the node via SDK call; this function
* should be merged back into the constructor once the race condition is solved
*/
Expand Down Expand Up @@ -212,7 +212,7 @@ export class HyperledgerFabricNode extends constructs.Construct {
});
}

/*
/**
* Populate the output properties that must be fetched via SDK call; this function
* should be merged back into the constructor once the race condition is solved
*/
Expand Down
20 changes: 10 additions & 10 deletions src/utilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: MIT-0


/*
/**
* Regions where Managed Blockchain is supported, for details see
* https://aws.amazon.com/managed-blockchain/pricing/hyperledger/
*/
Expand All @@ -15,7 +15,7 @@ export const SUPPORTED_REGIONS = [
'us-east-1',
];

/*
/**
* Map of supported regions to their availability zones
*/
export const SUPPORTED_AVAILABILITY_ZONES: Record<string, Array<string>> = {
Expand Down Expand Up @@ -55,24 +55,24 @@ export const SUPPORTED_AVAILABILITY_ZONES: Record<string, Array<string>> = {
],
};

/*
/**
* Starting port of the Network port range
*/
export const STARTING_PORT = 30001;

/*
/**
* Ending port of the Network port range
*/
export const ENDING_PORT = 30004;

/*
/**
* Returns the S3 Bucket and key that contains the TLS cert file
*/
export function getTlsBucket(region: string) {
return { bucketName: `${region}.managedblockchain`, key: 'etc/managedblockchain-tls-chain.pem' };
}

/*
/**
* Throw an error if provided region is not in the supported list
*/
export function validateRegion(region: string) {
Expand All @@ -82,8 +82,8 @@ export function validateRegion(region: string) {
}
}

/*
* Throw an error if provided availability is not in the supported list
/**
* Throw an error if provided availability zone is not in the supported list
*/
export function validateAvailabilityZone(region: string, availabilityZone?: string) {
const availabililtyZonesForRegion = SUPPORTED_AVAILABILITY_ZONES[region];
Expand All @@ -93,7 +93,7 @@ export function validateAvailabilityZone(region: string, availabilityZone?: stri
}
}

/*
/**
* Throw an error if provided number is not an integer, or not with the given range (inclusive)
*/
export function validateInteger(value: number, min: number, max: number) {
Expand All @@ -102,7 +102,7 @@ export function validateInteger(value: number, min: number, max: number) {
return true;
}

/*
/**
* Throw an error if provided string has length with a given range (inclusive),
* and optionally matches a provided regular expression pattern
*/
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 513db41

Please sign in to comment.