Skip to content

Commit 8e0d859

Browse files
author
Natalie Arellano
committed
Resolve some TODOs
Signed-off-by: Natalie Arellano <[email protected]>
1 parent 1cc1cc8 commit 8e0d859

File tree

5 files changed

+72
-47
lines changed

5 files changed

+72
-47
lines changed

‎acceptance/acceptance_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,8 +1162,8 @@ func testAcceptance(
11621162
ref, err := name.ParseReference(repoName, name.WeakValidation)
11631163
assert.Nil(err)
11641164
cacheImage := cache.NewImageCache(ref, dockerCli)
1165-
buildCacheVolume := cache.NewVolumeCache(ref, cache.CacheInfo{}, "build", dockerCli)
1166-
launchCacheVolume := cache.NewVolumeCache(ref, cache.CacheInfo{}, "launch", dockerCli)
1165+
buildCacheVolume, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "build", dockerCli)
1166+
launchCacheVolume, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "launch", dockerCli)
11671167
cacheImage.Clear(context.TODO())
11681168
buildCacheVolume.Clear(context.TODO())
11691169
launchCacheVolume.Clear(context.TODO())
@@ -1282,8 +1282,8 @@ func testAcceptance(
12821282
ref, err := name.ParseReference(repoName, name.WeakValidation)
12831283
assert.Nil(err)
12841284
cacheImage := cache.NewImageCache(ref, dockerCli)
1285-
buildCacheVolume := cache.NewVolumeCache(ref, cache.CacheInfo{}, "build", dockerCli)
1286-
launchCacheVolume := cache.NewVolumeCache(ref, cache.CacheInfo{}, "launch", dockerCli)
1285+
buildCacheVolume, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "build", dockerCli)
1286+
launchCacheVolume, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "launch", dockerCli)
12871287
cacheImage.Clear(context.TODO())
12881288
buildCacheVolume.Clear(context.TODO())
12891289
launchCacheVolume.Clear(context.TODO())
@@ -3167,8 +3167,8 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
31673167
imageManager.CleanupImages(origID, repoName, runBefore)
31683168
ref, err := name.ParseReference(repoName, name.WeakValidation)
31693169
assert.Nil(err)
3170-
buildCacheVolume := cache.NewVolumeCache(ref, cache.CacheInfo{}, "build", dockerCli)
3171-
launchCacheVolume := cache.NewVolumeCache(ref, cache.CacheInfo{}, "launch", dockerCli)
3170+
buildCacheVolume, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "build", dockerCli)
3171+
launchCacheVolume, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "launch", dockerCli)
31723172
assert.Succeeds(buildCacheVolume.Clear(context.TODO()))
31733173
assert.Succeeds(launchCacheVolume.Clear(context.TODO()))
31743174
})

