@@ -10,7 +10,7 @@ import { DockerImageAsset, NetworkMode } from '../lib';
10
10
11
11
/* eslint-disable quote-props */
12
12
13
- const DEMO_IMAGE_ASSET_HASH = '8c1d9ca9f5d37b1c4870c13a9f855301bb42c1848dbcdd5edc8fe2c6c7261d48 ' ;
13
+ const DEMO_IMAGE_ASSET_HASH = '0a3355be12051c9984bf2b0b2bba4e6ea535968e5b6e7396449701732fe5ed14 ' ;
14
14
15
15
const flags = { [ cxapi . DOCKER_IGNORE_SUPPORT ] : true } ;
16
16
@@ -29,11 +29,11 @@ describe('image asset', () => {
29
29
expect ( artifact . assets ) . toEqual ( [
30
30
{
31
31
repositoryName : 'aws-cdk/assets' ,
32
- imageTag : '8c1d9ca9f5d37b1c4870c13a9f855301bb42c1848dbcdd5edc8fe2c6c7261d48 ' ,
33
- id : '8c1d9ca9f5d37b1c4870c13a9f855301bb42c1848dbcdd5edc8fe2c6c7261d48 ' ,
32
+ imageTag : '0a3355be12051c9984bf2b0b2bba4e6ea535968e5b6e7396449701732fe5ed14 ' ,
33
+ id : '0a3355be12051c9984bf2b0b2bba4e6ea535968e5b6e7396449701732fe5ed14 ' ,
34
34
packaging : 'container-image' ,
35
- path : 'asset.8c1d9ca9f5d37b1c4870c13a9f855301bb42c1848dbcdd5edc8fe2c6c7261d48 ' ,
36
- sourceHash : '8c1d9ca9f5d37b1c4870c13a9f855301bb42c1848dbcdd5edc8fe2c6c7261d48 ' ,
35
+ path : 'asset.0a3355be12051c9984bf2b0b2bba4e6ea535968e5b6e7396449701732fe5ed14 ' ,
36
+ sourceHash : '0a3355be12051c9984bf2b0b2bba4e6ea535968e5b6e7396449701732fe5ed14 ' ,
37
37
} ,
38
38
] ) ;
39
39
@@ -89,29 +89,24 @@ describe('image asset', () => {
89
89
expect ( artifact . template ) . toEqual ( { } ) ;
90
90
expect ( artifact . assets ) . toEqual ( [
91
91
{
92
- 'buildArgs' : {
93
- 'a' : 'b' ,
94
- } ,
95
- repositoryName : 'aws-cdk/assets' ,
96
- imageTag : '8c1d9ca9f5d37b1c4870c13a9f855301bb42c1848dbcdd5edc8fe2c6c7261d48' ,
97
- id : '8c1d9ca9f5d37b1c4870c13a9f855301bb42c1848dbcdd5edc8fe2c6c7261d48' ,
92
+ buildArgs : { 'a' : 'b' } ,
93
+ id : '0a3355be12051c9984bf2b0b2bba4e6ea535968e5b6e7396449701732fe5ed14' ,
94
+ imageTag : '0a3355be12051c9984bf2b0b2bba4e6ea535968e5b6e7396449701732fe5ed14' ,
98
95
packaging : 'container-image' ,
99
- path : 'asset.8c1d9ca9f5d37b1c4870c13a9f855301bb42c1848dbcdd5edc8fe2c6c7261d48' ,
100
- sourceHash : '8c1d9ca9f5d37b1c4870c13a9f855301bb42c1848dbcdd5edc8fe2c6c7261d48' ,
96
+ path : 'asset.0a3355be12051c9984bf2b0b2bba4e6ea535968e5b6e7396449701732fe5ed14' ,
97
+ repositoryName : 'aws-cdk/assets' ,
98
+ sourceHash : '0a3355be12051c9984bf2b0b2bba4e6ea535968e5b6e7396449701732fe5ed14' ,
101
99
} ,
102
100
{
103
- 'buildArgs' : {
104
- 'a' : 'b' ,
105
- } ,
106
- 'id' : 'd4bbfde4749763cef9707486f81ce1e95d25cedaf4cc34cfcdab7232ec1948ff' ,
107
- 'imageTag' : 'd4bbfde4749763cef9707486f81ce1e95d25cedaf4cc34cfcdab7232ec1948ff' ,
108
- 'packaging' : 'container-image' ,
109
- 'path' : 'asset.d4bbfde4749763cef9707486f81ce1e95d25cedaf4cc34cfcdab7232ec1948ff' ,
110
- 'repositoryName' : 'aws-cdk/assets' ,
111
- 'sourceHash' : 'd4bbfde4749763cef9707486f81ce1e95d25cedaf4cc34cfcdab7232ec1948ff' ,
101
+ buildArgs : { 'a' : 'b' } ,
102
+ id : '7f3aa0a36ecd282884e11463b3fde119d25d1ed424f934300f0c7b9cf6f63947' ,
103
+ imageTag : '7f3aa0a36ecd282884e11463b3fde119d25d1ed424f934300f0c7b9cf6f63947' ,
104
+ packaging : 'container-image' ,
105
+ path : 'asset.7f3aa0a36ecd282884e11463b3fde119d25d1ed424f934300f0c7b9cf6f63947' ,
106
+ repositoryName : 'aws-cdk/assets' ,
107
+ sourceHash : '7f3aa0a36ecd282884e11463b3fde119d25d1ed424f934300f0c7b9cf6f63947' ,
112
108
} ,
113
109
] ) ;
114
-
115
110
} ) ;
116
111
117
112
testFutureBehavior ( 'with target' , flags , App , ( app ) => {
@@ -355,12 +350,12 @@ describe('image asset', () => {
355
350
const asset5 = new DockerImageAsset ( stack , 'Asset5' , { directory, file : 'Dockerfile.Custom' , target : 'NonDefaultTarget' } ) ;
356
351
const asset6 = new DockerImageAsset ( stack , 'Asset6' , { directory, extraHash : 'random-extra' } ) ;
357
352
358
- expect ( asset1 . assetHash ) . toEqual ( '365b5d951fc5f725f78093a07e3e1cc7819b4cbe582ca71a4c344752c23bf409 ' ) ;
359
- expect ( asset2 . assetHash ) . toEqual ( '9560a36f786f317c5e1abb986b58269b2453ed1cab16c36fd9b76646c837078c ' ) ;
360
- expect ( asset3 . assetHash ) . toEqual ( '4f4e16f5b0cfab21be4298a04b20f62f63cd91a649ef4620d6d3c948d29f3cb4 ' ) ;
361
- expect ( asset4 . assetHash ) . toEqual ( '72b961f96e358b8dad935719cfc2704c3d14a46434871825ac81e3b94caa4853 ' ) ;
362
- expect ( asset5 . assetHash ) . toEqual ( 'c23d34b3a1dac5a80c42e8fa6c88a0ac697eb709a6f36ebdb6e36ee8c75edc75 ' ) ;
363
- expect ( asset6 . assetHash ) . toEqual ( '7e950a9b08c58d371c1658e04d377c0ec59d89a47fc245a86a50525b36a8949b ' ) ;
353
+ expect ( asset1 . assetHash ) . toEqual ( '13248c55633f3b198a628bb2ea4663cb5226f8b2801051bd0c725950266fd590 ' ) ;
354
+ expect ( asset2 . assetHash ) . toEqual ( '36bf205fb9adc5e45ba1c8d534158a0aed96d190eff433af1d90f3b94f96e751 ' ) ;
355
+ expect ( asset3 . assetHash ) . toEqual ( '4c85bd70e73117b7129c2defbe6dc40a8a3872329f4ddca18d75afa671b38276 ' ) ;
356
+ expect ( asset4 . assetHash ) . toEqual ( '8a91219a7bb0f58b3282dd84acbf4c03c49c765be54ffb7b125be6a50b6c5645 ' ) ;
357
+ expect ( asset5 . assetHash ) . toEqual ( 'c02bfba13b2e7e1ff5c778a76e10296b9e8d17f7f8252d097f4170ae04ce0eb4 ' ) ;
358
+ expect ( asset6 . assetHash ) . toEqual ( '3528d6838647a5e9011b0f35aec514d03ad11af05a94653cdcf4dacdbb070a06 ' ) ;
364
359
365
360
} ) ;
366
361
@@ -371,8 +366,8 @@ describe('image asset', () => {
371
366
const asset1 = new DockerImageAsset ( stack , 'Asset1' , { directory } ) ;
372
367
const asset2 = new DockerImageAsset ( stack , 'Asset2' , { directory, repositoryName : 'foo' } ) ;
373
368
374
- expect ( asset1 . assetHash ) . toEqual ( 'b5d181eb114c889020f9d59961ac4ad5d65f49c571c0aafd5ce2be9464bc2d13 ' ) ;
375
- expect ( asset2 . assetHash ) . toEqual ( '0b48fa3f7f75365962e6e18f52608ec4e4451f8ecc0b58abdb063c5381569471 ' ) ;
369
+ expect ( asset1 . assetHash ) . toEqual ( '91cd042be26211c28488a6994327fc579e75e355d9d3bf7043fa6a0bc8ad4265 ' ) ;
370
+ expect ( asset2 . assetHash ) . toEqual ( '6a6cab989dda908fa3d132d58f402f714d79858f3c89473f2b050096954e6827 ' ) ;
376
371
} ) ;
377
372
} ) ;
378
373
0 commit comments