making ipam props private

aws · Aug 6, 2024 · a3d77e6 · a3d77e6
1 parent 24d2c15
commit a3d77e6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/lib/ipam.ts b/packages/@aws-cdk/aws-vpcv2-alpha/lib/ipam.ts
@@ -195,7 +195,7 @@ export interface IIpamPool{
  * IPAM scope is the highest-level container within IPAM. An IPAM contains two default scopes.
  * @see https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamscope.html
  */
-export interface IpamScopeProps extends IpamScopeOptions{
+interface IpamScopeProps extends IpamScopeOptions{
   /**
    * IPAM id to which scope needs to be added
    */
@@ -267,11 +267,6 @@ export interface IIpamScopeBase{
    */
   readonly scopeId: string;
 
-  /**
-   * Properties to configure IPAMScope
-   */
-  readonly props?: IpamScopeProps;
-
   /**
    * Defines scope type can be either default or custom
    */
@@ -370,7 +365,7 @@ class IpamScope extends Resource implements IIpamScopeBase {
   /**
    * Properties to configure ipam scope
    */
-  public readonly props: IpamScopeProps;
+  private readonly props: IpamScopeProps;
 
   /**
    * Reference to stack scope to be passed through addPool method inorder to create a new IpamPool

diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/lib/vpc-v2.ts b/packages/@aws-cdk/aws-vpcv2-alpha/lib/vpc-v2.ts
@@ -4,7 +4,6 @@ import { Construct, DependencyGroup, IDependable } from 'constructs';
 import { IpamOptions, IIpamPool } from './ipam';
 import { VpcV2Base } from './vpc-v2-base';
 import { md5hash } from 'aws-cdk-lib/core/lib/helpers-internal';
-
 /**
  * IpAddress options to define VPC V2
  */
@@ -292,10 +291,10 @@ export class VpcV2 extends VpcV2Base {
 
       let ipCount = 0;
       for (const secondaryAddressBlock of secondaryAddressBlocks) {
-
         //Counter to generate a random string for input to hash function
         ipCount+=1;
         const hash = pathHash('Secondary'+ipCount);
+
         const secondaryVpcOptions: VpcCidrOptions = secondaryAddressBlock.allocateVpcCidr();
 
         if (secondaryVpcOptions.amazonProvided || secondaryVpcOptions.ipv6IpamPool) {
@@ -475,4 +474,14 @@ function validateIpv4address(cidr1?: string, cidr2?: string): boolean {
 function pathHash(path: string): string {
   const md5 = md5hash(path);
   return md5.slice(0, 4).toUpperCase();
-}
+}
+
+// function generateRandomString(length: number): string {
+//   const pattern = /[a-zA-Z0-9]/;
+//   const characters = pattern.source.replace(/\\/g, '');;
+//   let result = '';
+//   for (let i = 0; i < length; i++) {
+//     result += characters.charAt(Math.floor(Math.random() * characters.length));
+//   }
+//   return result;
+// }
diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/manifest.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/manifest.json
diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/vpc-v2.test.ts b/packages/@aws-cdk/aws-vpcv2-alpha/test/vpc-v2.test.ts
@@ -2,7 +2,6 @@ import { Template } from 'aws-cdk-lib/assertions';
 import * as cdk from 'aws-cdk-lib';
 import * as vpc from '../lib/vpc-v2';
 import { AddressFamily, AwsServiceName, Ipam, IpamPoolPublicIpSource } from '../lib';
-
 describe('Vpc V2 with full control', () => {
   let stack: cdk.Stack;