‎internal/build/lifecycle_execution.go

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,11 @@ func (l *LifecycleExecution) Run(ctx context.Context, phaseFactoryCreator PhaseF
179179
} else {
180180
switch l.opts.Cache.Build.Format {
181181
case cache.CacheVolume:
182-
buildCache = cache.NewVolumeCache(l.opts.Image, l.opts.Cache.Build, "build", l.docker)
182+
var err error
183+
buildCache, err = cache.NewVolumeCache(l.opts.Image, l.opts.Cache.Build, "build", l.docker)
184+
if err != nil {
185+
return err
186+
}
183187
l.logger.Debugf("Using build cache volume %s", style.Symbol(buildCache.Name()))
184188
case cache.CacheBind:
185189
buildCache = cache.NewBindCache(l.opts.Cache.Build, l.docker)
@@ -194,7 +198,10 @@ func (l *LifecycleExecution) Run(ctx context.Context, phaseFactoryCreator PhaseF
194198
l.logger.Debugf("Build cache %s cleared", style.Symbol(buildCache.Name()))
195199
}
196200

197-
launchCache := cache.NewVolumeCache(l.opts.Image, l.opts.Cache.Launch, "launch", l.docker)
201+
launchCache, err := cache.NewVolumeCache(l.opts.Image, l.opts.Cache.Launch, "launch", l.docker)
202+
if err != nil {
203+
return err
204+
}
198205

199206
if !l.opts.UseCreator {
200207
if l.platformAPI.LessThan("0.7") {
@@ -224,7 +231,10 @@ func (l *LifecycleExecution) Run(ctx context.Context, phaseFactoryCreator PhaseF
224231
// lifecycle 0.17.0 (introduces support for Platform API 0.12) and above will ensure that
225232
// this volume is owned by the CNB user,
226233
// and hence the restorer (after dropping privileges) will be able to write to it.
227-
kanikoCache = cache.NewVolumeCache(l.opts.Image, l.opts.Cache.Kaniko, "kaniko", l.docker)
234+
kanikoCache, err = cache.NewVolumeCache(l.opts.Image, l.opts.Cache.Kaniko, "kaniko", l.docker)
235+
if err != nil {
236+
return err
237+
}
228238
} else {
229239
switch {
230240
case buildCache.Type() == cache.Volume:
@@ -236,7 +246,10 @@ func (l *LifecycleExecution) Run(ctx context.Context, phaseFactoryCreator PhaseF
236246
return fmt.Errorf("build cache must be volume cache when building with extensions")
237247
default:
238248
// The kaniko cache is unused, so it doesn't matter that it's not usable.
239-
kanikoCache = cache.NewVolumeCache(l.opts.Image, l.opts.Cache.Kaniko, "kaniko", l.docker)
249+
kanikoCache, err = cache.NewVolumeCache(l.opts.Image, l.opts.Cache.Kaniko, "kaniko", l.docker)
250+
if err != nil {
251+
return err
252+
}
240253
}
241254
}
242255

‎internal/config/config.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ type Config struct {
2323
LifecycleImage string `toml:"lifecycle-image,omitempty"`
2424
RegistryMirrors map[string]string `toml:"registry-mirrors,omitempty"`
2525
LayoutRepositoryDir string `toml:"layout-repo-dir,omitempty"`
26-
VolumeKeys map[string]string `toml:"volume-keys,omitempty"` // TODO: move to own struct
26+
}
27+
28+
type VolumeConfig struct {
29+
VolumeKeys map[string]string `toml:"volume-keys,omitempty"`
2730
}
2831

2932
type Registry struct {
@@ -88,7 +91,16 @@ func Read(path string) (Config, error) {
8891
return cfg, nil
8992
}
9093

91-
func Write(cfg Config, path string) error {
94+
func ReadVolumeKeys(path string) (VolumeConfig, error) {
95+
cfg := VolumeConfig{}
96+
_, err := toml.DecodeFile(path, &cfg)
97+
if err != nil && !os.IsNotExist(err) {
98+
return VolumeConfig{}, errors.Wrapf(err, "failed to read config file at path %s", path)
99+
}
100+
return cfg, nil
101+
}
102+
103+
func Write(cfg interface{}, path string) error {
92104
if err := MkdirAll(filepath.Dir(path)); err != nil {
93105
return err
94106
}

‎pkg/cache/volume_cache.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ type VolumeCache struct {
2222
volume string
2323
}
2424

25-
func NewVolumeCache(imageRef name.Reference, cacheType CacheInfo, suffix string, dockerClient DockerClient) *VolumeCache {
25+
func NewVolumeCache(imageRef name.Reference, cacheType CacheInfo, suffix string, dockerClient DockerClient) (*VolumeCache, error) {
2626
var volumeName string
2727
if cacheType.Source == "" {
2828
volumeKey, err := getVolumeKey(imageRef)
2929
if err != nil {
30-
// TODO
30+
return nil, err
3131
}
3232
sum := sha256.Sum256([]byte(imageRef.Name() + volumeKey)) // TODO: investigate if there are better ways to do this
3333
vol := paths.FilterReservedNames(fmt.Sprintf("%s-%x", sanitizedRef(imageRef), sum[:6]))
@@ -39,7 +39,7 @@ func NewVolumeCache(imageRef name.Reference, cacheType CacheInfo, suffix string,
3939
return &VolumeCache{
4040
volume: volumeName,
4141
docker: dockerClient,
42-
}
42+
}, nil
4343
}
4444

4545
func getVolumeKey(imageRef name.Reference) (string, error) {
@@ -58,7 +58,7 @@ func getVolumeKey(imageRef name.Reference) (string, error) {
5858
if err != nil {
5959
return "", err
6060
}
61-
cfg, err := config.Read(volumeKeysPath)
61+
cfg, err := config.ReadVolumeKeys(volumeKeysPath)
6262
if err != nil {
6363
return "", err
6464
}

‎pkg/cache/volume_cache_test.go

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
4343
it("adds suffix to calculated name", func() {
4444
ref, err := name.ParseReference("my/repo", name.WeakValidation)
4545
h.AssertNil(t, err)
46-
subject := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
46+
subject, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
4747
if !strings.HasSuffix(subject.Name(), ".some-suffix") {
4848
t.Fatalf("Calculated volume name '%s' should end with '.some-suffix'", subject.Name())
4949
}
@@ -53,8 +53,8 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
5353
ref, err := name.ParseReference("my/repo", name.WeakValidation)
5454
h.AssertNil(t, err)
5555

56-
subject := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
57-
expected := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
56+
subject, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
57+
expected, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
5858
if subject.Name() != expected.Name() {
5959
t.Fatalf("The same repo name should result in the same volume")
6060
}
@@ -64,11 +64,11 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
6464
ref, err := name.ParseReference("my/repo:other-tag", name.WeakValidation)
6565
h.AssertNil(t, err)
6666

67-
subject := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
67+
subject, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
6868

6969
ref, err = name.ParseReference("my/repo", name.WeakValidation)
7070
h.AssertNil(t, err)
71-
notExpected := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
71+
notExpected, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
7272
if subject.Name() == notExpected.Name() {
7373
t.Fatalf("Different image tags should result in different volumes")
7474
}
@@ -78,11 +78,11 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
7878
ref, err := name.ParseReference("registry.com/my/repo:other-tag", name.WeakValidation)
7979
h.AssertNil(t, err)
8080

81-
subject := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
81+
subject, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
8282

8383
ref, err = name.ParseReference("my/repo", name.WeakValidation)
8484
h.AssertNil(t, err)
85-
notExpected := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
85+
notExpected, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
8686
if subject.Name() == notExpected.Name() {
8787
t.Fatalf("Different image registries should result in different volumes")
8888
}
@@ -92,31 +92,31 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
9292
ref, err := name.ParseReference("my/repo:latest", name.WeakValidation)
9393
h.AssertNil(t, err)
9494

95-
subject := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
95+
subject, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
9696

9797
ref, err = name.ParseReference("my/repo", name.WeakValidation)
9898
h.AssertNil(t, err)
99-
expected := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
99+
expected, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
100100
h.AssertEq(t, subject.Name(), expected.Name())
101101
})
102102

103103
it("resolves implied registry", func() {
104104
ref, err := name.ParseReference("index.docker.io/my/repo", name.WeakValidation)
105105
h.AssertNil(t, err)
106106

107-
subject := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
107+
subject, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
108108

109109
ref, err = name.ParseReference("my/repo", name.WeakValidation)
110110
h.AssertNil(t, err)
111-
expected := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
111+
expected, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
112112
h.AssertEq(t, subject.Name(), expected.Name())
113113
})
114114

115115
it("includes human readable information", func() {
116116
ref, err := name.ParseReference("myregistryhost:5000/fedora/httpd:version1.0", name.WeakValidation)
117117
h.AssertNil(t, err)
118118

119-
subject := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
119+
subject, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
120120

121121
h.AssertContains(t, subject.Name(), "fedora_httpd_version1.0")
122122
h.AssertTrue(t, names.RestrictedNamePattern.MatchString(subject.Name()))
@@ -132,9 +132,9 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
132132
ref, err := name.ParseReference("my/repo:some-tag", name.WeakValidation)
133133
h.AssertNil(t, err)
134134

135-
nameFromNewKey := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient) // sources a new key
135+
nameFromNewKey, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient) // sources a new key
136136
h.AssertNil(t, os.Setenv("PACK_VOLUME_KEY", "some-volume-key"))
137-
nameFromEnvKey := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient) // sources key from env
137+
nameFromEnvKey, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient) // sources key from env
138138
h.AssertNotEq(t, nameFromNewKey.Name(), nameFromEnvKey.Name())
139139
})
140140
})
@@ -158,15 +158,15 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
158158
ref, err := name.ParseReference("my/repo:some-tag", name.WeakValidation)
159159
h.AssertNil(t, err)
160160

161-
nameFromNewKey := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient) // sources a new key
161+
nameFromNewKey, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient) // sources a new key
162162

163163
cfgContents := `
164164
[volume-keys]
165165
"index.docker.io/my/repo:some-tag" = "SOME_VOLUME_KEY"
166166
`
167167
h.AssertNil(t, os.WriteFile(filepath.Join(tmpPackHome, "volume-keys.toml"), []byte(cfgContents), 0755)) // overrides the key that was set
168168

169-
nameFromConfigKey := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient) // sources key from config
169+
nameFromConfigKey, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient) // sources key from config
170170
h.AssertNotEq(t, nameFromNewKey.Name(), nameFromConfigKey.Name())
171171
})
172172
})
@@ -176,11 +176,11 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
176176
ref, err := name.ParseReference("my/repo:some-tag", name.WeakValidation)
177177
h.AssertNil(t, err)
178178

