@fjall/components-infrastructure 0.81.2 → 0.83.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/app.d.ts +5 -0
- package/dist/lib/app.js +31 -1
- package/dist/lib/config/aws/ecrDefaultImage.js +23 -21
- package/dist/lib/patterns/aws/cicdRole.d.ts +67 -0
- package/dist/lib/patterns/aws/cicdRole.js +68 -0
- package/dist/lib/patterns/aws/compute.d.ts +29 -21
- package/dist/lib/patterns/aws/compute.js +10 -3
- package/dist/lib/patterns/aws/database.d.ts +1 -0
- package/dist/lib/patterns/aws/database.js +33 -3
- package/dist/lib/patterns/aws/storage.d.ts +1 -0
- package/dist/lib/patterns/aws/storage.js +23 -1
- package/dist/lib/resources/aws/cicd/cicdRole.d.ts +65 -0
- package/dist/lib/resources/aws/cicd/cicdRole.js +191 -0
- package/dist/lib/resources/aws/compute/ecs.d.ts +50 -2
- package/dist/lib/resources/aws/compute/ecs.js +134 -18
- package/dist/lib/resources/aws/monitoring/monitoringRole.js +61 -4
- package/package.json +3 -3
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.S3Storage = exports.StorageFactory = void 0;
|
|
4
4
|
const constructs_1 = require("constructs");
|
|
5
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
6
|
const storage_1 = require("../../resources/aws/storage");
|
|
6
7
|
class StorageFactory {
|
|
7
8
|
static build(id, props) {
|
|
@@ -45,6 +46,7 @@ class S3Storage extends constructs_1.Construct {
|
|
|
45
46
|
encryptionKey: props.kmsKeyArn ? undefined : undefined, // KMS key handling
|
|
46
47
|
publicReadAccess: props.publicReadAccess
|
|
47
48
|
});
|
|
49
|
+
this.addOutputs();
|
|
48
50
|
}
|
|
49
51
|
addWebsiteBucket(props) {
|
|
50
52
|
this.bucket = new storage_1.S3WebsiteBucket(this, `${this.id}Bucket`, {
|
|
@@ -55,6 +57,7 @@ class S3Storage extends constructs_1.Construct {
|
|
|
55
57
|
websiteErrorDocument: props.websiteErrorDocument,
|
|
56
58
|
cors: props.cors
|
|
57
59
|
});
|
|
60
|
+
this.addOutputs();
|
|
58
61
|
}
|
|
59
62
|
addPublicReadBucket(props) {
|
|
60
63
|
this.bucket = new storage_1.S3PublicReadBucket(this, `${this.id}Bucket`, {
|
|
@@ -62,6 +65,25 @@ class S3Storage extends constructs_1.Construct {
|
|
|
62
65
|
versioned: props.versioned,
|
|
63
66
|
encryption: props.encryption
|
|
64
67
|
});
|
|
68
|
+
this.addOutputs();
|
|
69
|
+
}
|
|
70
|
+
addOutputs() {
|
|
71
|
+
const stackName = aws_cdk_lib_1.Stack.of(this).stackName;
|
|
72
|
+
// Export bucket ARN for monitoring
|
|
73
|
+
// Use stack name prefix to ensure uniqueness across apps in same region
|
|
74
|
+
new aws_cdk_lib_1.CfnOutput(this, `${this.id}BucketArn`, {
|
|
75
|
+
key: `${stackName}${this.id}BucketArn`,
|
|
76
|
+
exportName: `${stackName}${this.id}BucketArn`,
|
|
77
|
+
value: this.bucket.bucketArn,
|
|
78
|
+
description: `S3 Bucket ARN for ${this.id}`
|
|
79
|
+
});
|
|
80
|
+
// Export bucket name for convenience
|
|
81
|
+
new aws_cdk_lib_1.CfnOutput(this, `${this.id}BucketName`, {
|
|
82
|
+
key: `${stackName}${this.id}BucketName`,
|
|
83
|
+
exportName: `${stackName}${this.id}BucketName`,
|
|
84
|
+
value: this.bucket.bucketName,
|
|
85
|
+
description: `S3 Bucket Name for ${this.id}`
|
|
86
|
+
});
|
|
65
87
|
}
|
|
66
88
|
getBucket() {
|
|
67
89
|
return this.bucket;
|
|
@@ -77,4 +99,4 @@ class S3Storage extends constructs_1.Construct {
|
|
|
77
99
|
}
|
|
78
100
|
}
|
|
79
101
|
exports.S3Storage = S3Storage;
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/storage.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport { type IBucket } from \"aws-cdk-lib/aws-s3\";\nimport { CfnOutput, Stack } from \"aws-cdk-lib\";\n\nimport type App from \"../../app\";\nimport {\n  S3Bucket,\n  S3WebsiteBucket,\n  S3PublicReadBucket,\n  type BackupVaultTier\n} from \"../../resources/aws/storage\";\n\ntype S3BucketType = \"private\" | \"website\" | \"publicRead\";\n\ntype BaseS3Props = {\n  backupVaultTier?: BackupVaultTier;\n  versioned?: boolean;\n  encryption?: \"AES256\" | \"KMS\";\n  kmsKeyArn?: string;\n};\n\nexport interface PrivateS3Props extends BaseS3Props {\n  bucketType: \"private\";\n  publicReadAccess?: boolean;\n}\n\nexport interface WebsiteS3Props extends BaseS3Props {\n  bucketType: \"website\";\n  websiteIndexDocument?: string;\n  websiteErrorDocument?: string;\n  cors?: Array<{\n    allowedOrigins: string[];\n    allowedMethods: string[];\n  }>;\n}\n\nexport interface PublicReadS3Props extends BaseS3Props {\n  bucketType: \"publicRead\";\n}\n\nexport type IS3Props = PrivateS3Props | WebsiteS3Props | PublicReadS3Props;\n\nexport class StorageFactory {\n  static build<T extends IS3Props>(id: string, props: T) {\n    return (app: App, scope: Construct) => {\n      return new S3Storage(scope, id, props);\n    };\n  }\n}\n\nexport class S3Storage extends Construct {\n  public id: string;\n  public scope: Construct;\n\n  private bucket: S3Bucket | S3WebsiteBucket | S3PublicReadBucket;\n  private bucketType: S3BucketType;\n\n  constructor(scope: Construct, id: string, props: IS3Props) {\n    super(scope, id);\n    this.id = id;\n    this.scope = scope;\n    this.bucketType = props.bucketType;\n\n    this.addS3Bucket(props);\n  }\n\n  addS3Bucket(props: IS3Props) {\n    switch (props.bucketType) {\n      case \"private\":\n        this.addPrivateBucket(props);\n        break;\n      case \"website\":\n        this.addWebsiteBucket(props);\n        break;\n      case \"publicRead\":\n        this.addPublicReadBucket(props);\n        break;\n      default: {\n        // Exhaustiveness check\n        const _exhaustive: never = props;\n        throw new Error(\n          `Unsupported S3 bucket type ${(props as any).bucketType}`\n        );\n      }\n    }\n  }\n\n  private addPrivateBucket(props: PrivateS3Props) {\n    this.bucket = new S3Bucket(this, `${this.id}Bucket`, {\n      backupVaultTier: props.backupVaultTier,\n      versioned: props.versioned,\n      encryption: props.encryption as any,\n      encryptionKey: props.kmsKeyArn ? undefined : undefined, // KMS key handling\n      publicReadAccess: props.publicReadAccess\n    });\n    this.addOutputs();\n  }\n\n  private addWebsiteBucket(props: WebsiteS3Props) {\n    this.bucket = new S3WebsiteBucket(this, `${this.id}Bucket`, {\n      backupVaultTier: props.backupVaultTier,\n      versioned: props.versioned,\n      encryption: props.encryption as any,\n      websiteIndexDocument: props.websiteIndexDocument,\n      websiteErrorDocument: props.websiteErrorDocument,\n      cors: props.cors as any\n    });\n    this.addOutputs();\n  }\n\n  private addPublicReadBucket(props: PublicReadS3Props) {\n    this.bucket = new S3PublicReadBucket(this, `${this.id}Bucket`, {\n      backupVaultTier: props.backupVaultTier,\n      versioned: props.versioned,\n      encryption: props.encryption as any\n    });\n    this.addOutputs();\n  }\n\n  private addOutputs() {\n    const stackName = Stack.of(this).stackName;\n\n    // Export bucket ARN for monitoring\n    // Use stack name prefix to ensure uniqueness across apps in same region\n    new CfnOutput(this, `${this.id}BucketArn`, {\n      key: `${stackName}${this.id}BucketArn`,\n      exportName: `${stackName}${this.id}BucketArn`,\n      value: this.bucket.bucketArn,\n      description: `S3 Bucket ARN for ${this.id}`\n    });\n\n    // Export bucket name for convenience\n    new CfnOutput(this, `${this.id}BucketName`, {\n      key: `${stackName}${this.id}BucketName`,\n      exportName: `${stackName}${this.id}BucketName`,\n      value: this.bucket.bucketName,\n      description: `S3 Bucket Name for ${this.id}`\n    });\n  }\n\n  getBucket(): IBucket {\n    return this.bucket;\n  }\n\n  getBucketName(): string {\n    return this.bucket.bucketName;\n  }\n\n  getBucketArn(): string {\n    return this.bucket.bucketArn;\n  }\n\n  getBucketType(): S3BucketType {\n    return this.bucketType;\n  }\n}\n"]}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { Role, PolicyStatement } from "aws-cdk-lib/aws-iam";
|
|
2
|
+
import { type Construct } from "constructs";
|
|
3
|
+
/**
|
|
4
|
+
* Supported CI/CD providers
|
|
5
|
+
*/
|
|
6
|
+
export type CICDProvider = "github-actions" | "buildkite" | "gitlab-ci";
|
|
7
|
+
/**
|
|
8
|
+
* Configuration for creating a CI/CD deploy role
|
|
9
|
+
*/
|
|
10
|
+
export interface CICDRoleConfig {
|
|
11
|
+
/**
|
|
12
|
+
* The CI/CD provider (github-actions, buildkite, gitlab-ci)
|
|
13
|
+
*/
|
|
14
|
+
provider: CICDProvider;
|
|
15
|
+
/**
|
|
16
|
+
* The application name to scope the role's permissions to
|
|
17
|
+
*/
|
|
18
|
+
appName: string;
|
|
19
|
+
/**
|
|
20
|
+
* For GitHub Actions: repository (org/repo)
|
|
21
|
+
* For Buildkite: organization slug
|
|
22
|
+
* For GitLab CI: project path (group/project)
|
|
23
|
+
*/
|
|
24
|
+
repositoryOrOrg: string;
|
|
25
|
+
/**
|
|
26
|
+
* Optional role name. Defaults to "FjallDeploy-{provider}-{appName}"
|
|
27
|
+
*/
|
|
28
|
+
roleName?: string;
|
|
29
|
+
/**
|
|
30
|
+
* Optional IAM path for the role. Defaults to "/"
|
|
31
|
+
*/
|
|
32
|
+
rolePath?: string;
|
|
33
|
+
/**
|
|
34
|
+
* Optional custom permissions. If not provided, default deployment permissions will be used.
|
|
35
|
+
*/
|
|
36
|
+
customPermissions?: PolicyStatement[];
|
|
37
|
+
/**
|
|
38
|
+
* Whether to use existing OIDC provider or create a new one
|
|
39
|
+
* If true, will look for existing provider by URL
|
|
40
|
+
*/
|
|
41
|
+
useExistingProvider?: boolean;
|
|
42
|
+
/**
|
|
43
|
+
* Optional ARN of existing OIDC provider (skips creation)
|
|
44
|
+
*/
|
|
45
|
+
existingProviderArn?: string;
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Factory to build a CI/CD deploy IAM role with OIDC authentication.
|
|
49
|
+
* Creates both the OIDC provider (if needed) and the deploy role with appropriate permissions.
|
|
50
|
+
*/
|
|
51
|
+
export declare class CICDRoleFactory {
|
|
52
|
+
/**
|
|
53
|
+
* Build a CI/CD deploy role with OIDC authentication
|
|
54
|
+
*/
|
|
55
|
+
static build(id: string, config: CICDRoleConfig): (app: Construct, scope: Construct) => Role;
|
|
56
|
+
/**
|
|
57
|
+
* Build trust policy conditions based on CI/CD provider
|
|
58
|
+
*/
|
|
59
|
+
private static buildTrustConditions;
|
|
60
|
+
/**
|
|
61
|
+
* Add default deployment permissions to the role
|
|
62
|
+
*/
|
|
63
|
+
private static addDefaultDeployPermissions;
|
|
64
|
+
}
|
|
65
|
+
export default CICDRoleFactory;
|
|
@@ -0,0 +1,191 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CICDRoleFactory = void 0;
|
|
4
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
|
+
const aws_iam_1 = require("aws-cdk-lib/aws-iam");
|
|
6
|
+
/**
|
|
7
|
+
* OIDC provider configurations for different CI/CD systems
|
|
8
|
+
*/
|
|
9
|
+
const OIDC_CONFIGS = {
|
|
10
|
+
"github-actions": {
|
|
11
|
+
url: "https://token.actions.githubusercontent.com",
|
|
12
|
+
clientIds: ["sts.amazonaws.com"],
|
|
13
|
+
thumbprints: [
|
|
14
|
+
"6938fd4d98bab03faadb97b34396831e3780aea1",
|
|
15
|
+
"1c58a3a8518e8759bf075b76b750d4f2df264fcd"
|
|
16
|
+
]
|
|
17
|
+
},
|
|
18
|
+
buildkite: {
|
|
19
|
+
url: "https://agent.buildkite.com",
|
|
20
|
+
clientIds: ["sts.amazonaws.com"],
|
|
21
|
+
thumbprints: ["9e99a48a9960b14926bb7f3b02e22da2b0ab7280"]
|
|
22
|
+
},
|
|
23
|
+
"gitlab-ci": {
|
|
24
|
+
url: "https://gitlab.com",
|
|
25
|
+
clientIds: ["https://gitlab.com"],
|
|
26
|
+
thumbprints: ["b3dd7606d2b5a8b4a13771dbecc9ee1cecafa38a"]
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
/**
|
|
30
|
+
* Factory to build a CI/CD deploy IAM role with OIDC authentication.
|
|
31
|
+
* Creates both the OIDC provider (if needed) and the deploy role with appropriate permissions.
|
|
32
|
+
*/
|
|
33
|
+
class CICDRoleFactory {
|
|
34
|
+
/**
|
|
35
|
+
* Build a CI/CD deploy role with OIDC authentication
|
|
36
|
+
*/
|
|
37
|
+
static build(id, config) {
|
|
38
|
+
return (_app, scope) => {
|
|
39
|
+
const providerConfig = OIDC_CONFIGS[config.provider];
|
|
40
|
+
const roleName = config.roleName || `FjallDeploy-${config.provider}-${config.appName}`;
|
|
41
|
+
// Create or reference OIDC provider
|
|
42
|
+
let oidcProvider;
|
|
43
|
+
if (config.existingProviderArn) {
|
|
44
|
+
// Use existing provider by ARN
|
|
45
|
+
oidcProvider = aws_iam_1.OpenIdConnectProvider.fromOpenIdConnectProviderArn(scope, `${id}OidcProvider`, config.existingProviderArn);
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
// Create new OIDC provider
|
|
49
|
+
oidcProvider = new aws_iam_1.OpenIdConnectProvider(scope, `${id}OidcProvider`, {
|
|
50
|
+
url: providerConfig.url,
|
|
51
|
+
clientIds: providerConfig.clientIds,
|
|
52
|
+
thumbprints: providerConfig.thumbprints
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
// Build trust policy conditions based on provider
|
|
56
|
+
const conditions = this.buildTrustConditions(config.provider, config.repositoryOrOrg, oidcProvider.openIdConnectProviderIssuer);
|
|
57
|
+
// Create the role with OIDC web identity principal
|
|
58
|
+
const role = new aws_iam_1.Role(scope, id, {
|
|
59
|
+
roleName: roleName,
|
|
60
|
+
path: config.rolePath || "/",
|
|
61
|
+
assumedBy: new aws_iam_1.WebIdentityPrincipal(oidcProvider.openIdConnectProviderArn, conditions),
|
|
62
|
+
description: `CI/CD deploy role for ${config.provider} - ${config.appName}`
|
|
63
|
+
});
|
|
64
|
+
// Add permissions
|
|
65
|
+
if (config.customPermissions) {
|
|
66
|
+
config.customPermissions.forEach((statement) => {
|
|
67
|
+
role.addToPolicy(statement);
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
this.addDefaultDeployPermissions(role);
|
|
72
|
+
}
|
|
73
|
+
// Export the role ARN
|
|
74
|
+
new aws_cdk_lib_1.CfnOutput(scope, `${id}Arn`, {
|
|
75
|
+
value: role.roleArn,
|
|
76
|
+
description: `ARN of the CI/CD deploy role for ${config.appName}`,
|
|
77
|
+
exportName: `${config.appName}-CICDRoleArn`
|
|
78
|
+
});
|
|
79
|
+
// Export the OIDC provider ARN
|
|
80
|
+
new aws_cdk_lib_1.CfnOutput(scope, `${id}ProviderArn`, {
|
|
81
|
+
value: oidcProvider.openIdConnectProviderArn,
|
|
82
|
+
description: `ARN of the OIDC provider for ${config.provider}`,
|
|
83
|
+
exportName: `${config.appName}-CICDProviderArn`
|
|
84
|
+
});
|
|
85
|
+
return role;
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
* Build trust policy conditions based on CI/CD provider
|
|
90
|
+
*/
|
|
91
|
+
static buildTrustConditions(provider, repositoryOrOrg, issuer) {
|
|
92
|
+
const conditions = {
|
|
93
|
+
StringEquals: {
|
|
94
|
+
[`${issuer}:aud`]: OIDC_CONFIGS[provider].clientIds[0]
|
|
95
|
+
}
|
|
96
|
+
};
|
|
97
|
+
// Add provider-specific subject claim conditions
|
|
98
|
+
switch (provider) {
|
|
99
|
+
case "github-actions":
|
|
100
|
+
conditions.StringLike = {
|
|
101
|
+
[`${issuer}:sub`]: `repo:${repositoryOrOrg}:*`
|
|
102
|
+
};
|
|
103
|
+
break;
|
|
104
|
+
case "buildkite":
|
|
105
|
+
conditions.StringLike = {
|
|
106
|
+
[`${issuer}:sub`]: `organization:${repositoryOrOrg}:*`
|
|
107
|
+
};
|
|
108
|
+
break;
|
|
109
|
+
case "gitlab-ci":
|
|
110
|
+
conditions.StringLike = {
|
|
111
|
+
[`${issuer}:sub`]: `project_path:${repositoryOrOrg}:*`
|
|
112
|
+
};
|
|
113
|
+
break;
|
|
114
|
+
}
|
|
115
|
+
return conditions;
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* Add default deployment permissions to the role
|
|
119
|
+
*/
|
|
120
|
+
static addDefaultDeployPermissions(role) {
|
|
121
|
+
// CloudFormation permissions for CDK deployments
|
|
122
|
+
role.addToPolicy(new aws_iam_1.PolicyStatement({
|
|
123
|
+
effect: aws_iam_1.Effect.ALLOW,
|
|
124
|
+
actions: ["cloudformation:*"],
|
|
125
|
+
resources: ["*"]
|
|
126
|
+
}));
|
|
127
|
+
// S3 permissions for CDK assets
|
|
128
|
+
role.addToPolicy(new aws_iam_1.PolicyStatement({
|
|
129
|
+
effect: aws_iam_1.Effect.ALLOW,
|
|
130
|
+
actions: ["s3:*"],
|
|
131
|
+
resources: ["*"]
|
|
132
|
+
}));
|
|
133
|
+
// ECR permissions for container images
|
|
134
|
+
role.addToPolicy(new aws_iam_1.PolicyStatement({
|
|
135
|
+
effect: aws_iam_1.Effect.ALLOW,
|
|
136
|
+
actions: ["ecr:*"],
|
|
137
|
+
resources: ["*"]
|
|
138
|
+
}));
|
|
139
|
+
// ECS permissions for service deployments
|
|
140
|
+
role.addToPolicy(new aws_iam_1.PolicyStatement({
|
|
141
|
+
effect: aws_iam_1.Effect.ALLOW,
|
|
142
|
+
actions: ["ecs:*"],
|
|
143
|
+
resources: ["*"]
|
|
144
|
+
}));
|
|
145
|
+
// CloudWatch Logs permissions
|
|
146
|
+
role.addToPolicy(new aws_iam_1.PolicyStatement({
|
|
147
|
+
effect: aws_iam_1.Effect.ALLOW,
|
|
148
|
+
actions: ["logs:*"],
|
|
149
|
+
resources: ["*"]
|
|
150
|
+
}));
|
|
151
|
+
// IAM permissions for role management
|
|
152
|
+
role.addToPolicy(new aws_iam_1.PolicyStatement({
|
|
153
|
+
effect: aws_iam_1.Effect.ALLOW,
|
|
154
|
+
actions: [
|
|
155
|
+
"iam:PassRole",
|
|
156
|
+
"iam:GetRole",
|
|
157
|
+
"iam:CreateRole",
|
|
158
|
+
"iam:DeleteRole",
|
|
159
|
+
"iam:AttachRolePolicy",
|
|
160
|
+
"iam:DetachRolePolicy",
|
|
161
|
+
"iam:PutRolePolicy",
|
|
162
|
+
"iam:DeleteRolePolicy"
|
|
163
|
+
],
|
|
164
|
+
resources: ["*"]
|
|
165
|
+
}));
|
|
166
|
+
// SSM and Secrets Manager for runtime configuration
|
|
167
|
+
role.addToPolicy(new aws_iam_1.PolicyStatement({
|
|
168
|
+
effect: aws_iam_1.Effect.ALLOW,
|
|
169
|
+
actions: [
|
|
170
|
+
"ssm:GetParameter",
|
|
171
|
+
"ssm:GetParameters",
|
|
172
|
+
"secretsmanager:GetSecretValue"
|
|
173
|
+
],
|
|
174
|
+
resources: ["*"]
|
|
175
|
+
}));
|
|
176
|
+
// EC2 permissions for VPC/networking queries
|
|
177
|
+
role.addToPolicy(new aws_iam_1.PolicyStatement({
|
|
178
|
+
effect: aws_iam_1.Effect.ALLOW,
|
|
179
|
+
actions: [
|
|
180
|
+
"ec2:DescribeAvailabilityZones",
|
|
181
|
+
"ec2:DescribeVpcs",
|
|
182
|
+
"ec2:DescribeSubnets",
|
|
183
|
+
"ec2:DescribeSecurityGroups"
|
|
184
|
+
],
|
|
185
|
+
resources: ["*"]
|
|
186
|
+
}));
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
exports.CICDRoleFactory = CICDRoleFactory;
|
|
190
|
+
exports.default = CICDRoleFactory;
|
|
191
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cicdRole.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/cicd/cicdRole.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput } from \"aws-cdk-lib\";\nimport {\n  Role,\n  WebIdentityPrincipal,\n  OpenIdConnectProvider,\n  PolicyStatement,\n  Effect\n} from \"aws-cdk-lib/aws-iam\";\nimport { type Construct } from \"constructs\";\n\n/**\n * Supported CI/CD providers\n */\nexport type CICDProvider = \"github-actions\" | \"buildkite\" | \"gitlab-ci\";\n\n/**\n * OIDC provider configuration\n */\ninterface OIDCProviderConfig {\n  url: string;\n  clientIds: string[];\n  thumbprints: string[];\n}\n\n/**\n * Configuration for creating a CI/CD deploy role\n */\nexport interface CICDRoleConfig {\n  /**\n   * The CI/CD provider (github-actions, buildkite, gitlab-ci)\n   */\n  provider: CICDProvider;\n\n  /**\n   * The application name to scope the role's permissions to\n   */\n  appName: string;\n\n  /**\n   * For GitHub Actions: repository (org/repo)\n   * For Buildkite: organization slug\n   * For GitLab CI: project path (group/project)\n   */\n  repositoryOrOrg: string;\n\n  /**\n   * Optional role name. Defaults to \"FjallDeploy-{provider}-{appName}\"\n   */\n  roleName?: string;\n\n  /**\n   * Optional IAM path for the role. Defaults to \"/\"\n   */\n  rolePath?: string;\n\n  /**\n   * Optional custom permissions. If not provided, default deployment permissions will be used.\n   */\n  customPermissions?: PolicyStatement[];\n\n  /**\n   * Whether to use existing OIDC provider or create a new one\n   * If true, will look for existing provider by URL\n   */\n  useExistingProvider?: boolean;\n\n  /**\n   * Optional ARN of existing OIDC provider (skips creation)\n   */\n  existingProviderArn?: string;\n}\n\n/**\n * OIDC provider configurations for different CI/CD systems\n */\nconst OIDC_CONFIGS: Record<CICDProvider, OIDCProviderConfig> = {\n  \"github-actions\": {\n    url: \"https://token.actions.githubusercontent.com\",\n    clientIds: [\"sts.amazonaws.com\"],\n    thumbprints: [\n      \"6938fd4d98bab03faadb97b34396831e3780aea1\",\n      \"1c58a3a8518e8759bf075b76b750d4f2df264fcd\"\n    ]\n  },\n  buildkite: {\n    url: \"https://agent.buildkite.com\",\n    clientIds: [\"sts.amazonaws.com\"],\n    thumbprints: [\"9e99a48a9960b14926bb7f3b02e22da2b0ab7280\"]\n  },\n  \"gitlab-ci\": {\n    url: \"https://gitlab.com\",\n    clientIds: [\"https://gitlab.com\"],\n    thumbprints: [\"b3dd7606d2b5a8b4a13771dbecc9ee1cecafa38a\"]\n  }\n};\n\n/**\n * Factory to build a CI/CD deploy IAM role with OIDC authentication.\n * Creates both the OIDC provider (if needed) and the deploy role with appropriate permissions.\n */\nexport class CICDRoleFactory {\n  /**\n   * Build a CI/CD deploy role with OIDC authentication\n   */\n  public static build(\n    id: string,\n    config: CICDRoleConfig\n  ): (app: Construct, scope: Construct) => Role {\n    return (_app: Construct, scope: Construct) => {\n      const providerConfig = OIDC_CONFIGS[config.provider];\n      const roleName =\n        config.roleName || `FjallDeploy-${config.provider}-${config.appName}`;\n\n      // Create or reference OIDC provider\n      let oidcProvider: OpenIdConnectProvider;\n\n      if (config.existingProviderArn) {\n        // Use existing provider by ARN\n        oidcProvider = OpenIdConnectProvider.fromOpenIdConnectProviderArn(\n          scope,\n          `${id}OidcProvider`,\n          config.existingProviderArn\n        );\n      } else {\n        // Create new OIDC provider\n        oidcProvider = new OpenIdConnectProvider(scope, `${id}OidcProvider`, {\n          url: providerConfig.url,\n          clientIds: providerConfig.clientIds,\n          thumbprints: providerConfig.thumbprints\n        });\n      }\n\n      // Build trust policy conditions based on provider\n      const conditions = this.buildTrustConditions(\n        config.provider,\n        config.repositoryOrOrg,\n        oidcProvider.openIdConnectProviderIssuer\n      );\n\n      // Create the role with OIDC web identity principal\n      const role = new Role(scope, id, {\n        roleName: roleName,\n        path: config.rolePath || \"/\",\n        assumedBy: new WebIdentityPrincipal(\n          oidcProvider.openIdConnectProviderArn,\n          conditions\n        ),\n        description: `CI/CD deploy role for ${config.provider} - ${config.appName}`\n      });\n\n      // Add permissions\n      if (config.customPermissions) {\n        config.customPermissions.forEach((statement) => {\n          role.addToPolicy(statement);\n        });\n      } else {\n        this.addDefaultDeployPermissions(role);\n      }\n\n      // Export the role ARN\n      new CfnOutput(scope, `${id}Arn`, {\n        value: role.roleArn,\n        description: `ARN of the CI/CD deploy role for ${config.appName}`,\n        exportName: `${config.appName}-CICDRoleArn`\n      });\n\n      // Export the OIDC provider ARN\n      new CfnOutput(scope, `${id}ProviderArn`, {\n        value: oidcProvider.openIdConnectProviderArn,\n        description: `ARN of the OIDC provider for ${config.provider}`,\n        exportName: `${config.appName}-CICDProviderArn`\n      });\n\n      return role;\n    };\n  }\n\n  /**\n   * Build trust policy conditions based on CI/CD provider\n   */\n  private static buildTrustConditions(\n    provider: CICDProvider,\n    repositoryOrOrg: string,\n    issuer: string\n  ): Record<string, unknown> {\n    const conditions: Record<string, unknown> = {\n      StringEquals: {\n        [`${issuer}:aud`]: OIDC_CONFIGS[provider].clientIds[0]\n      }\n    };\n\n    // Add provider-specific subject claim conditions\n    switch (provider) {\n      case \"github-actions\":\n        conditions.StringLike = {\n          [`${issuer}:sub`]: `repo:${repositoryOrOrg}:*`\n        };\n        break;\n\n      case \"buildkite\":\n        conditions.StringLike = {\n          [`${issuer}:sub`]: `organization:${repositoryOrOrg}:*`\n        };\n        break;\n\n      case \"gitlab-ci\":\n        conditions.StringLike = {\n          [`${issuer}:sub`]: `project_path:${repositoryOrOrg}:*`\n        };\n        break;\n    }\n\n    return conditions;\n  }\n\n  /**\n   * Add default deployment permissions to the role\n   */\n  private static addDefaultDeployPermissions(role: Role): void {\n    // CloudFormation permissions for CDK deployments\n    role.addToPolicy(\n      new PolicyStatement({\n        effect: Effect.ALLOW,\n        actions: [\"cloudformation:*\"],\n        resources: [\"*\"]\n      })\n    );\n\n    // S3 permissions for CDK assets\n    role.addToPolicy(\n      new PolicyStatement({\n        effect: Effect.ALLOW,\n        actions: [\"s3:*\"],\n        resources: [\"*\"]\n      })\n    );\n\n    // ECR permissions for container images\n    role.addToPolicy(\n      new PolicyStatement({\n        effect: Effect.ALLOW,\n        actions: [\"ecr:*\"],\n        resources: [\"*\"]\n      })\n    );\n\n    // ECS permissions for service deployments\n    role.addToPolicy(\n      new PolicyStatement({\n        effect: Effect.ALLOW,\n        actions: [\"ecs:*\"],\n        resources: [\"*\"]\n      })\n    );\n\n    // CloudWatch Logs permissions\n    role.addToPolicy(\n      new PolicyStatement({\n        effect: Effect.ALLOW,\n        actions: [\"logs:*\"],\n        resources: [\"*\"]\n      })\n    );\n\n    // IAM permissions for role management\n    role.addToPolicy(\n      new PolicyStatement({\n        effect: Effect.ALLOW,\n        actions: [\n          \"iam:PassRole\",\n          \"iam:GetRole\",\n          \"iam:CreateRole\",\n          \"iam:DeleteRole\",\n          \"iam:AttachRolePolicy\",\n          \"iam:DetachRolePolicy\",\n          \"iam:PutRolePolicy\",\n          \"iam:DeleteRolePolicy\"\n        ],\n        resources: [\"*\"]\n      })\n    );\n\n    // SSM and Secrets Manager for runtime configuration\n    role.addToPolicy(\n      new PolicyStatement({\n        effect: Effect.ALLOW,\n        actions: [\n          \"ssm:GetParameter\",\n          \"ssm:GetParameters\",\n          \"secretsmanager:GetSecretValue\"\n        ],\n        resources: [\"*\"]\n      })\n    );\n\n    // EC2 permissions for VPC/networking queries\n    role.addToPolicy(\n      new PolicyStatement({\n        effect: Effect.ALLOW,\n        actions: [\n          \"ec2:DescribeAvailabilityZones\",\n          \"ec2:DescribeVpcs\",\n          \"ec2:DescribeSubnets\",\n          \"ec2:DescribeSecurityGroups\"\n        ],\n        resources: [\"*\"]\n      })\n    );\n  }\n}\n\nexport default CICDRoleFactory;\n"]}
|
|
@@ -27,10 +27,12 @@ export interface Ec2CapacityConfig {
|
|
|
27
27
|
instanceType?: string;
|
|
28
28
|
/** AMI hardware type. Default: "ARM" (Graviton - better cost/performance) */
|
|
29
29
|
amiHardwareType?: "ARM" | "STANDARD";
|
|
30
|
-
/** Minimum number of instances. Default:
|
|
30
|
+
/** Minimum number of instances. Default: 1 */
|
|
31
31
|
minCapacity?: number;
|
|
32
32
|
/** Maximum number of instances. Default: 3 */
|
|
33
33
|
maxCapacity?: number;
|
|
34
|
+
/** Desired number of EC2 instances. Default: 2 (for availability) */
|
|
35
|
+
desiredCount?: number;
|
|
34
36
|
/** Memory limit in MiB for the container. Default: 1024 */
|
|
35
37
|
memoryLimitMiB?: number;
|
|
36
38
|
}
|
|
@@ -87,10 +89,18 @@ export interface EcsClusterContainerConfig {
|
|
|
87
89
|
port?: number;
|
|
88
90
|
/** Environment variables */
|
|
89
91
|
environment?: Record<string, string>;
|
|
90
|
-
/** Secrets imported from other resources */
|
|
92
|
+
/** Secrets imported from other resources (AWS Secrets Manager) */
|
|
91
93
|
secretsImport?: {
|
|
92
94
|
[key: string]: SecretImport;
|
|
93
95
|
};
|
|
96
|
+
/**
|
|
97
|
+
* Secrets from AWS SSM Parameter Store.
|
|
98
|
+
* Array of secret names that will be fetched from the service's SSM namespace.
|
|
99
|
+
*
|
|
100
|
+
* @example
|
|
101
|
+
* ssmSecrets: ["API_KEY", "DB_PASSWORD"]
|
|
102
|
+
*/
|
|
103
|
+
ssmSecrets?: string[];
|
|
94
104
|
/** Command to run in the container */
|
|
95
105
|
command?: string[];
|
|
96
106
|
/** Entry point for the container */
|
|
@@ -221,6 +231,15 @@ export interface EcsServiceProps {
|
|
|
221
231
|
* Services with matching ec2Config share an ASG for efficiency.
|
|
222
232
|
*/
|
|
223
233
|
ec2Config?: Ec2CapacityConfig;
|
|
234
|
+
/**
|
|
235
|
+
* SSM Parameter Store path for secrets.
|
|
236
|
+
* If containers have ssmSecrets defined, this path is used as the base path.
|
|
237
|
+
* Format: /<app>/<cluster>/<service>
|
|
238
|
+
*
|
|
239
|
+
* @example
|
|
240
|
+
* ssmSecretsPath: "/myapp/api-cluster/users"
|
|
241
|
+
*/
|
|
242
|
+
ssmSecretsPath?: string;
|
|
224
243
|
}
|
|
225
244
|
/**
|
|
226
245
|
* Props for creating an ECS cluster with multiple services.
|
|
@@ -228,6 +247,12 @@ export interface EcsServiceProps {
|
|
|
228
247
|
export type EcsClusterProps = {
|
|
229
248
|
/** Cluster name */
|
|
230
249
|
clusterName: string;
|
|
250
|
+
/**
|
|
251
|
+
* Application name for SSM secrets namespace.
|
|
252
|
+
* Required when any container uses ssmSecrets without explicit ssmSecretsPath.
|
|
253
|
+
* Used to build the path: /<appName>/<clusterName>/<serviceName>
|
|
254
|
+
*/
|
|
255
|
+
appName?: string;
|
|
231
256
|
/** VPC to deploy into */
|
|
232
257
|
vpc?: IVpc;
|
|
233
258
|
/** Default ECR repository or container image */
|
|
@@ -373,6 +398,29 @@ export default class EcsCluster extends Construct implements IConnectable {
|
|
|
373
398
|
* Checks if a service uses an EC2 capacity provider.
|
|
374
399
|
*/
|
|
375
400
|
private isServiceEc2;
|
|
401
|
+
/**
|
|
402
|
+
* Validates an SSM path component for correctness.
|
|
403
|
+
* SSM parameter paths have specific constraints that must be enforced.
|
|
404
|
+
*
|
|
405
|
+
* @param component - The path component to validate
|
|
406
|
+
* @param fieldName - Name of the field for error messages
|
|
407
|
+
* @throws Error if the component is invalid
|
|
408
|
+
*/
|
|
409
|
+
private validateSsmPathComponent;
|
|
410
|
+
/**
|
|
411
|
+
* Derives the SSM secrets path for a service.
|
|
412
|
+
* Uses explicit path if provided, otherwise derives from app/cluster/service names.
|
|
413
|
+
*
|
|
414
|
+
* @param serviceName - The service name
|
|
415
|
+
* @param explicitPath - Optional explicit path override
|
|
416
|
+
* @returns The SSM secrets path (e.g., /myapp/ApiCluster/users)
|
|
417
|
+
*/
|
|
418
|
+
/**
|
|
419
|
+
* Collects all Secrets Manager secret names from secretsImport across all services.
|
|
420
|
+
* Used to scope IAM permissions for least-privilege access.
|
|
421
|
+
*/
|
|
422
|
+
private collectSecretsManagerSecretNames;
|
|
423
|
+
private deriveSsmSecretsPath;
|
|
376
424
|
/**
|
|
377
425
|
* Generates a unique key for EC2 config (for ASG deduplication).
|
|
378
426
|
* Services with matching keys share an ASG.
|