Skip to content

Commit

Permalink
chore(eks): update eks compare-log unit test to use sdk v3 (#29845)
Browse files Browse the repository at this point in the history
### Reason for this change

The AWS SDK V2 is being deprecated. We need to remove all uses of it from the CDK.

### Description of changes

The `compare-log` unit test for the `aws-eks` `compareLogging.ts` was using `CreateClusterRequest` and `LogTypes` from AWS SDK V2. I've updated the code to use the `CreateClusterRequest` and `LogType` from AWS SDK V3. Additionally, with this change, `aws-sdk` is no longer needed as a dependency for `@aws-cdk/custom-resource-handlers`.

### Description of how you validated changes

This change does not impact `compareLogging.ts`. Consequently, we just need to verify that the unit tests in `compare-log.test.ts` are still successful. I have validated that these are still passing.

### Checklist
- [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md)

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
colifran authored Apr 15, 2024
1 parent 7103fed commit 5bdf5cb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions packages/@aws-cdk/custom-resource-handlers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@
"@aws-sdk/client-synthetics": "3.421.0",
"@aws-sdk/client-ecr": "3.421.0",
"@aws-sdk/client-s3": "3.421.0",
"@aws-sdk/client-cloudwatch": "3.421.0",
"aws-sdk": "^2.1596.0"
"@aws-sdk/client-cloudwatch": "3.421.0"
},
"repository": {
"url": "https://github.com/aws/aws-cdk.git",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable import/no-extraneous-dependencies */
import * as aws from 'aws-sdk';
import { CreateClusterRequest, LogType } from '@aws-sdk/client-eks';
import { compareLoggingProps } from '../../lib/aws-eks/cluster-resource-handler/compareLogging';

/**
Expand Down Expand Up @@ -30,8 +30,8 @@ enum ClusterLoggingTypes {

describe('compareLoggingProps', () => {

type Props = Partial<aws.EKS.CreateClusterRequest>;
const oldEnabledTypes: aws.EKS.LogTypes = [ClusterLoggingTypes.API, ClusterLoggingTypes.AUDIT];
type Props = Partial<CreateClusterRequest>;
const oldEnabledTypes: LogType[] = [ClusterLoggingTypes.API, ClusterLoggingTypes.AUDIT];

test('when newProps.logging.clusterLogging is undefined, should disable all types with enabled:true in oldProps', () => {
const oldProps: Props = {
Expand Down

0 comments on commit 5bdf5cb

Please sign in to comment.