179-
nameFromNewKey := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient) // sources a new key
180-
nameFromConfigKey := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient) // sources same key from config
179+
nameFromNewKey, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient) // sources a new key
180+
nameFromConfigKey, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient) // sources same key from config
181181
h.AssertEq(t, nameFromNewKey.Name(), nameFromConfigKey.Name())
182182

183-
cfg, err := config.Read(filepath.Join(tmpPackHome, "volume-keys.toml"))
183+
cfg, err := config.ReadVolumeKeys(filepath.Join(tmpPackHome, "volume-keys.toml"))
184184
h.AssertNil(t, err)
185185
h.AssertNotNil(t, cfg.VolumeKeys["index.docker.io/my/repo:some-tag"])
186186
})
@@ -200,7 +200,7 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
200200
ref, err := name.ParseReference("my/repo", name.WeakValidation)
201201
h.AssertNil(t, err)
202202

203-
subject := cache.NewVolumeCache(ref, cacheInfo, "some-suffix", dockerClient)
203+
subject, _ := cache.NewVolumeCache(ref, cacheInfo, "some-suffix", dockerClient)
204204

205205
if volumeName != subject.Name() {
206206
t.Fatalf("Volume name '%s' should be same as the name specified '%s'", subject.Name(), volumeName)
@@ -211,9 +211,9 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
211211
ref, err := name.ParseReference("my/repo", name.WeakValidation)
212212
h.AssertNil(t, err)
213213

214-
subject := cache.NewVolumeCache(ref, cacheInfo, "some-suffix", dockerClient)
214+
subject, _ := cache.NewVolumeCache(ref, cacheInfo, "some-suffix", dockerClient)
215215

216-
expected := cache.NewVolumeCache(ref, cacheInfo, "some-suffix", dockerClient)
216+
expected, _ := cache.NewVolumeCache(ref, cacheInfo, "some-suffix", dockerClient)
217217
if subject.Name() != expected.Name() {
218218
t.Fatalf("The same repo name should result in the same volume")
219219
}
@@ -223,11 +223,11 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
223223
ref, err := name.ParseReference("registry.com/my/repo:other-tag", name.WeakValidation)
224224
h.AssertNil(t, err)
225225

226-
subject := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
226+
subject, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
227227

228228
ref, err = name.ParseReference("my/repo", name.WeakValidation)
229229
h.AssertNil(t, err)
230-
notExpected := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
230+
notExpected, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
231231
if subject.Name() == notExpected.Name() {
232232
t.Fatalf("Different image registries should result in different volumes")
233233
}
@@ -237,31 +237,31 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
237237
ref, err := name.ParseReference("my/repo:latest", name.WeakValidation)
238238
h.AssertNil(t, err)
239239

240-
subject := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
240+
subject, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
241241

242242
ref, err = name.ParseReference("my/repo", name.WeakValidation)
243243
h.AssertNil(t, err)
244-
expected := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
244+
expected, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
245245
h.AssertEq(t, subject.Name(), expected.Name())
246246
})
247247

