mirrors/diun
1
0
Fork 0
mirror of https://github.com/crazy-max/diun.git synced 2025-12-24 06:28:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: use typed error and fix missing wraps

Browse Source
This commit is contained in:
CrazyMax
2023-09-16 11:01:31 +02:00
parent 20681d68d1
commit 24bc0548e0
24 changed files with 109 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
internal/provider/common_test.go
View File

@@ -18,7 +18,7 @@ func TestValidateImage(t *testing.T) {
watchByDef bool
imageDefaults model.Image
expectedImage model.Image
expectedErr error
expectedErr interface{}
}{
// Test strip sha
{
@@ -69,7 +69,7 @@ func TestValidateImage(t *testing.T) {
expectedErr: nil,
},
{
name: "Invlaid diun.enable",
name: "Invalid diun.enable",
image: "myimg",
watchByDef: false,
labels: map[string]string{
@@ -78,7 +78,7 @@ func TestValidateImage(t *testing.T) {
expectedImage: model.Image{
Name: "myimg",
},
expectedErr: errInvalidLabel,
expectedErr: &invalidLabelError{},
},
// Test diun.regopt
{
@@ -164,7 +164,7 @@ func TestValidateImage(t *testing.T) {
expectedImage: model.Image{
Name: "myimg",
},
expectedErr: errInvalidLabel,
expectedErr: &invalidLabelError{},
},
{
name: "Override default image values with labels (true > false)",
@@ -225,7 +225,7 @@ func TestValidateImage(t *testing.T) {
Name: "myimg",
NotifyOn: []model.NotifyOn{},
},
expectedErr: errInvalidLabel,
expectedErr: &invalidLabelError{},
},
{
name: "Set empty notify_on",
@@ -296,7 +296,7 @@ func TestValidateImage(t *testing.T) {
expectedImage: model.Image{
Name: "myimg",
},
expectedErr: errInvalidLabel,
expectedErr: &invalidLabelError{},
},
{
name: "Set empty sort_tags",
@@ -367,7 +367,7 @@ func TestValidateImage(t *testing.T) {
expectedImage: model.Image{
Name: "myimg",
},
expectedErr: errInvalidLabel,
expectedErr: &invalidLabelError{},
},
{
name: "Set empty max_tags",
@@ -380,7 +380,7 @@ func TestValidateImage(t *testing.T) {
expectedImage: model.Image{
Name: "myimg",
},
expectedErr: errInvalidLabel,
expectedErr: &invalidLabelError{},
},
{
name: "Default max_tags",
@@ -678,7 +678,7 @@ func TestValidateImage(t *testing.T) {
expectedImage: model.Image{
Name: "myimg",
},
expectedErr: errInvalidLabel,
expectedErr: &invalidLabelError{},
},
{
name: "Set empty platform",
@@ -692,7 +692,7 @@ func TestValidateImage(t *testing.T) {
Name: "myimg",
Platform: model.ImagePlatform{},
},
expectedErr: errInvalidLabel,
expectedErr: &invalidLabelError{},
},
{
name: "Default platform",
@@ -768,7 +768,7 @@ func TestValidateImage(t *testing.T) {
expectedImage: model.Image{
Name: "myimg",
},
expectedErr: errInvalidLabel,
expectedErr: &invalidLabelError{},
},
{
name: "Set empty metadata key",
@@ -855,25 +855,26 @@ func TestValidateImage(t *testing.T) {
},
}
for _, c := range cases {
c := c
t.Run(c.name, func(t *testing.T) {
for _, tt := range cases {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
actualImg, actualErr := ValidateImage(
c.image,
c.metadata,
c.labels,
c.watchByDef,
c.imageDefaults,
img, err := ValidateImage(
tt.image,
tt.metadata,
tt.labels,
tt.watchByDef,
tt.imageDefaults,
)
assert.Equal(t, c.expectedImage, actualImg)
if c.expectedErr == nil {
assert.NoError(t, actualErr)
if tt.expectedErr == nil {
assert.NoError(t, err)
assert.Equal(t, tt.expectedImage, img)
} else {
if assert.Error(t, c.expectedErr) {
assert.ErrorIs(t, actualErr, c.expectedErr)
switch err.(type) {
case *invalidLabelError:
assert.Error(t, err)
default:
assert.Error(t, err)
}
}
})