Compare commits

...
5 Commits
Author SHA1 Message Date
William Murphy 5d54e6e847 Configure chronicle to pre-1.0 mode (#1886)
Track a chronicle config file that causes chronicle to bump minor
version instead of major version in response to the "breaking-change"
label for pre-1.0 releases.

Signed-off-by: Will Murphy <will.murphy@anchore.com>
2023-06-20 16:08:35 +00:00
Keith Zantow 631d50d038 chore: update SPDX license list to 3.21 (#1885) 2023-06-20 15:47:02 +00:00
anchore-actions-token-generator[bot] 269006bf04 chore(deps): update bootstrap tools to latest versions (#1880) 2023-06-20 10:22:18 -04:00
William Murphy e2ed89f700 Pad artifact IDs (#1882)
Otherwise the hash can sometimes be short if it results in a low uint64.

Signed-off-by: Will Murphy <will.murphy@anchore.com>
2023-06-16 13:26:18 -04:00
dependabot[bot] badb957888 chore(deps): bump golang.org/x/mod from 0.10.0 to 0.11.0 (#1878)
Bumps [golang.org/x/mod](https://github.com/golang/mod) from 0.10.0 to 0.11.0.
- [Commits](https://github.com/golang/mod/compare/v0.10.0...v0.11.0)

---
updated-dependencies:
- dependency-name: golang.org/x/mod
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-15 14:10:11 -04:00
7 changed files with 51 additions and 8 deletions
+1
View File
@@ -0,0 +1 @@
enforce-v0: true # don't make breaking-change label bump major version before 1.0.
+1 -1
View File
@@ -10,7 +10,7 @@ CHRONICLE_CMD = $(TEMP_DIR)/chronicle
GLOW_CMD = $(TEMP_DIR)/glow
# Tool versions #################################
GOLANGCILINT_VERSION := v1.53.2
GOLANGCILINT_VERSION := v1.53.3
GOSIMPORTS_VERSION := v0.3.8
BOUNCER_VERSION := v0.4.0
CHRONICLE_VERSION := v0.6.0
+1 -1
View File
@@ -42,7 +42,7 @@ require (
github.com/wagoodman/go-progress v0.0.0-20230301185719-21920a456ad5
github.com/wagoodman/jotframe v0.0.0-20211129225309-56b0d0a4aebb
github.com/xeipuuv/gojsonschema v1.2.0
golang.org/x/mod v0.10.0
golang.org/x/mod v0.11.0
golang.org/x/net v0.11.0
golang.org/x/term v0.9.0
gopkg.in/yaml.v2 v2.4.0
+2 -2
View File
@@ -720,8 +720,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+44 -2
View File
@@ -1,9 +1,9 @@
// Code generated by go generate; DO NOT EDIT.
// This file was generated by robots at 2023-03-22 18:00:44.589388 -0400 EDT m=+0.160679640
// This file was generated by robots at 2023-06-20 11:37:07.979104 -0400 EDT m=+0.478800893
// using data from https://spdx.org/licenses/licenses.json
package spdxlicense
const Version = "3.20"
const Version = "3.21"
var licenseIDs = map[string]string{
"0bsd": "0BSD",
@@ -93,6 +93,11 @@ var licenseIDs = map[string]string{
"artistic2": "Artistic-2.0",
"artistic2.0": "Artistic-2.0",
"artistic2.0.0": "Artistic-2.0",
"aswfdigitalassets1": "ASWF-Digital-Assets-1.0",
"aswfdigitalassets1.0": "ASWF-Digital-Assets-1.0",
"aswfdigitalassets1.0.0": "ASWF-Digital-Assets-1.0",
"aswfdigitalassets1.1": "ASWF-Digital-Assets-1.1",
"aswfdigitalassets1.1.0": "ASWF-Digital-Assets-1.1",
"baekmuk": "Baekmuk",
"bahyph": "Bahyph",
"barr": "Barr",
@@ -108,6 +113,7 @@ var licenseIDs = map[string]string{
"blueoak1": "BlueOak-1.0.0",
"blueoak1.0": "BlueOak-1.0.0",
"blueoak1.0.0": "BlueOak-1.0.0",
"boehmgc": "Boehm-GC",
"borceux": "Borceux",
"briangladman3.0.0clause": "Brian-Gladman-3-Clause",
"briangladman3.0clause": "Brian-Gladman-3-Clause",
@@ -336,10 +342,13 @@ var licenseIDs = map[string]string{
"ccbysa3.0.0": "CC-BY-SA-3.0",
"ccbysa3.0.0at": "CC-BY-SA-3.0-AT",
"ccbysa3.0.0de": "CC-BY-SA-3.0-DE",
"ccbysa3.0.0igo": "CC-BY-SA-3.0-IGO",
"ccbysa3.0at": "CC-BY-SA-3.0-AT",
"ccbysa3.0de": "CC-BY-SA-3.0-DE",
"ccbysa3.0igo": "CC-BY-SA-3.0-IGO",
"ccbysa3at": "CC-BY-SA-3.0-AT",
"ccbysa3de": "CC-BY-SA-3.0-DE",
"ccbysa3igo": "CC-BY-SA-3.0-IGO",
"ccbysa4": "CC-BY-SA-4.0",
"ccbysa4.0": "CC-BY-SA-4.0",
"ccbysa4.0.0": "CC-BY-SA-4.0",
@@ -440,6 +449,7 @@ var licenseIDs = map[string]string{
"drl1.0": "DRL-1.0",
"drl1.0.0": "DRL-1.0",
"dsdp": "DSDP",
"dtoa": "dtoa",
"dvipdfm": "dvipdfm",
"ecl1": "ECL-1.0",
"ecl1.0": "ECL-1.0",
@@ -638,6 +648,9 @@ var licenseIDs = map[string]string{
"imlib2.0": "Imlib2",
"imlib2.0.0": "Imlib2",
"infozip": "Info-ZIP",
"innernet2": "Inner-Net-2.0",
"innernet2.0": "Inner-Net-2.0",
"innernet2.0.0": "Inner-Net-2.0",
"intel": "Intel",
"intelacpi": "Intel-ACPI",
"interbase1": "Interbase-1.0",
@@ -663,8 +676,11 @@ var licenseIDs = map[string]string{
"lal1.3": "LAL-1.3",
"lal1.3.0": "LAL-1.3",
"latex2.0.0e": "Latex2e",
"latex2.0.0etranslatednotice": "Latex2e-translated-notice",
"latex2.0e": "Latex2e",
"latex2.0etranslatednotice": "Latex2e-translated-notice",
"latex2e": "Latex2e",
"latex2etranslatednotice": "Latex2e-translated-notice",
"leptonica": "Leptonica",
"lgpl2": "LGPL-2.0-only",
"lgpl2+": "LGPL-2.0-or-later",
@@ -717,7 +733,14 @@ var licenseIDs = map[string]string{
"liliqrplus1": "LiLiQ-Rplus-1.1",
"liliqrplus1.1": "LiLiQ-Rplus-1.1",
"liliqrplus1.1.0": "LiLiQ-Rplus-1.1",
"linuxmanpages1.0.0para": "Linux-man-pages-1-para",
"linuxmanpages1.0para": "Linux-man-pages-1-para",
"linuxmanpages1para": "Linux-man-pages-1-para",
"linuxmanpagescopyleft": "Linux-man-pages-copyleft",
"linuxmanpagescopyleft2.0.0para": "Linux-man-pages-copyleft-2-para",
"linuxmanpagescopyleft2.0para": "Linux-man-pages-copyleft-2-para",
"linuxmanpagescopyleft2para": "Linux-man-pages-copyleft-2-para",
"linuxmanpagescopyleftvar": "Linux-man-pages-copyleft-var",
"linuxopenib": "Linux-OpenIB",
"loop": "LOOP",
"lpl1": "LPL-1.0",
@@ -746,6 +769,7 @@ var licenseIDs = map[string]string{
"lzmasdk9to9.20": "LZMA-SDK-9.11-to-9.20",
"makeindex": "MakeIndex",
"martinbirgmeier": "Martin-Birgmeier",
"metamail": "metamail",
"minpack": "Minpack",
"miros": "MirOS",
"mit": "MIT",
@@ -754,6 +778,7 @@ var licenseIDs = map[string]string{
"mitcmu": "MIT-CMU",
"mitenna": "MIT-enna",
"mitfeh": "MIT-feh",
"mitfestival": "MIT-Festival",
"mitmodernvariant": "MIT-Modern-Variant",
"mitnfa": "MITNFA",
"mitopengroup": "MIT-open-group",
@@ -810,6 +835,7 @@ var licenseIDs = map[string]string{
"nicta1.0.0": "NICTA-1.0",
"nistpd": "NIST-PD",
"nistpdfallback": "NIST-PD-fallback",
"nistsoftware": "NIST-Software",
"nlod1": "NLOD-1.0",
"nlod1.0": "NLOD-1.0",
"nlod1.0.0": "NLOD-1.0",
@@ -908,6 +934,9 @@ var licenseIDs = map[string]string{
"oldap2.7.0": "OLDAP-2.7",
"oldap2.8": "OLDAP-2.8",
"oldap2.8.0": "OLDAP-2.8",
"olfl1": "OLFL-1.3",
"olfl1.3": "OLFL-1.3",
"olfl1.3.0": "OLFL-1.3",
"oml": "OML",
"openpbs2": "OpenPBS-2.3",
"openpbs2.3": "OpenPBS-2.3",
@@ -916,6 +945,9 @@ var licenseIDs = map[string]string{
"opl1": "OPL-1.0",
"opl1.0": "OPL-1.0",
"opl1.0.0": "OPL-1.0",
"opluk3": "OPL-UK-3.0",
"opluk3.0": "OPL-UK-3.0",
"opluk3.0.0": "OPL-UK-3.0",
"opubl1": "OPUBL-1.0",
"opubl1.0": "OPUBL-1.0",
"opubl1.0.0": "OPUBL-1.0",
@@ -1007,6 +1039,9 @@ var licenseIDs = map[string]string{
"sgib2": "SGI-B-2.0",
"sgib2.0": "SGI-B-2.0",
"sgib2.0.0": "SGI-B-2.0",
"sgp4": "SGP4",
"sgp4.0": "SGP4",
"sgp4.0.0": "SGP4",
"shl0.5": "SHL-0.5",
"shl0.5.0": "SHL-0.5",
"shl0.51": "SHL-0.51",
@@ -1052,6 +1087,7 @@ var licenseIDs = map[string]string{
"taprohl1.0.0": "TAPR-OHL-1.0",
"tcl": "TCL",
"tcpwrappers": "TCP-wrappers",
"termreadkey": "TermReadKey",
"tmate": "TMate",
"torque1": "TORQUE-1.1",
"torque1.1": "TORQUE-1.1",
@@ -1079,6 +1115,7 @@ var licenseIDs = map[string]string{
"unicodedfs2016.0": "Unicode-DFS-2016",
"unicodedfs2016.0.0": "Unicode-DFS-2016",
"unicodetou": "Unicode-TOU",
"unixcrypt": "UnixCrypt",
"unlicense": "Unlicense",
"upl1": "UPL-1.0",
"upl1.0": "UPL-1.0",
@@ -1103,6 +1140,7 @@ var licenseIDs = map[string]string{
"watcom1": "Watcom-1.0",
"watcom1.0": "Watcom-1.0",
"watcom1.0.0": "Watcom-1.0",
"widgetworkshop": "Widget-Workshop",
"wsuipa": "Wsuipa",
"wtfpl": "WTFPL",
"wxwindows": "wxWindows",
@@ -1112,7 +1150,11 @@ var licenseIDs = map[string]string{
"x11.0.0distributemodificationsvariant": "X11-distribute-modifications-variant",
"x11.0distributemodificationsvariant": "X11-distribute-modifications-variant",
"x11distributemodificationsvariant": "X11-distribute-modifications-variant",
"xdebug1": "Xdebug-1.03",
"xdebug1.03": "Xdebug-1.03",
"xdebug1.03.0": "Xdebug-1.03",
"xerox": "Xerox",
"xfig": "Xfig",
"xfree861": "XFree86-1.1",
"xfree861.1": "XFree86-1.1",
"xfree861.1.0": "XFree86-1.1",
+1 -1
View File
@@ -22,5 +22,5 @@ func IDByHash(obj interface{}) (ID, error) {
return "", fmt.Errorf("could not build ID for object=%+v: %w", obj, err)
}
return ID(fmt.Sprintf("%x", f)), nil
return ID(fmt.Sprintf("%016x", f)), nil
}
@@ -91,7 +91,7 @@
}
},
{
"id": "e7c88bd18e11b0b",
"id": "0e7c88bd18e11b0b",
"location": {
"path": "/a/place/a"
},