cdk-ecr-deployment 2.3.2 → 2.4.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/.jsii CHANGED
@@ -2901,7 +2901,7 @@
2901
2901
  },
2902
2902
  "locationInModule": {
2903
2903
  "filename": "src/index.ts",
2904
- "line": 111
2904
+ "line": 117
2905
2905
  },
2906
2906
  "parameters": [
2907
2907
  {
@@ -2925,7 +2925,7 @@
2925
2925
  "kind": "class",
2926
2926
  "locationInModule": {
2927
2927
  "filename": "src/index.ts",
2928
- "line": 110
2928
+ "line": 116
2929
2929
  },
2930
2930
  "name": "DockerImageName",
2931
2931
  "properties": [
@@ -2938,7 +2938,7 @@
2938
2938
  "immutable": true,
2939
2939
  "locationInModule": {
2940
2940
  "filename": "src/index.ts",
2941
- "line": 112
2941
+ "line": 118
2942
2942
  },
2943
2943
  "name": "uri",
2944
2944
  "overrides": "cdk-ecr-deployment.IImageName",
@@ -2952,7 +2952,7 @@
2952
2952
  },
2953
2953
  "locationInModule": {
2954
2954
  "filename": "src/index.ts",
2955
- "line": 111
2955
+ "line": 117
2956
2956
  },
2957
2957
  "name": "creds",
2958
2958
  "optional": true,
@@ -2977,7 +2977,7 @@
2977
2977
  },
2978
2978
  "locationInModule": {
2979
2979
  "filename": "src/index.ts",
2980
- "line": 127
2980
+ "line": 135
2981
2981
  },
2982
2982
  "parameters": [
2983
2983
  {
@@ -3003,8 +3003,33 @@
3003
3003
  "kind": "class",
3004
3004
  "locationInModule": {
3005
3005
  "filename": "src/index.ts",
3006
- "line": 126
3006
+ "line": 132
3007
3007
  },
3008
+ "methods": [
3009
+ {
3010
+ "docs": {
3011
+ "stability": "stable"
3012
+ },
3013
+ "locationInModule": {
3014
+ "filename": "src/index.ts",
3015
+ "line": 196
3016
+ },
3017
+ "name": "addToPrincipalPolicy",
3018
+ "parameters": [
3019
+ {
3020
+ "name": "statement",
3021
+ "type": {
3022
+ "fqn": "aws-cdk-lib.aws_iam.PolicyStatement"
3023
+ }
3024
+ }
3025
+ ],
3026
+ "returns": {
3027
+ "type": {
3028
+ "fqn": "aws-cdk-lib.aws_iam.AddToPrincipalPolicyResult"
3029
+ }
3030
+ }
3031
+ }
3032
+ ],
3008
3033
  "name": "ECRDeployment",
3009
3034
  "symbolId": "src/index:ECRDeployment"
3010
3035
  },
@@ -3018,7 +3043,7 @@
3018
3043
  "kind": "interface",
3019
3044
  "locationInModule": {
3020
3045
  "filename": "src/index.ts",
3021
- "line": 10
3046
+ "line": 11
3022
3047
  },
3023
3048
  "name": "ECRDeploymentProps",
3024
3049
  "properties": [
@@ -3031,7 +3056,7 @@
3031
3056
  "immutable": true,
3032
3057
  "locationInModule": {
3033
3058
  "filename": "src/index.ts",
3034
- "line": 30
3059
+ "line": 31
3035
3060
  },
3036
3061
  "name": "dest",
3037
3062
  "type": {
@@ -3047,7 +3072,7 @@
3047
3072
  "immutable": true,
3048
3073
  "locationInModule": {
3049
3074
  "filename": "src/index.ts",
3050
- "line": 25
3075
+ "line": 26
3051
3076
  },
3052
3077
  "name": "src",
3053
3078
  "type": {
@@ -3065,7 +3090,7 @@
3065
3090
  "immutable": true,
3066
3091
  "locationInModule": {
3067
3092
  "filename": "src/index.ts",
3068
- "line": 21
3093
+ "line": 22
3069
3094
  },
3070
3095
  "name": "buildImage",
3071
3096
  "optional": true,
@@ -3082,7 +3107,7 @@
3082
3107
  "immutable": true,
3083
3108
  "locationInModule": {
3084
3109
  "filename": "src/index.ts",
3085
- "line": 68
3110
+ "line": 69
3086
3111
  },
3087
3112
  "name": "environment",
3088
3113
  "optional": true,
@@ -3106,7 +3131,7 @@
3106
3131
  "immutable": true,
3107
3132
  "locationInModule": {
3108
3133
  "filename": "src/index.ts",
3109
- "line": 41
3134
+ "line": 42
3110
3135
  },
3111
3136
  "name": "memoryLimit",
3112
3137
  "optional": true,
@@ -3124,7 +3149,7 @@
3124
3149
  "immutable": true,
3125
3150
  "locationInModule": {
3126
3151
  "filename": "src/index.ts",
3127
- "line": 48
3152
+ "line": 49
3128
3153
  },
3129
3154
  "name": "role",
3130
3155
  "optional": true,
@@ -3142,7 +3167,7 @@
3142
3167
  "immutable": true,
3143
3168
  "locationInModule": {
3144
3169
  "filename": "src/index.ts",
3145
- "line": 55
3170
+ "line": 56
3146
3171
  },
3147
3172
  "name": "vpc",
3148
3173
  "optional": true,
@@ -3161,7 +3186,7 @@
3161
3186
  "immutable": true,
3162
3187
  "locationInModule": {
3163
3188
  "filename": "src/index.ts",
3164
- "line": 63
3189
+ "line": 64
3165
3190
  },
3166
3191
  "name": "vpcSubnets",
3167
3192
  "optional": true,
@@ -3181,7 +3206,7 @@
3181
3206
  "kind": "interface",
3182
3207
  "locationInModule": {
3183
3208
  "filename": "src/index.ts",
3184
- "line": 71
3209
+ "line": 72
3185
3210
  },
3186
3211
  "name": "IImageName",
3187
3212
  "properties": [
@@ -3195,7 +3220,7 @@
3195
3220
  "immutable": true,
3196
3221
  "locationInModule": {
3197
3222
  "filename": "src/index.ts",
3198
- "line": 77
3223
+ "line": 78
3199
3224
  },
3200
3225
  "name": "uri",
3201
3226
  "type": {
@@ -3205,13 +3230,13 @@
3205
3230
  {
3206
3231
  "abstract": true,
3207
3232
  "docs": {
3208
- "remarks": "Format `user:[password]`",
3233
+ "remarks": "Format `user:password` or `AWS Secrets Manager secret arn` or `AWS Secrets Manager secret name`",
3209
3234
  "stability": "stable",
3210
3235
  "summary": "The credentials of the docker image."
3211
3236
  },
3212
3237
  "locationInModule": {
3213
3238
  "filename": "src/index.ts",
3214
- "line": 82
3239
+ "line": 83
3215
3240
  },
3216
3241
  "name": "creds",
3217
3242
  "optional": true,
@@ -3234,7 +3259,7 @@
3234
3259
  },
3235
3260
  "locationInModule": {
3236
3261
  "filename": "src/index.ts",
3237
- "line": 117
3262
+ "line": 123
3238
3263
  },
3239
3264
  "parameters": [
3240
3265
  {
@@ -3265,7 +3290,7 @@
3265
3290
  "kind": "class",
3266
3291
  "locationInModule": {
3267
3292
  "filename": "src/index.ts",
3268
- "line": 115
3293
+ "line": 121
3269
3294
  },
3270
3295
  "name": "S3ArchiveName",
3271
3296
  "properties": [
@@ -3278,7 +3303,7 @@
3278
3303
  "immutable": true,
3279
3304
  "locationInModule": {
3280
3305
  "filename": "src/index.ts",
3281
- "line": 123
3306
+ "line": 129
3282
3307
  },
3283
3308
  "name": "uri",
3284
3309
  "overrides": "cdk-ecr-deployment.IImageName",
@@ -3292,7 +3317,7 @@
3292
3317
  },
3293
3318
  "locationInModule": {
3294
3319
  "filename": "src/index.ts",
3295
- "line": 117
3320
+ "line": 123
3296
3321
  },
3297
3322
  "name": "creds",
3298
3323
  "optional": true,
@@ -3305,6 +3330,6 @@
3305
3330
  "symbolId": "src/index:S3ArchiveName"
3306
3331
  }
3307
3332
  },
3308
- "version": "2.3.2",
3309
- "fingerprint": "hAHkaiu8Tgy62syHIJpKSnmk2rvi4QVaY7S9rpIag24="
3333
+ "version": "2.4.0",
3334
+ "fingerprint": "d5kP3wOkagNaML4hX/yNBeSbDzUd8ZQTzfYJ5ZG/XOQ="
3310
3335
  }
package/API.md CHANGED
@@ -83,6 +83,22 @@ new ECRDeployment(scope: Construct, id: string, props: ECRDeploymentProps)
83
83
  * **vpcSubnets** (<code>[aws_ec2.SubnetSelection](#aws-cdk-lib-aws-ec2-subnetselection)</code>) Where in the VPC to place the deployment lambda handler. __*Default*__: the Vpc default strategy if not specified
84
84
 
85
85
 
86
+ ### Methods
87
+
88
+
89
+ #### addToPrincipalPolicy(statement) <a id="cdk-ecr-deployment-ecrdeployment-addtoprincipalpolicy"></a>
90
+
91
+
92
+
93
+ ```ts
94
+ addToPrincipalPolicy(statement: PolicyStatement): AddToPrincipalPolicyResult
95
+ ```
96
+
97
+ * **statement** (<code>[aws_iam.PolicyStatement](#aws-cdk-lib-aws-iam-policystatement)</code>) *No description*
98
+
99
+ __Returns__:
100
+ * <code>[aws_iam.AddToPrincipalPolicyResult](#aws-cdk-lib-aws-iam-addtoprincipalpolicyresult)</code>
101
+
86
102
 
87
103
 
88
104
  ## class S3ArchiveName <a id="cdk-ecr-deployment-s3archivename"></a>
package/changelog.md CHANGED
@@ -1,7 +1,7 @@
1
1
 
2
- ### [2.3.2](https://github.com/cdklabs/cdk-ecr-deployment/compare/v2.3.1...v2.3.2) (2022-03-05)
2
+ ## [2.4.0](https://github.com/cdklabs/cdk-ecr-deployment/compare/v2.3.2...v2.4.0) (2022-03-06)
3
3
 
4
4
 
5
- ### Bug Fixes
5
+ ### Features
6
6
 
7
- * update github.com/containerd/containerd to 1.5.9 ([346a651](https://github.com/cdklabs/cdk-ecr-deployment/commit/346a6516e5c294bbb133f3dfb3ef5d96bf8da087))
7
+ * support getting external registry credentials from secrets/parameter store ([5824d07](https://github.com/cdklabs/cdk-ecr-deployment/commit/5824d0780819115a3bd7e4fb430077d256ba8796))
package/lambda/go.mod CHANGED
@@ -7,10 +7,12 @@ require (
7
7
  github.com/Microsoft/go-winio v0.5.1 // indirect
8
8
  github.com/Microsoft/hcsshim v0.9.2 // indirect
9
9
  github.com/aws/aws-lambda-go v1.23.0
10
- github.com/aws/aws-sdk-go-v2 v1.3.2
10
+ github.com/aws/aws-sdk-go-v2 v1.14.0
11
11
  github.com/aws/aws-sdk-go-v2/config v1.1.6
12
+ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.6 // indirect
12
13
  github.com/aws/aws-sdk-go-v2/service/ecr v1.2.2
13
14
  github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0
15
+ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.14.0
14
16
  github.com/cespare/xxhash/v2 v2.1.2 // indirect
15
17
  github.com/containerd/cgroups v1.0.3 // indirect
16
18
  github.com/containerd/containerd v1.5.10 // indirect
package/lambda/go.sum CHANGED
@@ -101,14 +101,21 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:l
101
101
  github.com/aws/aws-lambda-go v1.23.0 h1:Vjwow5COkFJp7GePkk9kjAo/DyX36b7wVPKwseQZbRo=
102
102
  github.com/aws/aws-lambda-go v1.23.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU=
103
103
  github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
104
- github.com/aws/aws-sdk-go-v2 v1.3.2 h1:RQj8l98yKUm0UV2Wd3w/Ms+TXV9Rs1E6Kr5tRRMfyU4=
105
104
  github.com/aws/aws-sdk-go-v2 v1.3.2/go.mod h1:7OaACgj2SX3XGWnrIjGlJM22h6yD6MEWKvm7levnnM8=
105
+ github.com/aws/aws-sdk-go-v2 v1.14.0 h1:IzSYBJHu0ZdUi27kIW6xVrs0eSxI4AzwbenzfXhhVs4=
106
+ github.com/aws/aws-sdk-go-v2 v1.14.0/go.mod h1:ZA3Y8V0LrlWj63MQAnRHgKf/5QB//LSZCPNWlWrNGLU=
106
107
  github.com/aws/aws-sdk-go-v2/config v1.1.6 h1:tg8KyxrxDt1CrYmZXWs9lc6IFE1yxtk9kn6eS/v2fdA=
107
108
  github.com/aws/aws-sdk-go-v2/config v1.1.6/go.mod h1:Kx90DDOgkMpRfSkzGbF13AVXHHfBNct1liO+95KxXsU=
108
109
  github.com/aws/aws-sdk-go-v2/credentials v1.1.6 h1:efaeh6FsO/jzyJ+U4ZxduKC6rRJDrUpu+Z0k5+guqHo=
109
110
  github.com/aws/aws-sdk-go-v2/credentials v1.1.6/go.mod h1:q1wQ5jHdFNhc4wnNcOEpnovs4keJA5Ds+qESCnfEsgU=
110
111
  github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6 h1:zoOz5V56jO/rGixsCDnrQtAzYRYM2hGA/43U6jVMFbo=
111
112
  github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6/go.mod h1:0+fWMitrmIpENiY8/1DyhdYPUCAPvd9UNz9mtCsEoLQ=
113
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.5 h1:+phazLmKkjBYhFTsGYH9J7jgnA8+Aer2yE4QeS4zn6A=
114
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.5/go.mod h1:2hXc8ooJqF2nAznsbJQIn+7h851/bu8GVC80OVTTqf8=
115
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.3.0 h1:PO+HNeJBeRK0yVD9CQZ+VUrYfd5sXqS7YdPYHHcDkR4=
116
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.3.0/go.mod h1:miRSv9l093jX/t/j+mBCaLqFHo9xKYzJ7DGm1BsGoJM=
117
+ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.6 h1:c8s9EhIPVFMFS+R1+rtEghGrf7v83gSUWbcCYX/OPes=
118
+ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.6/go.mod h1:o1ippSg3yJx5EuT4AOGXJCUcmt5vrcxla1cg6K1Q8Iw=
112
119
  github.com/aws/aws-sdk-go-v2/service/ecr v1.2.2 h1:2EY0F1skAOArBsRM6nD9kPo0sdK32IPzT8O7PKocVR8=
113
120
  github.com/aws/aws-sdk-go-v2/service/ecr v1.2.2/go.mod h1:XnQfi4PwRBjy+CQD7zqVRRHKWe529+1nTsrWXvsSSJk=
114
121
  github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4 h1:8yeByqOL6UWBsOOXsHnW93/ukwL66O008tRfxXxnTwA=
@@ -119,12 +126,15 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2 h1:aU8H58DoYxNo8R1
119
126
  github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2/go.mod h1:nnutjMLuna0s3GVY/MAkpLX03thyNER06gXvnMAPj5g=
120
127
  github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0 h1:VbwXUI3L0hyhVmrFxbDxrs6cBX8TNFX0YxCpooMNjvY=
121
128
  github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0/go.mod h1:uwA7gs93Qcss43astPUb1eq4RyceNmYWAQjZFDOAMLo=
129
+ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.14.0 h1:+k48odl+WiAr+oBzrdQkLzMgttZ5aX8G8vWZYYGgPYU=
130
+ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.14.0/go.mod h1:h0nVkGJVtorNw3RV5QnwaERSjUWuE3g/gESooXT4qzA=
122
131
  github.com/aws/aws-sdk-go-v2/service/sso v1.1.5 h1:B7ec5wE4+3Ldkurmq0C4gfQFtElGTG+/iTpi/YPMzi4=
123
132
  github.com/aws/aws-sdk-go-v2/service/sso v1.1.5/go.mod h1:bpGz0tidC4y39sZkQSkpO/J0tzWCMXHbw6FZ0j1GkWM=
124
133
  github.com/aws/aws-sdk-go-v2/service/sts v1.3.0 h1:4o69U9waE25xhRbsnXa4jjQac03BFJcNfcZkSedk3e4=
125
134
  github.com/aws/aws-sdk-go-v2/service/sts v1.3.0/go.mod h1:ssRzzJ2RZOVuKj2Vx1YE7ypfil/BIlgmQnCSW4DistU=
126
- github.com/aws/smithy-go v1.3.1 h1:xJFO4pK0y9J8fCl34uGsSJX5KNnGbdARDlA5BPhXnwE=
127
135
  github.com/aws/smithy-go v1.3.1/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
136
+ github.com/aws/smithy-go v1.11.0 h1:nOfSDwiiH232f90OuevPnAEQO5ZqH+xnn8uGVsvBCw4=
137
+ github.com/aws/smithy-go v1.11.0/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM=
128
138
  github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
129
139
  github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
130
140
  github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -440,8 +450,9 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
440
450
  github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
441
451
  github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
442
452
  github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
443
- github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
444
453
  github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
454
+ github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
455
+ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
445
456
  github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0=
446
457
  github.com/google/go-intervals v0.0.2 h1:FGrVEiUnTRKR8yE04qzXYaJMtnIYqobR5QbblK3ixcM=
447
458
  github.com/google/go-intervals v0.0.2/go.mod h1:MkaR3LNRfeKLPmqgJYs4E66z5InYjmCjbbr4TQlcT6Y=
package/lambda/main.go CHANGED
@@ -62,6 +62,15 @@ func handler(ctx context.Context, event cfn.Event) (physicalResourceID string, d
62
62
  return physicalResourceID, data, err
63
63
  }
64
64
 
65
+ srcCreds, err = parseCreds(srcCreds)
66
+ if err != nil {
67
+ return physicalResourceID, data, err
68
+ }
69
+ destCreds, err = parseCreds(destCreds)
70
+ if err != nil {
71
+ return physicalResourceID, data, err
72
+ }
73
+
65
74
  log.Printf("SrcImage: %v DestImage: %v", srcImage, destImage)
66
75
 
67
76
  srcRef, err := alltransports.ParseImageName(srcImage)
@@ -144,3 +153,16 @@ func getStrPropsDefault(m map[string]interface{}, k string, d string) (string, e
144
153
  }
145
154
  return "", fmt.Errorf("can't get %v", k)
146
155
  }
156
+
157
+ func parseCreds(creds string) (string, error) {
158
+ credsType := GetCredsType(creds)
159
+ if creds == "" {
160
+ return "", nil
161
+ } else if (credsType == SECRET_ARN) || (credsType == SECRET_NAME) {
162
+ secret, err := GetSecret(creds)
163
+ return secret, err
164
+ } else if credsType == SECRET_TEXT {
165
+ return creds, nil
166
+ }
167
+ return "", fmt.Errorf("unkown creds type")
168
+ }
package/lambda/utils.go CHANGED
@@ -13,8 +13,10 @@ import (
13
13
  "strings"
14
14
  "time"
15
15
 
16
+ "github.com/aws/aws-sdk-go-v2/aws"
16
17
  "github.com/aws/aws-sdk-go-v2/config"
17
18
  "github.com/aws/aws-sdk-go-v2/service/ecr"
19
+ "github.com/aws/aws-sdk-go-v2/service/secretsmanager"
18
20
  "github.com/containers/image/v5/types"
19
21
  )
20
22
 
@@ -147,3 +149,38 @@ func Dumps(v interface{}) string {
147
149
  }
148
150
  return string(bytes)
149
151
  }
152
+
153
+ const (
154
+ SECRET_ARN = "SECRET_ARN"
155
+ SECRET_NAME = "SECRET_NAME"
156
+ SECRET_TEXT = "SECRET_TEXT"
157
+ )
158
+
159
+ func GetCredsType(s string) string {
160
+ if strings.HasPrefix(s, "arn:aws") {
161
+ return SECRET_ARN
162
+ } else if strings.Contains(s, ":") {
163
+ return SECRET_TEXT
164
+ } else {
165
+ return SECRET_NAME
166
+ }
167
+ }
168
+
169
+ func GetSecret(secretId string) (secret string, err error) {
170
+ cfg, err := config.LoadDefaultConfig(
171
+ context.TODO(),
172
+ )
173
+ log.Printf("get secret id: %s of region: %s", secretId, cfg.Region)
174
+ if err != nil {
175
+ return "", fmt.Errorf("api client configuration error: %v", err.Error())
176
+ }
177
+
178
+ client := secretsmanager.NewFromConfig(cfg)
179
+ resp, err := client.GetSecretValue(context.TODO(), &secretsmanager.GetSecretValueInput{
180
+ SecretId: aws.String(secretId),
181
+ })
182
+ if err != nil {
183
+ return "", fmt.Errorf("fetch secret value error: %v", err.Error())
184
+ }
185
+ return *resp.SecretString, nil
186
+ }
@@ -23,3 +23,11 @@ func TestGetECRRegion(t *testing.T) {
23
23
  GetECRRegion("docker://1234567890.dkr.ecr.cn-north-1.amazonaws.com/test:ubuntu"),
24
24
  )
25
25
  }
26
+
27
+ func TestGetCredsType(t *testing.T) {
28
+ assert.Equal(t, SECRET_ARN, GetCredsType("arn:aws:secretsmanager:us-west-2:00000:secret:fake-secret"))
29
+ assert.Equal(t, SECRET_ARN, GetCredsType("arn:aws-cn:secretsmanager:cn-north-1:00000:secret:fake-secret"))
30
+ assert.Equal(t, SECRET_NAME, GetCredsType("fake-secret"))
31
+ assert.Equal(t, SECRET_TEXT, GetCredsType("username:password"))
32
+ assert.Equal(t, SECRET_NAME, GetCredsType(""))
33
+ }
package/lib/index.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import { aws_ec2 as ec2, aws_iam as iam } from 'aws-cdk-lib';
2
+ import { PolicyStatement, AddToPrincipalPolicyResult } from 'aws-cdk-lib/aws-iam';
2
3
  import { Construct } from 'constructs';
3
4
  /**
4
5
  * @stability stable
@@ -84,7 +85,7 @@ export interface IImageName {
84
85
  /**
85
86
  * The credentials of the docker image.
86
87
  *
87
- * Format `user:[password]`
88
+ * Format `user:password` or `AWS Secrets Manager secret arn` or `AWS Secrets Manager secret name`
88
89
  *
89
90
  * @stability stable
90
91
  */
@@ -132,9 +133,14 @@ export declare class S3ArchiveName implements IImageName {
132
133
  * @stability stable
133
134
  */
134
135
  export declare class ECRDeployment extends Construct {
136
+ private handler;
135
137
  /**
136
138
  * @stability stable
137
139
  */
138
140
  constructor(scope: Construct, id: string, props: ECRDeploymentProps);
141
+ /**
142
+ * @stability stable
143
+ */
144
+ addToPrincipalPolicy(statement: PolicyStatement): AddToPrincipalPolicyResult;
139
145
  private renderSingletonUuid;
140
146
  }
package/lib/index.js CHANGED
@@ -9,9 +9,12 @@ const child_process = require("child_process");
9
9
  const path = require("path");
10
10
  const aws_cdk_lib_1 = require("aws-cdk-lib");
11
11
  const constructs_1 = require("constructs");
12
+ const TRUTHY = ['true', true, 1, '1'];
12
13
  function getCode(buildImage) {
13
14
  const { CI, NO_PREBUILT_LAMBDA } = process.env;
14
- if (!(CI && ['true', true, 1, '1'].includes(CI)) || (NO_PREBUILT_LAMBDA && ['true', true, 1, '1'].includes(NO_PREBUILT_LAMBDA))) {
15
+ const isCI = CI && TRUTHY.includes(CI);
16
+ const isNoPrebuilt = NO_PREBUILT_LAMBDA && TRUTHY.includes(NO_PREBUILT_LAMBDA);
17
+ if (!(isCI || isNoPrebuilt)) {
15
18
  try {
16
19
  console.log('Try to get prebuilt lambda');
17
20
  const installScript = path.join(__dirname, '../lambda/install.js');
@@ -52,7 +55,7 @@ class DockerImageName {
52
55
  }
53
56
  exports.DockerImageName = DockerImageName;
54
57
  _a = JSII_RTTI_SYMBOL_1;
55
- DockerImageName[_a] = { fqn: "cdk-ecr-deployment.DockerImageName", version: "2.3.2" };
58
+ DockerImageName[_a] = { fqn: "cdk-ecr-deployment.DockerImageName", version: "2.4.0" };
56
59
  /**
57
60
  * @stability stable
58
61
  */
@@ -78,7 +81,7 @@ class S3ArchiveName {
78
81
  }
79
82
  exports.S3ArchiveName = S3ArchiveName;
80
83
  _b = JSII_RTTI_SYMBOL_1;
81
- S3ArchiveName[_b] = { fqn: "cdk-ecr-deployment.S3ArchiveName", version: "2.3.2" };
84
+ S3ArchiveName[_b] = { fqn: "cdk-ecr-deployment.S3ArchiveName", version: "2.4.0" };
82
85
  /**
83
86
  * @stability stable
84
87
  */
@@ -90,7 +93,7 @@ class ECRDeployment extends constructs_1.Construct {
90
93
  var _d, _e;
91
94
  super(scope, id);
92
95
  const memoryLimit = (_d = props.memoryLimit) !== null && _d !== void 0 ? _d : 512;
93
- const handler = new aws_cdk_lib_1.aws_lambda.SingletonFunction(this, 'CustomResourceHandler', {
96
+ this.handler = new aws_cdk_lib_1.aws_lambda.SingletonFunction(this, 'CustomResourceHandler', {
94
97
  uuid: this.renderSingletonUuid(memoryLimit),
95
98
  code: getCode((_e = props.buildImage) !== null && _e !== void 0 ? _e : 'public.ecr.aws/sam/build-go1.x:latest'),
96
99
  runtime: aws_cdk_lib_1.aws_lambda.Runtime.GO_1_X,
@@ -103,7 +106,7 @@ class ECRDeployment extends constructs_1.Construct {
103
106
  vpc: props.vpc,
104
107
  vpcSubnets: props.vpcSubnets,
105
108
  });
106
- const handlerRole = handler.role;
109
+ const handlerRole = this.handler.role;
107
110
  if (!handlerRole) {
108
111
  throw new Error('lambda.SingletonFunction should have created a Role');
109
112
  }
@@ -135,7 +138,7 @@ class ECRDeployment extends constructs_1.Construct {
135
138
  resources: ['*'],
136
139
  }));
137
140
  new aws_cdk_lib_1.CustomResource(this, 'CustomResource', {
138
- serviceToken: handler.functionArn,
141
+ serviceToken: this.handler.functionArn,
139
142
  resourceType: 'Custom::CDKBucketDeployment',
140
143
  properties: {
141
144
  SrcImage: props.src.uri,
@@ -145,6 +148,16 @@ class ECRDeployment extends constructs_1.Construct {
145
148
  },
146
149
  });
147
150
  }
151
+ /**
152
+ * @stability stable
153
+ */
154
+ addToPrincipalPolicy(statement) {
155
+ const handlerRole = this.handler.role;
156
+ if (!handlerRole) {
157
+ throw new Error('lambda.SingletonFunction should have created a Role');
158
+ }
159
+ return handlerRole.addToPrincipalPolicy(statement);
160
+ }
148
161
  renderSingletonUuid(memoryLimit) {
149
162
  let uuid = 'bd07c930-edb9-4112-a20f-03f096f53666';
150
163
  // if user specify a custom memory limit, define another singleton handler
@@ -161,5 +174,5 @@ class ECRDeployment extends constructs_1.Construct {
161
174
  }
162
175
  exports.ECRDeployment = ECRDeployment;
163
176
  _c = JSII_RTTI_SYMBOL_1;
164
- ECRDeployment[_c] = { fqn: "cdk-ecr-deployment.ECRDeployment", version: "2.3.2" };
165
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\n\n\nimport * as child_process from 'child_process';\nimport * as path from 'path';\nimport { aws_ec2 as ec2, aws_iam as iam, aws_lambda as lambda, Duration, CustomResource, Token } from 'aws-cdk-lib';\nimport { Construct } from 'constructs';\n\nexport interface ECRDeploymentProps {\n\n                                                                                                                                                                                                                                                                                                                                                       \n  readonly buildImage?: string;\n                                                \n  readonly src: IImageName;\n\n                                                     \n  readonly dest: IImageName;\n\n                                                                                                                                                                                                                                                                                               \n  readonly memoryLimit?: number;\n\n                                                                                                                  \n  readonly role?: iam.IRole;\n\n                                                                                                   \n  readonly vpc?: ec2.IVpc;\n\n                                                                                                                                                                             \n  readonly vpcSubnets?: ec2.SubnetSelection;\n\n                                                \n  readonly environment?: { [key: string]: string };\n}\n\nexport interface IImageName {\n                                                                                                                   \n  readonly uri: string;\n\n                                                                              \n  creds?: string;\n}\n\nfunction getCode(buildImage: string): lambda.AssetCode {\n  const { CI, NO_PREBUILT_LAMBDA } = process.env;\n  if (!(CI && ['true', true, 1, '1'].includes(CI)) || (NO_PREBUILT_LAMBDA && ['true', true, 1, '1'].includes(NO_PREBUILT_LAMBDA))) {\n    try {\n      console.log('Try to get prebuilt lambda');\n\n      const installScript = path.join(__dirname, '../lambda/install.js');\n      const prebuiltPath = path.join(__dirname, '../lambda/out');\n      child_process.execSync(`${process.argv0} ${installScript} ${prebuiltPath}`);\n\n      return lambda.Code.fromAsset(prebuiltPath);\n    } catch (err) {\n      console.warn(`Can not get prebuilt lambda: ${err}`);\n    }\n  }\n\n  console.log('Build lambda from scratch');\n\n  return lambda.Code.fromDockerBuild(path.join(__dirname, '../lambda'), {\n    buildArgs: {\n      buildImage,\n    },\n  });\n}\n\nexport class DockerImageName implements IImageName {\n  public constructor(private name: string, public creds?: string) { }\n  public get uri(): string { return `docker://${this.name}`; }\n}\n\nexport class S3ArchiveName implements IImageName {\n  private name: string;\n  public constructor(p: string, ref?: string, public creds?: string) {\n    this.name = p;\n    if (ref) {\n      this.name += ':' + ref;\n    }\n  }\n  public get uri(): string { return `s3://${this.name}`; }\n}\n\nexport class ECRDeployment extends Construct {\n  constructor(scope: Construct, id: string, props: ECRDeploymentProps) {\n    super(scope, id);\n    const memoryLimit = props.memoryLimit ?? 512;\n    const handler = new lambda.SingletonFunction(this, 'CustomResourceHandler', {\n      uuid: this.renderSingletonUuid(memoryLimit),\n      code: getCode(props.buildImage ?? 'public.ecr.aws/sam/build-go1.x:latest'),\n      runtime: lambda.Runtime.GO_1_X,\n      handler: 'main',\n      environment: props.environment,\n      lambdaPurpose: 'Custom::CDKECRDeployment',\n      timeout: Duration.minutes(15),\n      role: props.role,\n      memorySize: memoryLimit,\n      vpc: props.vpc,\n      vpcSubnets: props.vpcSubnets,\n    });\n\n    const handlerRole = handler.role;\n    if (!handlerRole) { throw new Error('lambda.SingletonFunction should have created a Role'); }\n\n    handlerRole.addToPrincipalPolicy(\n      new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        actions: [\n          'ecr:GetAuthorizationToken',\n          'ecr:BatchCheckLayerAvailability',\n          'ecr:GetDownloadUrlForLayer',\n          'ecr:GetRepositoryPolicy',\n          'ecr:DescribeRepositories',\n          'ecr:ListImages',\n          'ecr:DescribeImages',\n          'ecr:BatchGetImage',\n          'ecr:ListTagsForResource',\n          'ecr:DescribeImageScanFindings',\n          'ecr:InitiateLayerUpload',\n          'ecr:UploadLayerPart',\n          'ecr:CompleteLayerUpload',\n          'ecr:PutImage',\n        ],\n        resources: ['*'],\n      }));\n    handlerRole.addToPrincipalPolicy(new iam.PolicyStatement({\n      effect: iam.Effect.ALLOW,\n      actions: [\n        's3:GetObject',\n      ],\n      resources: ['*'],\n    }));\n\n    new CustomResource(this, 'CustomResource', {\n      serviceToken: handler.functionArn,\n      resourceType: 'Custom::CDKBucketDeployment',\n      properties: {\n        SrcImage: props.src.uri,\n        SrcCreds: props.src.creds,\n        DestImage: props.dest.uri,\n        DestCreds: props.dest.creds,\n      },\n    });\n  }\n\n  private renderSingletonUuid(memoryLimit?: number) {\n    let uuid = 'bd07c930-edb9-4112-a20f-03f096f53666';\n\n    // if user specify a custom memory limit, define another singleton handler\n    // with this configuration. otherwise, it won't be possible to use multiple\n    // configurations since we have a singleton.\n    if (memoryLimit) {\n      if (Token.isUnresolved(memoryLimit)) {\n        throw new Error('Can\\'t use tokens when specifying \"memoryLimit\" since we use it to identify the singleton custom resource handler');\n      }\n\n      uuid += `-${memoryLimit.toString()}MiB`;\n    }\n\n    return uuid;\n  }\n}\n"]}
177
+ ECRDeployment[_c] = { fqn: "cdk-ecr-deployment.ECRDeployment", version: "2.4.0" };
178
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\n\n\nimport * as child_process from 'child_process';\nimport * as path from 'path';\nimport { aws_ec2 as ec2, aws_iam as iam, aws_lambda as lambda, Duration, CustomResource, Token } from 'aws-cdk-lib';\nimport { PolicyStatement, AddToPrincipalPolicyResult } from 'aws-cdk-lib/aws-iam';\nimport { Construct } from 'constructs';\n\nexport interface ECRDeploymentProps {\n\n                                                                                                                                                                                                                                                                                                                                                       \n  readonly buildImage?: string;\n                                                \n  readonly src: IImageName;\n\n                                                     \n  readonly dest: IImageName;\n\n                                                                                                                                                                                                                                                                                               \n  readonly memoryLimit?: number;\n\n                                                                                                                  \n  readonly role?: iam.IRole;\n\n                                                                                                   \n  readonly vpc?: ec2.IVpc;\n\n                                                                                                                                                                             \n  readonly vpcSubnets?: ec2.SubnetSelection;\n\n                                                \n  readonly environment?: { [key: string]: string };\n}\n\nexport interface IImageName {\n                                                                                                                   \n  readonly uri: string;\n\n                                                                                                                                                     \n  creds?: string;\n}\n\nconst TRUTHY = ['true', true, 1, '1'];\n\nfunction getCode(buildImage: string): lambda.AssetCode {\n  const { CI, NO_PREBUILT_LAMBDA } = process.env;\n  const isCI = CI && TRUTHY.includes(CI);\n  const isNoPrebuilt = NO_PREBUILT_LAMBDA && TRUTHY.includes(NO_PREBUILT_LAMBDA);\n\n  if (!(isCI || isNoPrebuilt)) {\n    try {\n      console.log('Try to get prebuilt lambda');\n\n      const installScript = path.join(__dirname, '../lambda/install.js');\n      const prebuiltPath = path.join(__dirname, '../lambda/out');\n      child_process.execSync(`${process.argv0} ${installScript} ${prebuiltPath}`);\n\n      return lambda.Code.fromAsset(prebuiltPath);\n    } catch (err) {\n      console.warn(`Can not get prebuilt lambda: ${err}`);\n    }\n  }\n\n  console.log('Build lambda from scratch');\n\n  return lambda.Code.fromDockerBuild(path.join(__dirname, '../lambda'), {\n    buildArgs: {\n      buildImage,\n    },\n  });\n}\n\nexport class DockerImageName implements IImageName {\n  public constructor(private name: string, public creds?: string) { }\n  public get uri(): string { return `docker://${this.name}`; }\n}\n\nexport class S3ArchiveName implements IImageName {\n  private name: string;\n  public constructor(p: string, ref?: string, public creds?: string) {\n    this.name = p;\n    if (ref) {\n      this.name += ':' + ref;\n    }\n  }\n  public get uri(): string { return `s3://${this.name}`; }\n}\n\nexport class ECRDeployment extends Construct {\n  private handler: lambda.SingletonFunction;\n\n  constructor(scope: Construct, id: string, props: ECRDeploymentProps) {\n    super(scope, id);\n    const memoryLimit = props.memoryLimit ?? 512;\n    this.handler = new lambda.SingletonFunction(this, 'CustomResourceHandler', {\n      uuid: this.renderSingletonUuid(memoryLimit),\n      code: getCode(props.buildImage ?? 'public.ecr.aws/sam/build-go1.x:latest'),\n      runtime: lambda.Runtime.GO_1_X,\n      handler: 'main',\n      environment: props.environment,\n      lambdaPurpose: 'Custom::CDKECRDeployment',\n      timeout: Duration.minutes(15),\n      role: props.role,\n      memorySize: memoryLimit,\n      vpc: props.vpc,\n      vpcSubnets: props.vpcSubnets,\n    });\n\n    const handlerRole = this.handler.role;\n    if (!handlerRole) { throw new Error('lambda.SingletonFunction should have created a Role'); }\n\n    handlerRole.addToPrincipalPolicy(\n      new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        actions: [\n          'ecr:GetAuthorizationToken',\n          'ecr:BatchCheckLayerAvailability',\n          'ecr:GetDownloadUrlForLayer',\n          'ecr:GetRepositoryPolicy',\n          'ecr:DescribeRepositories',\n          'ecr:ListImages',\n          'ecr:DescribeImages',\n          'ecr:BatchGetImage',\n          'ecr:ListTagsForResource',\n          'ecr:DescribeImageScanFindings',\n          'ecr:InitiateLayerUpload',\n          'ecr:UploadLayerPart',\n          'ecr:CompleteLayerUpload',\n          'ecr:PutImage',\n        ],\n        resources: ['*'],\n      }));\n    handlerRole.addToPrincipalPolicy(new iam.PolicyStatement({\n      effect: iam.Effect.ALLOW,\n      actions: [\n        's3:GetObject',\n      ],\n      resources: ['*'],\n    }));\n\n    new CustomResource(this, 'CustomResource', {\n      serviceToken: this.handler.functionArn,\n      resourceType: 'Custom::CDKBucketDeployment',\n      properties: {\n        SrcImage: props.src.uri,\n        SrcCreds: props.src.creds,\n        DestImage: props.dest.uri,\n        DestCreds: props.dest.creds,\n      },\n    });\n  }\n\n  public addToPrincipalPolicy(statement: PolicyStatement): AddToPrincipalPolicyResult {\n    const handlerRole = this.handler.role;\n    if (!handlerRole) { throw new Error('lambda.SingletonFunction should have created a Role'); }\n\n    return handlerRole.addToPrincipalPolicy(statement);\n  }\n\n  private renderSingletonUuid(memoryLimit?: number) {\n    let uuid = 'bd07c930-edb9-4112-a20f-03f096f53666';\n\n    // if user specify a custom memory limit, define another singleton handler\n    // with this configuration. otherwise, it won't be possible to use multiple\n    // configurations since we have a singleton.\n    if (memoryLimit) {\n      if (Token.isUnresolved(memoryLimit)) {\n        throw new Error('Can\\'t use tokens when specifying \"memoryLimit\" since we use it to identify the singleton custom resource handler');\n      }\n\n      uuid += `-${memoryLimit.toString()}MiB`;\n    }\n\n    return uuid;\n  }\n}\n"]}
package/package.json CHANGED
@@ -75,7 +75,7 @@
75
75
  ],
76
76
  "main": "lib/index.js",
77
77
  "license": "Apache-2.0",
78
- "version": "2.3.2",
78
+ "version": "2.4.0",
79
79
  "jest": {
80
80
  "testMatch": [
81
81
  "<rootDir>/src/**/__tests__/**/*.ts?(x)",
package/releasetag.txt CHANGED
@@ -1 +1 @@
1
- v2.3.2
1
+ v2.4.0
package/version.txt CHANGED
@@ -1 +1 @@
1
- 2.3.2
1
+ 2.4.0