Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 29 additions & 27 deletions src/v2/components/redis/elasticache-redis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,31 @@ import * as awsx from '@pulumi/awsx-v3';
import { commonTags } from '../../../constants';
import { mergeWithDefaults } from '../../shared/merge-with-defaults';

type RedisArgs = {
vpc: pulumi.Input<awsx.ec2.Vpc>;
/**
* Version number of the cache engine to be used
* @default '7.1'
*/
engineVersion?: string;
/**
* Instance type for cache nodes
* @default 'cache.t4g.micro'
*/
nodeType?: string;
/**
* The name of the parameter group to associate with this cache cluster.
* @default 'default.redis7'
*/
parameterGroupName?: pulumi.Input<string>;
tags?: pulumi.Input<{
[key: string]: pulumi.Input<string>;
}>;
};
export namespace ElastiCacheRedis {
export type Args = {
vpc: pulumi.Input<awsx.ec2.Vpc>;
/**
* Version number of the cache engine to be used
* @default '7.1'
*/
engineVersion?: string;
/**
* Instance type for cache nodes
* @default 'cache.t4g.micro'
*/
nodeType?: string;
/**
* The name of the parameter group to associate with this cache cluster.
* @default 'default.redis7'
*/
parameterGroupName?: pulumi.Input<string>;
tags?: pulumi.Input<{
[key: string]: pulumi.Input<string>;
}>;
};
}

export const defaults = {
const defaults = {
engineVersion: '7.1',
nodeType: 'cache.t4g.micro',
parameterGroupName: 'default.redis7',
Expand All @@ -41,7 +43,7 @@ export class ElastiCacheRedis extends pulumi.ComponentResource {

constructor(
name: string,
args: RedisArgs,
args: ElastiCacheRedis.Args,
opts: pulumi.ComponentResourceOptions = {},
) {
super('studion:Redis:ElastiCache', name, {}, opts);
Expand All @@ -63,10 +65,10 @@ export class ElastiCacheRedis extends pulumi.ComponentResource {
}

private createRedisCluster(
engineVersion: RedisArgs['engineVersion'],
nodeType: RedisArgs['nodeType'],
parameterGroupName: RedisArgs['parameterGroupName'],
tags: RedisArgs['tags'],
engineVersion: ElastiCacheRedis.Args['engineVersion'],
nodeType: ElastiCacheRedis.Args['nodeType'],
parameterGroupName: ElastiCacheRedis.Args['parameterGroupName'],
tags: ElastiCacheRedis.Args['tags'],
) {
return new aws.elasticache.Cluster(
`${this.name}-cluster`,
Expand Down
13 changes: 6 additions & 7 deletions tests/redis/elasticache-redis.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
DescribeSecurityGroupsCommand,
IpPermission,
} from '@aws-sdk/client-ec2';
import { defaults as elastiCacheDefaults } from '../../src/v2/components/redis/elasticache-redis';
import { DescribeTasksCommand, ListTasksCommand } from '@aws-sdk/client-ecs';
import {
DescribeLogGroupsCommand,
Expand All @@ -32,18 +31,18 @@ export function testElastiCacheRedis(ctx: RedisTestContext) {
assert.ok(redis.subnetGroup, 'Subnet group should be defined');
assert.strictEqual(
redis.cluster.engineVersion,
elastiCacheDefaults.engineVersion,
`Engine version should be ${elastiCacheDefaults.engineVersion}`,
'7.1',
`Engine version should be '7.1'`,
);
assert.strictEqual(
redis.cluster.parameterGroupName,
elastiCacheDefaults.parameterGroupName,
`Parameter group name should be ${elastiCacheDefaults.parameterGroupName}`,
'default.redis7',
`Parameter group name should be 'default.redis7'`,
);
assert.strictEqual(
redis.cluster.nodeType,
elastiCacheDefaults.nodeType,
`Node type should be ${elastiCacheDefaults.nodeType}`,
'cache.t4g.micro',
`Node type should be 'cache.t4g.micro'`,
);
assert.strictEqual(redis.cluster.port, 6379, 'Port should be 6379');
});
Expand Down