chore: update to go 1.21.0 (#156)

* chore: update to go 1.21.0 --------- Signed-off-by: Christopher Phillips <[email protected]>
anchore · Sep 8, 2023 · dbb700f · dbb700f
1 parent fa9af6f
commit dbb700f
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 13 deletions.
diff --git a/.github/actions/bootstrap/action.yaml b/.github/actions/bootstrap/action.yaml
@@ -12,11 +12,11 @@ inputs:
   go-version:
     description: "Go version to install"
     required: true
-    default: "1.20.x"
+    default: "1.21.x"
   python-version:
     description: "Python version to install"
     required: true
-    default: "3.10"
+    default: "3.11"
   poetry-version:
     description: "Poetry version to install"
     required: true

diff --git a/.github/workflows/update-bootstrap-tools.yml b/.github/workflows/update-bootstrap-tools.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  GO_VERSION: "1.20.x"
+  GO_VERSION: "1.21.x"
   GO_STABLE_VERSION: true
 
 jobs:
@@ -64,4 +64,4 @@ jobs:
             - [chronicle ${{ steps.latest-versions.outputs.CHRONICLE }}](https://github.com/anchore/chronicle/releases/tag/${{ steps.latest-versions.outputs.CHRONICLE }})
             - [goreleaser ${{ steps.latest-versions.outputs.GORELEASER }}](https://github.com/goreleaser/goreleaser/releases/tag/${{ steps.latest-versions.outputs.GORELEASER }})
             This is an auto-generated pull request to update all of the bootstrap tools to the latest versions.
-          token: ${{ steps.generate-token.outputs.token }}
+          token: ${{ steps.generate-token.outputs.token }}
diff --git a/.github/workflows/update-grype-release.yml b/.github/workflows/update-grype-release.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  GO_VERSION: "1.20.x"
+  GO_VERSION: "1.21.x"
   GO_STABLE_VERSION: true
 
 jobs:

diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module github.com/anchore/grype-db
 
-go 1.20
+go 1.21
+
+toolchain go1.21.0
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1

diff --git a/go.sum b/go.sum
diff --git a/manager/src/grype_db_manager/grypedb.py b/manager/src/grype_db_manager/grypedb.py
@@ -107,7 +107,7 @@ def get_db_info(self, db_uuid: str) -> DBInfo | None:
             uuid=db_uuid,
             schema_version=metadata["version"],
             db_checksum=metadata["checksum"],
-            db_created=db_created_timestamp,
+            db_created=db_created_timestamp.strftime("%Y-%m-%dT%H:%M:%SZ"),
             data_created=metadata["built"],
             archive_path=abs_archive_path,
         )
@@ -126,7 +126,7 @@ def list_dbs(self) -> list[DBInfo]:
             except DBInvalidException as e:
                 logging.debug(f"failed to get info for session {db_uuid!r}: {e}")
 
-        return sessions
+        return sorted(sessions, key=lambda x: x.db_created)
 
 
 class GrypeDB:

diff --git a/manager/tests/fixtures/dbs-case-1/dbs/41e4c9e7-73c7-4106-bfb3-82e58ce15d9a/timestamp b/manager/tests/fixtures/dbs-case-1/dbs/41e4c9e7-73c7-4106-bfb3-82e58ce15d9a/timestamp
@@ -0,0 +1 @@
+2023-07-31T03:45:08Z
diff --git a/...er/tests/fixtures/dbs-case-1/dbs/9d1fce98-9c10-4887-949e-8296a259daf5/build/metadata.json b/...er/tests/fixtures/dbs-case-1/dbs/9d1fce98-9c10-4887-949e-8296a259daf5/build/metadata.json
@@ -1,5 +1,5 @@
 {
-    "built": "2023-07-31T03:45:08Z",
+    "built": "2023-07-30T03:45:08Z",
     "version": 4,
     "checksum": "sha256:0f2f6e45dcde94259c078d237e575a30787c5ad04345c57e4d5dea08a95af4cb"
-   }
+   }
diff --git a/manager/tests/fixtures/dbs-case-1/dbs/9d1fce98-9c10-4887-949e-8296a259daf5/timestamp b/manager/tests/fixtures/dbs-case-1/dbs/9d1fce98-9c10-4887-949e-8296a259daf5/timestamp
@@ -0,0 +1 @@
+2023-07-30T03:45:08Z
diff --git a/manager/tests/unit/test_grypedb.py b/manager/tests/unit/test_grypedb.py
@@ -18,8 +18,8 @@ def path_to_archive(session_id: str, name: str):
                 uuid="9d1fce98-9c10-4887-949e-8296a259daf5",
                 schema_version=4,
                 db_checksum="sha256:0f2f6e45dcde94259c078d237e575a30787c5ad04345c57e4d5dea08a95af4cb",
-                db_created=None,
-                data_created="2023-07-31T03:45:08Z",
+                db_created="2023-07-30T03:45:08Z",
+                data_created="2023-07-30T03:45:08Z",
                 archive_path=path_to_archive(
                     "9d1fce98-9c10-4887-949e-8296a259daf5",
                     "vulnerability-db_v4_2023-08-03T01:34:34Z_54b7b6a76b058f1fa587.tar.gz",
@@ -29,7 +29,7 @@ def path_to_archive(session_id: str, name: str):
                 uuid="41e4c9e7-73c7-4106-bfb3-82e58ce15d9a",
                 schema_version=5,
                 db_checksum="sha256:c996a4c459a2fca9283c4fd8cdb53e3b050650d76e6ce517b91e34430f6db854",
-                db_created=None,
+                db_created="2023-07-31T03:45:08Z",
                 data_created="2023-07-31T01:34:05Z",
                 archive_path=path_to_archive(
                     "41e4c9e7-73c7-4106-bfb3-82e58ce15d9a",