Merge pull request #91 from 030/90-update-number-not-checked

[GH-90] Update number was not checked in tags.

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.0.3] - 2021-09-07
+
+### Fixed
+
+- Update number was not checked in tags
+
 ## [3.0.2] - 2021-08-27
 
 ### Changed
@@ -68,7 +74,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Return latest tag.
 
-[Unreleased]: https://github.com/030/dip/compare/3.0.2...HEAD
+[Unreleased]: https://github.com/030/dip/compare/3.0.3...HEAD
+[3.0.3]: https://github.com/030/dip/compare/3.0.2...3.0.3
 [3.0.2]: https://github.com/030/dip/compare/3.0.1...3.0.2
 [3.0.1]: https://github.com/030/dip/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/030/dip/compare/2.2.0...3.0.0

README.md

@@ -177,7 +177,7 @@ the pipeline will fail as an exit 1 is returned if an image is outdated.
 [![dockeri.co](https://dockeri.co/image/utrecht/dip)](https://hub.docker.com/r/utrecht/dip)
 
 ```bash
-docker run utrecht/dip:3.0.2 dip -image=grafana/grafana -latest=^7\.5\.7$
+docker run utrecht/dip:3.0.3 dip -image=grafana/grafana -latest=^7\.5\.7$
 ```
 
 will return:

build/package/snap/snapcraft.yaml

@@ -1,7 +1,7 @@
 ---
 name: kdiutd
 base: core20
-version: 3.0.2
+version: 3.0.3
 summary: Docker Image Patrol
 description: |
   Keep docker images up-to-date.

deployments/k8s-and-openshift/deploy.yml

@@ -64,7 +64,7 @@ spec:
           serviceAccountName: dip
           containers:
             - name: dip
-              image: utrecht/dip:3.0.2
+              image: utrecht/dip:3.0.3
               resources:
                 limits:
                   memory: "64Mi"

internal/semantic/semantic.go

@@ -47,13 +47,15 @@ func toInt(tagWithoutChars string) (int, error) {
 func update(tag string) (int, error) {
 	re := regexp.MustCompile(`(_|-\w+\d\.)(\d+)`)
 	match := re.FindStringSubmatch(tag)
+	log.Debugf("match elements: '%s'", match)
 	elements := len(match)
-	if elements != 2 {
-		log.Debugf("Cannot determine update number. Required elements is two, but was: '%d'", elements)
+	if elements != 3 {
+		log.Debugf("Cannot determine update number. Required elements is three, but was: '%d'", elements)
 		return 0, nil
 	}
 	updateString := match[2]
 	u, err := strconv.Atoi(updateString)
+	log.Debugf("Update number: '%d'", u)
 	if err != nil {
 		return 0, err
 	}

internal/semantic/semantic_test.go

@@ -47,3 +47,21 @@ func TestSortAndGetLatestTag(t *testing.T) {
 	exp := "boo"
 	assert.Equal(t, exp, act)
 }
+
+func TestUpdateJava(t *testing.T) {
+	exp := 9
+	act, err := update("16.0.1_9-jre-hotspot-focal")
+	if err != nil {
+		t.Error(err)
+	}
+	assert.Equal(t, exp, act)
+}
+
+func TestUpdateGolangAlpine(t *testing.T) {
+	exp := 14
+	act, err := update("1.17.0-alpine3.14")
+	if err != nil {
+		t.Error(err)
+	}
+	assert.Equal(t, exp, act)
+}

internal/sort/tags_test.go

@@ -24,6 +24,24 @@ func TestTagsTwo(t *testing.T) {
 	assert.Equal(t, exp, act)
 }
 
+func TestTagsJava(t *testing.T) {
+	exp := "16.0.1_9-jdk-hotspot-windowsservercore"
+	act, err := Tags([]string{"14.0.2_12-jre-hotspot-bionic", "16.0.1_9-jdk-hotspot-windowsservercore", "14.0.2_13-jre-hotspot-bionic"})
+	if err != nil {
+		t.Error(err)
+	}
+	assert.Equal(t, exp, act)
+}
+
+func TestTagsGolangAlpine(t *testing.T) {
+	exp := "1.17.0-alpine3.16"
+	act, err := Tags([]string{"1.17.0-alpine3.12", "1.17.0-alpine3.14", "1.17.0-alpine3.16", "1.17.0-alpine3.15", "1.17.0-alpine3.13"})
+	if err != nil {
+		t.Error(err)
+	}
+	assert.Equal(t, exp, act)
+}
+
 func TestTagsError(t *testing.T) {
 	actualError := "cannot find the latest tag. Check whether the tags are semantic"
 	_, err := Tags([]string{""})