248248
it("resolves implied registry", func() {
249249
ref, err := name.ParseReference("index.docker.io/my/repo", name.WeakValidation)
250250
h.AssertNil(t, err)
251251

252-
subject := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
252+
subject, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
253253

254254
ref, err = name.ParseReference("my/repo", name.WeakValidation)
255255
h.AssertNil(t, err)
256-
expected := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
256+
expected, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
257257
h.AssertEq(t, subject.Name(), expected.Name())
258258
})
259259

260260
it("includes human readable information", func() {
261261
ref, err := name.ParseReference("myregistryhost:5000/fedora/httpd:version1.0", name.WeakValidation)
262262
h.AssertNil(t, err)
263263

264-
subject := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
264+
subject, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
265265

266266
h.AssertContains(t, subject.Name(), "fedora_httpd_version1.0")
267267
h.AssertTrue(t, names.RestrictedNamePattern.MatchString(subject.Name()))
@@ -286,7 +286,7 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
286286
ref, err := name.ParseReference(h.RandString(10), name.WeakValidation)
287287
h.AssertNil(t, err)
288288

289-
subject = cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
289+
subject, _ = cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
290290
volumeName = subject.Name()
291291
})
292292

@@ -324,7 +324,7 @@ func testCache(t *testing.T, when spec.G, it spec.S) {
324324
it("returns the cache type", func() {
325325
ref, err := name.ParseReference("my/repo", name.WeakValidation)
326326
h.AssertNil(t, err)
327-
subject := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
327+
subject, _ := cache.NewVolumeCache(ref, cache.CacheInfo{}, "some-suffix", dockerClient)
328328
expected := cache.Volume
329329
h.AssertEq(t, subject.Type(), expected)
330330
})

0 commit comments

Comments
 (0)