From f5ca7c81fefd91cbf62f474089a46260574a2d41 Mon Sep 17 00:00:00 2001 From: Omer Zidkoni Date: Thu, 2 Mar 2023 10:56:05 +0200 Subject: [PATCH 1/8] Update extractors --- build/gradle.go | 2 +- build/maven.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/gradle.go b/build/gradle.go index fc035ec5..2aec6908 100644 --- a/build/gradle.go +++ b/build/gradle.go @@ -16,7 +16,7 @@ const ( GradleExtractorFileName = "build-info-extractor-gradle-%s-uber.jar" gradleInitScriptTemplate = "gradle.init" GradleExtractorRemotePath = "org/jfrog/buildinfo/build-info-extractor-gradle/%s" - GradleExtractorDependencyVersion = "4.31.3" + GradleExtractorDependencyVersion = "4.31.5" ) type GradleModule struct { diff --git a/build/maven.go b/build/maven.go index 389aa585..d96e8bf5 100644 --- a/build/maven.go +++ b/build/maven.go @@ -20,7 +20,7 @@ const ( PropertiesTempfolderName = "properties" MavenExtractorRemotePath = "org/jfrog/buildinfo/build-info-extractor-maven3/%s" GeneratedBuildInfoTempPrefix = "generatedBuildInfo" - MavenExtractorDependencyVersion = "2.39.3" + MavenExtractorDependencyVersion = "2.39.5" ClassworldsConf = `main is org.apache.maven.cli.MavenCli from plexus.core From 1b55b8edd166bcf31a3f4507d27db6cb0e289d0c Mon Sep 17 00:00:00 2001 From: Eyal Ben Moshe Date: Mon, 17 Apr 2023 12:34:53 +0300 Subject: [PATCH 2/8] Added the Frogbot badge to the README (#149) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 47c6c741..cd2b13ee 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ # Build Info Go +[![Scanned by Frogbot](https://raw.github.com/jfrog/frogbot/master/images/frogbot-badge.svg)](https://github.com/jfrog/frogbot#readme) [![Go Report Card](https://goreportcard.com/badge/github.com/jfrog/build-info-go)](https://goreportcard.com/report/github.com/jfrog/build-info-go) [![license](https://img.shields.io/badge/License-Apache_2.0-blue.svg?style=flat)](./LICENSE) [![Website](https://img.shields.io/badge/buildinfo.org-%F0%9F%8C%8E-blue)](https://buildinfo.org) From a6ed2e89a5bf16feff10be3333c5f69821b0b903 Mon Sep 17 00:00:00 2001 From: JFrog Pipelines Step Date: Tue, 2 May 2023 13:39:07 +0000 Subject: [PATCH 3/8] Update build-info.json file --- build-info.json | 345 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 345 insertions(+) create mode 100644 build-info.json diff --git a/build-info.json b/build-info.json new file mode 100644 index 00000000..1807ecc9 --- /dev/null +++ b/build-info.json @@ -0,0 +1,345 @@ +{ + "name": "go-build", + "number": "1", + "agent": {}, + "buildAgent": { + "name": "GENERIC" + }, + "modules": [ + { + "type": "go", + "id": "github.com/jfrog/build-info-go", + "dependencies": [ + { + "id": "github.com/klauspost/cpuid/v2:v2.2.3", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ], + [ + "github.com/minio/sha256-simd:v1.0.1-0.20230222114820-6096f891a77b", + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "6429461f86edd94bb679272748c522f41f6453df", + "md5": "1bbcae037201b315dccd6e535b20bca0", + "sha256": "f68ff82caa807940fee615b4898d428365761eeb36861959ca8b91a034bd0e7e" + }, + { + "id": "github.com/urfave/cli/v2:v2.25.1", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "1a92db5e29bdd82bad97d48b8345af27c06fce8b", + "md5": "761f115010a0fc45c0950edacdec8e35", + "sha256": "779fdd63dc246087efbddb0aed29351b5764226ba75181cbfc56e916aa8729b1" + }, + { + "id": "github.com/minio/sha256-simd:v1.0.1-0.20230222114820-6096f891a77b", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "acecfdf33b21b042ac08417ba7c845e2b3e04044", + "md5": "cf0413af37c19aefe8fddea66edb4ce4", + "sha256": "230880088ce2269538439d6d0d9a579c164a442f6169ad0e22ef846c68b93436" + }, + { + "id": "github.com/davecgh/go-spew:v1.1.1", + "type": "zip", + "requestedBy": [ + [ + "github.com/CycloneDX/cyclonedx-go:v0.7.1", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/jfrog/build-info-go" + ], + [ + "github.com/jfrog/gofrog:v1.3.0", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/stretchr/testify:v1.8.2", + "github.com/CycloneDX/cyclonedx-go:v0.7.1", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/stretchr/testify:v1.8.2", + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "0f9760bda0c6ccacac5e57f62d0f5ad9c7dab03f", + "md5": "feef6644bd69286382139b28be3f0b91", + "sha256": "6b44a843951f371b7010c754ecc3cabefe815d5ced1c5b9409fb2d697e8a890d" + }, + { + "id": "github.com/jfrog/gofrog:v1.3.0", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "3573718594f8e6adc6cf8b6dbb47d3f0303a8ca6", + "md5": "5d9e342169edaebb03848c040018ed37", + "sha256": "142a4e680245cbd253dfcffbfea62ad2fc7c112cfd21e6f84755c62630acb637" + }, + { + "id": "github.com/xeipuuv/gojsonpointer:v0.0.0-20180127040702-4e3ac2762d5f", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ], + [ + "github.com/xeipuuv/gojsonschema:v1.2.0", + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "c00ffab826fdd7e3aa1284ed3a0918cbdf2ec095", + "md5": "812aaf45e505b2953d31a75ce668e46e", + "sha256": "5b1a4bcc8e003f214c92b3fa52959d9eb0e3af1c0c529efa55815db951146e48" + }, + { + "id": "gopkg.in/yaml.v3:v3.0.1", + "type": "zip", + "requestedBy": [ + [ + "github.com/CycloneDX/cyclonedx-go:v0.7.1", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/jfrog/gofrog:v1.3.0", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/stretchr/testify:v1.8.2", + "github.com/CycloneDX/cyclonedx-go:v0.7.1", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/stretchr/testify:v1.8.2", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/urfave/cli/v2:v2.25.1", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "65825246447882d6f2bddb3f89ac4b9abc2612ef", + "md5": "292e318d64256fb05395c45c176c94c2", + "sha256": "aab8fbc4e6300ea08e6afe1caea18a21c90c79f489f52c53e2f20431f1a9a015" + }, + { + "id": "github.com/stretchr/testify:v1.8.2", + "type": "zip", + "requestedBy": [ + [ + "github.com/CycloneDX/cyclonedx-go:v0.7.1", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "1321bb535d2d6b92bbaf804fa8abcc9fe34234fc", + "md5": "5fd93697a6df28ed6704b74bfc9b10e9", + "sha256": "400e18c88e5c4beb7ecca5d675048f1915a6e675b30fc03f8f563eb4dfde079a" + }, + { + "id": "github.com/pkg/errors:v0.9.1", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/gofrog:v1.3.0", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "6ac37cf1eab63f464a8ec2d20bc7224271528d7d", + "md5": "5d8002959a144c1bea1f86228fe09755", + "sha256": "d4c36b8bcd0616290a3913215e0f53b931bd6e00670596f2960df1b44af2bd07" + }, + { + "id": "github.com/!cyclone!d!x/cyclonedx-go:v0.7.1", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "5f8aecf69069b522e1dd066a4db85a0124f579e7", + "md5": "9528e04062f189c6e53af39e91f487de", + "sha256": "f83d84c60b300bba77eb2e853989c50c7abf98c59620fb5a0b6e31da07776805" + }, + { + "id": "github.com/xeipuuv/gojsonreference:v0.0.0-20180127040603-bd5ef7bd5415", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ], + [ + "github.com/xeipuuv/gojsonschema:v1.2.0", + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "133e9c4987a455db1a748f79522b79e95bd395ff", + "md5": "1355152ef669012354342f3f0a133987", + "sha256": "7ec98f4df894413f4dc58c8df330ca8b24ff425b05a8e1074c3028c99f7e45e7" + }, + { + "id": "github.com/cpuguy83/go-md2man/v2:v2.0.2", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ], + [ + "github.com/urfave/cli/v2:v2.25.1", + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "cab8c09415bb3aa49892aac866a2732980d44c95", + "md5": "86a066c9aaad807da54f481b8286f8ce", + "sha256": "70a7e609809cf2a92c5535104db5eb82d75c54bfcfed2d224e87dd2fd9729f62" + }, + { + "id": "github.com/pmezard/go-difflib:v1.0.0", + "type": "zip", + "requestedBy": [ + [ + "github.com/CycloneDX/cyclonedx-go:v0.7.1", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/jfrog/gofrog:v1.3.0", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/jfrog/build-info-go" + ], + [ + "github.com/stretchr/testify:v1.8.2", + "github.com/CycloneDX/cyclonedx-go:v0.7.1", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/stretchr/testify:v1.8.2", + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "f200e2a5211b527ef2d2ff301718ccc4ad5c705b", + "md5": "fb72df530a7f3fca56ccc192c9f30a58", + "sha256": "de04cecc1a4b8d53e4357051026794bcbc54f2e6a260cfac508ce69d5d6457a0" + }, + { + "id": "github.com/!burnt!sushi/toml:v1.2.1", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ], + [ + "github.com/urfave/cli/v2:v2.25.1", + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "03b80e70043e52b2f3599d056ab4eb6620e2bb62", + "md5": "41001e8e47b9b3ec81f9f7790d585da0", + "sha256": "6fb658e8262179ffd34d57eaef6b076b25c77e8b2129659b66697cded29a7121" + }, + { + "id": "github.com/xeipuuv/gojsonschema:v1.2.0", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "e1529901eb2cf8c9ff2b1fbf504cb08d05d3d578", + "md5": "ebbf84ea1a07065b100c33e2736e6d03", + "sha256": "55c8ce068257aa0d263aad7470113dafcd50f955ee754fc853c2fdcd31ad096f" + }, + { + "id": "golang.org/x/exp:v0.0.0-20230418202329-0354be287a23", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "8c7c92a4b219e6138d5d1bdf6c3b9ad50b78f7ba", + "md5": "ba5fd44152526428564448abdd71c467", + "sha256": "c2bbeffc6c46927056154ce505a15dd436d31c08baa8f71795c6a47d2d663a82" + }, + { + "id": "github.com/buger/jsonparser:v1.1.1", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "e0c54d96564262a70bc7ed33fb3ee2b15596f68f", + "md5": "7ab77d10951f73b96b9c19a6cca51bb1", + "sha256": "be17ef1b44c22eac645eeac80f0e26cdfc70d77262e631358e00c2aa817eab8c" + }, + { + "id": "github.com/russross/blackfriday/v2:v2.1.0", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ], + [ + "github.com/cpuguy83/go-md2man/v2:v2.0.2", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/cpuguy83/go-md2man/v2:v2.0.2", + "github.com/urfave/cli/v2:v2.25.1", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/urfave/cli/v2:v2.25.1", + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "b733cda2c795193ad2a65e13dcd7529b93bf04e9", + "md5": "eea4411c54002a5fb7d0db351270eefe", + "sha256": "7852750d58a053ce38b01f2c203208817564f552ebf371b2b630081d7004c6ae" + }, + { + "id": "github.com/xrash/smetrics:v0.0.0-20201216005158-039620a65673", + "type": "zip", + "requestedBy": [ + [ + "github.com/urfave/cli/v2:v2.25.1", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "79a771d85bf5b4df5b583c8435343b323f52995e", + "md5": "b5a17afb05c11c10713e33e390729bd7", + "sha256": "bbebb9a00f44ff3e27bec16111effdcf2706d727821a4833ec8da19aad96e26d" + } + ] + } + ], + "started": "2023-05-02T13:39:07.599+0000" +} From f8c55ae4a64dc1cd4cd0d3260e0b35d9432e8fe0 Mon Sep 17 00:00:00 2001 From: JFrog Pipelines Step Date: Wed, 17 May 2023 15:43:46 +0000 Subject: [PATCH 4/8] Update build-info.json file --- build-info.json | 244 ++++++++++++++++++++++++------------------------ 1 file changed, 122 insertions(+), 122 deletions(-) diff --git a/build-info.json b/build-info.json index 1807ecc9..502ef868 100644 --- a/build-info.json +++ b/build-info.json @@ -11,44 +11,61 @@ "id": "github.com/jfrog/build-info-go", "dependencies": [ { - "id": "github.com/klauspost/cpuid/v2:v2.2.3", + "id": "github.com/pmezard/go-difflib:v1.0.0", "type": "zip", "requestedBy": [ [ + "github.com/CycloneDX/cyclonedx-go:v0.7.1", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/jfrog/gofrog:v1.3.0", "github.com/jfrog/build-info-go" ], [ - "github.com/minio/sha256-simd:v1.0.1-0.20230222114820-6096f891a77b", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/stretchr/testify:v1.8.2", + "github.com/CycloneDX/cyclonedx-go:v0.7.1", + "github.com/jfrog/build-info-go" + ], + [ + "github.com/stretchr/testify:v1.8.2", "github.com/jfrog/build-info-go" ] ], - "sha1": "6429461f86edd94bb679272748c522f41f6453df", - "md5": "1bbcae037201b315dccd6e535b20bca0", - "sha256": "f68ff82caa807940fee615b4898d428365761eeb36861959ca8b91a034bd0e7e" + "sha1": "f200e2a5211b527ef2d2ff301718ccc4ad5c705b", + "md5": "fb72df530a7f3fca56ccc192c9f30a58", + "sha256": "de04cecc1a4b8d53e4357051026794bcbc54f2e6a260cfac508ce69d5d6457a0" }, { - "id": "github.com/urfave/cli/v2:v2.25.1", + "id": "github.com/!burnt!sushi/toml:v1.2.1", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" + ], + [ + "github.com/urfave/cli/v2:v2.25.1", + "github.com/jfrog/build-info-go" ] ], - "sha1": "1a92db5e29bdd82bad97d48b8345af27c06fce8b", - "md5": "761f115010a0fc45c0950edacdec8e35", - "sha256": "779fdd63dc246087efbddb0aed29351b5764226ba75181cbfc56e916aa8729b1" + "sha1": "03b80e70043e52b2f3599d056ab4eb6620e2bb62", + "md5": "41001e8e47b9b3ec81f9f7790d585da0", + "sha256": "6fb658e8262179ffd34d57eaef6b076b25c77e8b2129659b66697cded29a7121" }, { - "id": "github.com/minio/sha256-simd:v1.0.1-0.20230222114820-6096f891a77b", + "id": "github.com/buger/jsonparser:v1.1.1", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" ] ], - "sha1": "acecfdf33b21b042ac08417ba7c845e2b3e04044", - "md5": "cf0413af37c19aefe8fddea66edb4ce4", - "sha256": "230880088ce2269538439d6d0d9a579c164a442f6169ad0e22ef846c68b93436" + "sha1": "e0c54d96564262a70bc7ed33fb3ee2b15596f68f", + "md5": "7ab77d10951f73b96b9c19a6cca51bb1", + "sha256": "be17ef1b44c22eac645eeac80f0e26cdfc70d77262e631358e00c2aa817eab8c" }, { "id": "github.com/davecgh/go-spew:v1.1.1", @@ -79,34 +96,6 @@ "md5": "feef6644bd69286382139b28be3f0b91", "sha256": "6b44a843951f371b7010c754ecc3cabefe815d5ced1c5b9409fb2d697e8a890d" }, - { - "id": "github.com/jfrog/gofrog:v1.3.0", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "3573718594f8e6adc6cf8b6dbb47d3f0303a8ca6", - "md5": "5d9e342169edaebb03848c040018ed37", - "sha256": "142a4e680245cbd253dfcffbfea62ad2fc7c112cfd21e6f84755c62630acb637" - }, - { - "id": "github.com/xeipuuv/gojsonpointer:v0.0.0-20180127040702-4e3ac2762d5f", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ], - [ - "github.com/xeipuuv/gojsonschema:v1.2.0", - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "c00ffab826fdd7e3aa1284ed3a0918cbdf2ec095", - "md5": "812aaf45e505b2953d31a75ce668e46e", - "sha256": "5b1a4bcc8e003f214c92b3fa52959d9eb0e3af1c0c529efa55815db951146e48" - }, { "id": "gopkg.in/yaml.v3:v3.0.1", "type": "zip", @@ -140,38 +129,6 @@ "md5": "292e318d64256fb05395c45c176c94c2", "sha256": "aab8fbc4e6300ea08e6afe1caea18a21c90c79f489f52c53e2f20431f1a9a015" }, - { - "id": "github.com/stretchr/testify:v1.8.2", - "type": "zip", - "requestedBy": [ - [ - "github.com/CycloneDX/cyclonedx-go:v0.7.1", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "1321bb535d2d6b92bbaf804fa8abcc9fe34234fc", - "md5": "5fd93697a6df28ed6704b74bfc9b10e9", - "sha256": "400e18c88e5c4beb7ecca5d675048f1915a6e675b30fc03f8f563eb4dfde079a" - }, - { - "id": "github.com/pkg/errors:v0.9.1", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/gofrog:v1.3.0", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "6ac37cf1eab63f464a8ec2d20bc7224271528d7d", - "md5": "5d8002959a144c1bea1f86228fe09755", - "sha256": "d4c36b8bcd0616290a3913215e0f53b931bd6e00670596f2960df1b44af2bd07" - }, { "id": "github.com/!cyclone!d!x/cyclonedx-go:v0.7.1", "type": "zip", @@ -185,20 +142,16 @@ "sha256": "f83d84c60b300bba77eb2e853989c50c7abf98c59620fb5a0b6e31da07776805" }, { - "id": "github.com/xeipuuv/gojsonreference:v0.0.0-20180127040603-bd5ef7bd5415", + "id": "github.com/urfave/cli/v2:v2.25.1", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" - ], - [ - "github.com/xeipuuv/gojsonschema:v1.2.0", - "github.com/jfrog/build-info-go" ] ], - "sha1": "133e9c4987a455db1a748f79522b79e95bd395ff", - "md5": "1355152ef669012354342f3f0a133987", - "sha256": "7ec98f4df894413f4dc58c8df330ca8b24ff425b05a8e1074c3028c99f7e45e7" + "sha1": "1a92db5e29bdd82bad97d48b8345af27c06fce8b", + "md5": "761f115010a0fc45c0950edacdec8e35", + "sha256": "779fdd63dc246087efbddb0aed29351b5764226ba75181cbfc56e916aa8729b1" }, { "id": "github.com/cpuguy83/go-md2man/v2:v2.0.2", @@ -217,129 +170,176 @@ "sha256": "70a7e609809cf2a92c5535104db5eb82d75c54bfcfed2d224e87dd2fd9729f62" }, { - "id": "github.com/pmezard/go-difflib:v1.0.0", + "id": "github.com/russross/blackfriday/v2:v2.1.0", "type": "zip", "requestedBy": [ [ - "github.com/CycloneDX/cyclonedx-go:v0.7.1", "github.com/jfrog/build-info-go" ], [ - "github.com/jfrog/gofrog:v1.3.0", + "github.com/cpuguy83/go-md2man/v2:v2.0.2", "github.com/jfrog/build-info-go" ], [ + "github.com/cpuguy83/go-md2man/v2:v2.0.2", + "github.com/urfave/cli/v2:v2.25.1", "github.com/jfrog/build-info-go" ], [ - "github.com/stretchr/testify:v1.8.2", + "github.com/urfave/cli/v2:v2.25.1", + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "b733cda2c795193ad2a65e13dcd7529b93bf04e9", + "md5": "eea4411c54002a5fb7d0db351270eefe", + "sha256": "7852750d58a053ce38b01f2c203208817564f552ebf371b2b630081d7004c6ae" + }, + { + "id": "github.com/stretchr/testify:v1.8.2", + "type": "zip", + "requestedBy": [ + [ "github.com/CycloneDX/cyclonedx-go:v0.7.1", "github.com/jfrog/build-info-go" ], [ - "github.com/stretchr/testify:v1.8.2", "github.com/jfrog/build-info-go" ] ], - "sha1": "f200e2a5211b527ef2d2ff301718ccc4ad5c705b", - "md5": "fb72df530a7f3fca56ccc192c9f30a58", - "sha256": "de04cecc1a4b8d53e4357051026794bcbc54f2e6a260cfac508ce69d5d6457a0" + "sha1": "1321bb535d2d6b92bbaf804fa8abcc9fe34234fc", + "md5": "5fd93697a6df28ed6704b74bfc9b10e9", + "sha256": "400e18c88e5c4beb7ecca5d675048f1915a6e675b30fc03f8f563eb4dfde079a" }, { - "id": "github.com/!burnt!sushi/toml:v1.2.1", + "id": "github.com/xeipuuv/gojsonpointer:v0.0.0-20180127040702-4e3ac2762d5f", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" ], [ - "github.com/urfave/cli/v2:v2.25.1", + "github.com/xeipuuv/gojsonschema:v1.2.0", "github.com/jfrog/build-info-go" ] ], - "sha1": "03b80e70043e52b2f3599d056ab4eb6620e2bb62", - "md5": "41001e8e47b9b3ec81f9f7790d585da0", - "sha256": "6fb658e8262179ffd34d57eaef6b076b25c77e8b2129659b66697cded29a7121" + "sha1": "c00ffab826fdd7e3aa1284ed3a0918cbdf2ec095", + "md5": "812aaf45e505b2953d31a75ce668e46e", + "sha256": "5b1a4bcc8e003f214c92b3fa52959d9eb0e3af1c0c529efa55815db951146e48" }, { - "id": "github.com/xeipuuv/gojsonschema:v1.2.0", + "id": "github.com/jfrog/gofrog:v1.3.0", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" ] ], - "sha1": "e1529901eb2cf8c9ff2b1fbf504cb08d05d3d578", - "md5": "ebbf84ea1a07065b100c33e2736e6d03", - "sha256": "55c8ce068257aa0d263aad7470113dafcd50f955ee754fc853c2fdcd31ad096f" + "sha1": "3573718594f8e6adc6cf8b6dbb47d3f0303a8ca6", + "md5": "5d9e342169edaebb03848c040018ed37", + "sha256": "142a4e680245cbd253dfcffbfea62ad2fc7c112cfd21e6f84755c62630acb637" }, { - "id": "golang.org/x/exp:v0.0.0-20230418202329-0354be287a23", + "id": "github.com/xrash/smetrics:v0.0.0-20201216005158-039620a65673", "type": "zip", "requestedBy": [ + [ + "github.com/urfave/cli/v2:v2.25.1", + "github.com/jfrog/build-info-go" + ], [ "github.com/jfrog/build-info-go" ] ], - "sha1": "8c7c92a4b219e6138d5d1bdf6c3b9ad50b78f7ba", - "md5": "ba5fd44152526428564448abdd71c467", - "sha256": "c2bbeffc6c46927056154ce505a15dd436d31c08baa8f71795c6a47d2d663a82" + "sha1": "79a771d85bf5b4df5b583c8435343b323f52995e", + "md5": "b5a17afb05c11c10713e33e390729bd7", + "sha256": "bbebb9a00f44ff3e27bec16111effdcf2706d727821a4833ec8da19aad96e26d" }, { - "id": "github.com/buger/jsonparser:v1.1.1", + "id": "github.com/xeipuuv/gojsonreference:v0.0.0-20180127040603-bd5ef7bd5415", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" + ], + [ + "github.com/xeipuuv/gojsonschema:v1.2.0", + "github.com/jfrog/build-info-go" ] ], - "sha1": "e0c54d96564262a70bc7ed33fb3ee2b15596f68f", - "md5": "7ab77d10951f73b96b9c19a6cca51bb1", - "sha256": "be17ef1b44c22eac645eeac80f0e26cdfc70d77262e631358e00c2aa817eab8c" + "sha1": "133e9c4987a455db1a748f79522b79e95bd395ff", + "md5": "1355152ef669012354342f3f0a133987", + "sha256": "7ec98f4df894413f4dc58c8df330ca8b24ff425b05a8e1074c3028c99f7e45e7" }, { - "id": "github.com/russross/blackfriday/v2:v2.1.0", + "id": "github.com/pkg/errors:v0.9.1", "type": "zip", "requestedBy": [ [ + "github.com/jfrog/gofrog:v1.3.0", "github.com/jfrog/build-info-go" ], [ - "github.com/cpuguy83/go-md2man/v2:v2.0.2", "github.com/jfrog/build-info-go" - ], + ] + ], + "sha1": "6ac37cf1eab63f464a8ec2d20bc7224271528d7d", + "md5": "5d8002959a144c1bea1f86228fe09755", + "sha256": "d4c36b8bcd0616290a3913215e0f53b931bd6e00670596f2960df1b44af2bd07" + }, + { + "id": "github.com/minio/sha256-simd:v1.0.1-0.20230222114820-6096f891a77b", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "acecfdf33b21b042ac08417ba7c845e2b3e04044", + "md5": "cf0413af37c19aefe8fddea66edb4ce4", + "sha256": "230880088ce2269538439d6d0d9a579c164a442f6169ad0e22ef846c68b93436" + }, + { + "id": "github.com/klauspost/cpuid/v2:v2.2.3", + "type": "zip", + "requestedBy": [ [ - "github.com/cpuguy83/go-md2man/v2:v2.0.2", - "github.com/urfave/cli/v2:v2.25.1", "github.com/jfrog/build-info-go" ], [ - "github.com/urfave/cli/v2:v2.25.1", + "github.com/minio/sha256-simd:v1.0.1-0.20230222114820-6096f891a77b", "github.com/jfrog/build-info-go" ] ], - "sha1": "b733cda2c795193ad2a65e13dcd7529b93bf04e9", - "md5": "eea4411c54002a5fb7d0db351270eefe", - "sha256": "7852750d58a053ce38b01f2c203208817564f552ebf371b2b630081d7004c6ae" + "sha1": "6429461f86edd94bb679272748c522f41f6453df", + "md5": "1bbcae037201b315dccd6e535b20bca0", + "sha256": "f68ff82caa807940fee615b4898d428365761eeb36861959ca8b91a034bd0e7e" }, { - "id": "github.com/xrash/smetrics:v0.0.0-20201216005158-039620a65673", + "id": "github.com/xeipuuv/gojsonschema:v1.2.0", "type": "zip", "requestedBy": [ [ - "github.com/urfave/cli/v2:v2.25.1", "github.com/jfrog/build-info-go" - ], + ] + ], + "sha1": "e1529901eb2cf8c9ff2b1fbf504cb08d05d3d578", + "md5": "ebbf84ea1a07065b100c33e2736e6d03", + "sha256": "55c8ce068257aa0d263aad7470113dafcd50f955ee754fc853c2fdcd31ad096f" + }, + { + "id": "golang.org/x/exp:v0.0.0-20230418202329-0354be287a23", + "type": "zip", + "requestedBy": [ [ "github.com/jfrog/build-info-go" ] ], - "sha1": "79a771d85bf5b4df5b583c8435343b323f52995e", - "md5": "b5a17afb05c11c10713e33e390729bd7", - "sha256": "bbebb9a00f44ff3e27bec16111effdcf2706d727821a4833ec8da19aad96e26d" + "sha1": "8c7c92a4b219e6138d5d1bdf6c3b9ad50b78f7ba", + "md5": "ba5fd44152526428564448abdd71c467", + "sha256": "c2bbeffc6c46927056154ce505a15dd436d31c08baa8f71795c6a47d2d663a82" } ] } ], - "started": "2023-05-02T13:39:07.599+0000" + "started": "2023-05-17T15:43:45.796+0000" } From cfa0fbecfa548f28c9d2431beafec737bc818111 Mon Sep 17 00:00:00 2001 From: JFrog Pipelines Step Date: Sun, 21 May 2023 14:08:25 +0000 Subject: [PATCH 5/8] Update build-info.json file --- build-info.json | 238 ++++++++++++++++++++++++------------------------ 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/build-info.json b/build-info.json index 502ef868..736f3c46 100644 --- a/build-info.json +++ b/build-info.json @@ -40,61 +40,100 @@ "sha256": "de04cecc1a4b8d53e4357051026794bcbc54f2e6a260cfac508ce69d5d6457a0" }, { - "id": "github.com/!burnt!sushi/toml:v1.2.1", + "id": "github.com/urfave/cli/v2:v2.25.1", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" + ] + ], + "sha1": "1a92db5e29bdd82bad97d48b8345af27c06fce8b", + "md5": "761f115010a0fc45c0950edacdec8e35", + "sha256": "779fdd63dc246087efbddb0aed29351b5764226ba75181cbfc56e916aa8729b1" + }, + { + "id": "github.com/pkg/errors:v0.9.1", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/gofrog:v1.3.0", + "github.com/jfrog/build-info-go" ], [ - "github.com/urfave/cli/v2:v2.25.1", "github.com/jfrog/build-info-go" ] ], - "sha1": "03b80e70043e52b2f3599d056ab4eb6620e2bb62", - "md5": "41001e8e47b9b3ec81f9f7790d585da0", - "sha256": "6fb658e8262179ffd34d57eaef6b076b25c77e8b2129659b66697cded29a7121" + "sha1": "6ac37cf1eab63f464a8ec2d20bc7224271528d7d", + "md5": "5d8002959a144c1bea1f86228fe09755", + "sha256": "d4c36b8bcd0616290a3913215e0f53b931bd6e00670596f2960df1b44af2bd07" }, { - "id": "github.com/buger/jsonparser:v1.1.1", + "id": "github.com/!cyclone!d!x/cyclonedx-go:v0.7.1", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" ] ], - "sha1": "e0c54d96564262a70bc7ed33fb3ee2b15596f68f", - "md5": "7ab77d10951f73b96b9c19a6cca51bb1", - "sha256": "be17ef1b44c22eac645eeac80f0e26cdfc70d77262e631358e00c2aa817eab8c" + "sha1": "5f8aecf69069b522e1dd066a4db85a0124f579e7", + "md5": "9528e04062f189c6e53af39e91f487de", + "sha256": "f83d84c60b300bba77eb2e853989c50c7abf98c59620fb5a0b6e31da07776805" }, { - "id": "github.com/davecgh/go-spew:v1.1.1", + "id": "github.com/cpuguy83/go-md2man/v2:v2.0.2", "type": "zip", "requestedBy": [ [ - "github.com/CycloneDX/cyclonedx-go:v0.7.1", "github.com/jfrog/build-info-go" ], [ + "github.com/urfave/cli/v2:v2.25.1", "github.com/jfrog/build-info-go" - ], + ] + ], + "sha1": "cab8c09415bb3aa49892aac866a2732980d44c95", + "md5": "86a066c9aaad807da54f481b8286f8ce", + "sha256": "70a7e609809cf2a92c5535104db5eb82d75c54bfcfed2d224e87dd2fd9729f62" + }, + { + "id": "github.com/minio/sha256-simd:v1.0.1-0.20230222114820-6096f891a77b", + "type": "zip", + "requestedBy": [ [ - "github.com/jfrog/gofrog:v1.3.0", "github.com/jfrog/build-info-go" - ], + ] + ], + "sha1": "acecfdf33b21b042ac08417ba7c845e2b3e04044", + "md5": "cf0413af37c19aefe8fddea66edb4ce4", + "sha256": "230880088ce2269538439d6d0d9a579c164a442f6169ad0e22ef846c68b93436" + }, + { + "id": "github.com/xeipuuv/gojsonreference:v0.0.0-20180127040603-bd5ef7bd5415", + "type": "zip", + "requestedBy": [ [ - "github.com/stretchr/testify:v1.8.2", - "github.com/CycloneDX/cyclonedx-go:v0.7.1", "github.com/jfrog/build-info-go" ], [ - "github.com/stretchr/testify:v1.8.2", + "github.com/xeipuuv/gojsonschema:v1.2.0", "github.com/jfrog/build-info-go" ] ], - "sha1": "0f9760bda0c6ccacac5e57f62d0f5ad9c7dab03f", - "md5": "feef6644bd69286382139b28be3f0b91", - "sha256": "6b44a843951f371b7010c754ecc3cabefe815d5ced1c5b9409fb2d697e8a890d" + "sha1": "133e9c4987a455db1a748f79522b79e95bd395ff", + "md5": "1355152ef669012354342f3f0a133987", + "sha256": "7ec98f4df894413f4dc58c8df330ca8b24ff425b05a8e1074c3028c99f7e45e7" + }, + { + "id": "github.com/xeipuuv/gojsonschema:v1.2.0", + "type": "zip", + "requestedBy": [ + [ + "github.com/jfrog/build-info-go" + ] + ], + "sha1": "e1529901eb2cf8c9ff2b1fbf504cb08d05d3d578", + "md5": "ebbf84ea1a07065b100c33e2736e6d03", + "sha256": "55c8ce068257aa0d263aad7470113dafcd50f955ee754fc853c2fdcd31ad096f" }, { "id": "gopkg.in/yaml.v3:v3.0.1", @@ -130,216 +169,177 @@ "sha256": "aab8fbc4e6300ea08e6afe1caea18a21c90c79f489f52c53e2f20431f1a9a015" }, { - "id": "github.com/!cyclone!d!x/cyclonedx-go:v0.7.1", + "id": "github.com/stretchr/testify:v1.8.2", "type": "zip", "requestedBy": [ + [ + "github.com/CycloneDX/cyclonedx-go:v0.7.1", + "github.com/jfrog/build-info-go" + ], [ "github.com/jfrog/build-info-go" ] ], - "sha1": "5f8aecf69069b522e1dd066a4db85a0124f579e7", - "md5": "9528e04062f189c6e53af39e91f487de", - "sha256": "f83d84c60b300bba77eb2e853989c50c7abf98c59620fb5a0b6e31da07776805" + "sha1": "1321bb535d2d6b92bbaf804fa8abcc9fe34234fc", + "md5": "5fd93697a6df28ed6704b74bfc9b10e9", + "sha256": "400e18c88e5c4beb7ecca5d675048f1915a6e675b30fc03f8f563eb4dfde079a" }, { - "id": "github.com/urfave/cli/v2:v2.25.1", + "id": "github.com/jfrog/gofrog:v1.3.0", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" ] ], - "sha1": "1a92db5e29bdd82bad97d48b8345af27c06fce8b", - "md5": "761f115010a0fc45c0950edacdec8e35", - "sha256": "779fdd63dc246087efbddb0aed29351b5764226ba75181cbfc56e916aa8729b1" + "sha1": "3573718594f8e6adc6cf8b6dbb47d3f0303a8ca6", + "md5": "5d9e342169edaebb03848c040018ed37", + "sha256": "142a4e680245cbd253dfcffbfea62ad2fc7c112cfd21e6f84755c62630acb637" }, { - "id": "github.com/cpuguy83/go-md2man/v2:v2.0.2", + "id": "github.com/klauspost/cpuid/v2:v2.2.3", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" ], [ - "github.com/urfave/cli/v2:v2.25.1", + "github.com/minio/sha256-simd:v1.0.1-0.20230222114820-6096f891a77b", "github.com/jfrog/build-info-go" ] ], - "sha1": "cab8c09415bb3aa49892aac866a2732980d44c95", - "md5": "86a066c9aaad807da54f481b8286f8ce", - "sha256": "70a7e609809cf2a92c5535104db5eb82d75c54bfcfed2d224e87dd2fd9729f62" + "sha1": "6429461f86edd94bb679272748c522f41f6453df", + "md5": "1bbcae037201b315dccd6e535b20bca0", + "sha256": "f68ff82caa807940fee615b4898d428365761eeb36861959ca8b91a034bd0e7e" }, { - "id": "github.com/russross/blackfriday/v2:v2.1.0", + "id": "github.com/davecgh/go-spew:v1.1.1", "type": "zip", "requestedBy": [ [ + "github.com/CycloneDX/cyclonedx-go:v0.7.1", "github.com/jfrog/build-info-go" ], [ - "github.com/cpuguy83/go-md2man/v2:v2.0.2", "github.com/jfrog/build-info-go" ], [ - "github.com/cpuguy83/go-md2man/v2:v2.0.2", - "github.com/urfave/cli/v2:v2.25.1", + "github.com/jfrog/gofrog:v1.3.0", "github.com/jfrog/build-info-go" ], [ - "github.com/urfave/cli/v2:v2.25.1", - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "b733cda2c795193ad2a65e13dcd7529b93bf04e9", - "md5": "eea4411c54002a5fb7d0db351270eefe", - "sha256": "7852750d58a053ce38b01f2c203208817564f552ebf371b2b630081d7004c6ae" - }, - { - "id": "github.com/stretchr/testify:v1.8.2", - "type": "zip", - "requestedBy": [ - [ + "github.com/stretchr/testify:v1.8.2", "github.com/CycloneDX/cyclonedx-go:v0.7.1", "github.com/jfrog/build-info-go" ], [ + "github.com/stretchr/testify:v1.8.2", "github.com/jfrog/build-info-go" ] ], - "sha1": "1321bb535d2d6b92bbaf804fa8abcc9fe34234fc", - "md5": "5fd93697a6df28ed6704b74bfc9b10e9", - "sha256": "400e18c88e5c4beb7ecca5d675048f1915a6e675b30fc03f8f563eb4dfde079a" + "sha1": "0f9760bda0c6ccacac5e57f62d0f5ad9c7dab03f", + "md5": "feef6644bd69286382139b28be3f0b91", + "sha256": "6b44a843951f371b7010c754ecc3cabefe815d5ced1c5b9409fb2d697e8a890d" }, { - "id": "github.com/xeipuuv/gojsonpointer:v0.0.0-20180127040702-4e3ac2762d5f", + "id": "github.com/russross/blackfriday/v2:v2.1.0", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" ], [ - "github.com/xeipuuv/gojsonschema:v1.2.0", - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "c00ffab826fdd7e3aa1284ed3a0918cbdf2ec095", - "md5": "812aaf45e505b2953d31a75ce668e46e", - "sha256": "5b1a4bcc8e003f214c92b3fa52959d9eb0e3af1c0c529efa55815db951146e48" - }, - { - "id": "github.com/jfrog/gofrog:v1.3.0", - "type": "zip", - "requestedBy": [ - [ + "github.com/cpuguy83/go-md2man/v2:v2.0.2", "github.com/jfrog/build-info-go" - ] - ], - "sha1": "3573718594f8e6adc6cf8b6dbb47d3f0303a8ca6", - "md5": "5d9e342169edaebb03848c040018ed37", - "sha256": "142a4e680245cbd253dfcffbfea62ad2fc7c112cfd21e6f84755c62630acb637" - }, - { - "id": "github.com/xrash/smetrics:v0.0.0-20201216005158-039620a65673", - "type": "zip", - "requestedBy": [ + ], [ + "github.com/cpuguy83/go-md2man/v2:v2.0.2", "github.com/urfave/cli/v2:v2.25.1", "github.com/jfrog/build-info-go" ], [ + "github.com/urfave/cli/v2:v2.25.1", "github.com/jfrog/build-info-go" ] ], - "sha1": "79a771d85bf5b4df5b583c8435343b323f52995e", - "md5": "b5a17afb05c11c10713e33e390729bd7", - "sha256": "bbebb9a00f44ff3e27bec16111effdcf2706d727821a4833ec8da19aad96e26d" + "sha1": "b733cda2c795193ad2a65e13dcd7529b93bf04e9", + "md5": "eea4411c54002a5fb7d0db351270eefe", + "sha256": "7852750d58a053ce38b01f2c203208817564f552ebf371b2b630081d7004c6ae" }, { - "id": "github.com/xeipuuv/gojsonreference:v0.0.0-20180127040603-bd5ef7bd5415", + "id": "golang.org/x/exp:v0.0.0-20230418202329-0354be287a23", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" - ], - [ - "github.com/xeipuuv/gojsonschema:v1.2.0", - "github.com/jfrog/build-info-go" ] ], - "sha1": "133e9c4987a455db1a748f79522b79e95bd395ff", - "md5": "1355152ef669012354342f3f0a133987", - "sha256": "7ec98f4df894413f4dc58c8df330ca8b24ff425b05a8e1074c3028c99f7e45e7" + "sha1": "8c7c92a4b219e6138d5d1bdf6c3b9ad50b78f7ba", + "md5": "ba5fd44152526428564448abdd71c467", + "sha256": "c2bbeffc6c46927056154ce505a15dd436d31c08baa8f71795c6a47d2d663a82" }, { - "id": "github.com/pkg/errors:v0.9.1", + "id": "github.com/xeipuuv/gojsonpointer:v0.0.0-20180127040702-4e3ac2762d5f", "type": "zip", "requestedBy": [ [ - "github.com/jfrog/gofrog:v1.3.0", "github.com/jfrog/build-info-go" ], [ + "github.com/xeipuuv/gojsonschema:v1.2.0", "github.com/jfrog/build-info-go" ] ], - "sha1": "6ac37cf1eab63f464a8ec2d20bc7224271528d7d", - "md5": "5d8002959a144c1bea1f86228fe09755", - "sha256": "d4c36b8bcd0616290a3913215e0f53b931bd6e00670596f2960df1b44af2bd07" - }, - { - "id": "github.com/minio/sha256-simd:v1.0.1-0.20230222114820-6096f891a77b", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "acecfdf33b21b042ac08417ba7c845e2b3e04044", - "md5": "cf0413af37c19aefe8fddea66edb4ce4", - "sha256": "230880088ce2269538439d6d0d9a579c164a442f6169ad0e22ef846c68b93436" + "sha1": "c00ffab826fdd7e3aa1284ed3a0918cbdf2ec095", + "md5": "812aaf45e505b2953d31a75ce668e46e", + "sha256": "5b1a4bcc8e003f214c92b3fa52959d9eb0e3af1c0c529efa55815db951146e48" }, { - "id": "github.com/klauspost/cpuid/v2:v2.2.3", + "id": "github.com/xrash/smetrics:v0.0.0-20201216005158-039620a65673", "type": "zip", "requestedBy": [ [ + "github.com/urfave/cli/v2:v2.25.1", "github.com/jfrog/build-info-go" ], [ - "github.com/minio/sha256-simd:v1.0.1-0.20230222114820-6096f891a77b", "github.com/jfrog/build-info-go" ] ], - "sha1": "6429461f86edd94bb679272748c522f41f6453df", - "md5": "1bbcae037201b315dccd6e535b20bca0", - "sha256": "f68ff82caa807940fee615b4898d428365761eeb36861959ca8b91a034bd0e7e" + "sha1": "79a771d85bf5b4df5b583c8435343b323f52995e", + "md5": "b5a17afb05c11c10713e33e390729bd7", + "sha256": "bbebb9a00f44ff3e27bec16111effdcf2706d727821a4833ec8da19aad96e26d" }, { - "id": "github.com/xeipuuv/gojsonschema:v1.2.0", + "id": "github.com/!burnt!sushi/toml:v1.2.1", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" + ], + [ + "github.com/urfave/cli/v2:v2.25.1", + "github.com/jfrog/build-info-go" ] ], - "sha1": "e1529901eb2cf8c9ff2b1fbf504cb08d05d3d578", - "md5": "ebbf84ea1a07065b100c33e2736e6d03", - "sha256": "55c8ce068257aa0d263aad7470113dafcd50f955ee754fc853c2fdcd31ad096f" + "sha1": "03b80e70043e52b2f3599d056ab4eb6620e2bb62", + "md5": "41001e8e47b9b3ec81f9f7790d585da0", + "sha256": "6fb658e8262179ffd34d57eaef6b076b25c77e8b2129659b66697cded29a7121" }, { - "id": "golang.org/x/exp:v0.0.0-20230418202329-0354be287a23", + "id": "github.com/buger/jsonparser:v1.1.1", "type": "zip", "requestedBy": [ [ "github.com/jfrog/build-info-go" ] ], - "sha1": "8c7c92a4b219e6138d5d1bdf6c3b9ad50b78f7ba", - "md5": "ba5fd44152526428564448abdd71c467", - "sha256": "c2bbeffc6c46927056154ce505a15dd436d31c08baa8f71795c6a47d2d663a82" + "sha1": "e0c54d96564262a70bc7ed33fb3ee2b15596f68f", + "md5": "7ab77d10951f73b96b9c19a6cca51bb1", + "sha256": "be17ef1b44c22eac645eeac80f0e26cdfc70d77262e631358e00c2aa817eab8c" } ] } ], - "started": "2023-05-17T15:43:45.796+0000" + "started": "2023-05-21T14:08:25.458+0000" } From bd45aa05fbaeb9c301eb47d039d9797aadb780f2 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 2 Aug 2023 19:10:35 +0300 Subject: [PATCH 6/8] update crypto Signed-off-by: Michael Sverdlov --- build/utils/yarn.go | 2 +- cli/cli.go | 2 +- entities/buildinfo.go | 3 +-- go.mod | 12 +++++------- go.sum | 27 ++++++++++----------------- 5 files changed, 18 insertions(+), 28 deletions(-) diff --git a/build/utils/yarn.go b/build/utils/yarn.go index 3406cddc..27a1ffdf 100644 --- a/build/utils/yarn.go +++ b/build/utils/yarn.go @@ -4,8 +4,8 @@ import ( "bufio" "bytes" "encoding/json" + "errors" "github.com/jfrog/build-info-go/utils" - "github.com/pkg/errors" "os/exec" "strings" "sync" diff --git a/cli/cli.go b/cli/cli.go index 7303071b..59ff3bbd 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -3,6 +3,7 @@ package cli import ( "bytes" "encoding/json" + "errors" "fmt" "os" "os/exec" @@ -12,7 +13,6 @@ import ( "github.com/jfrog/build-info-go/build" "github.com/jfrog/build-info-go/utils" "github.com/jfrog/build-info-go/utils/pythonutils" - "github.com/pkg/errors" clitool "github.com/urfave/cli/v2" ) diff --git a/entities/buildinfo.go b/entities/buildinfo.go index 3c1c8eaa..c2dc31af 100644 --- a/entities/buildinfo.go +++ b/entities/buildinfo.go @@ -1,6 +1,7 @@ package entities import ( + "errors" "github.com/jfrog/build-info-go/utils/compareutils" "golang.org/x/exp/maps" "golang.org/x/exp/slices" @@ -8,8 +9,6 @@ import ( "strings" "time" - "github.com/pkg/errors" - cdx "github.com/CycloneDX/cyclonedx-go" "github.com/jfrog/gofrog/stringutils" ) diff --git a/go.mod b/go.mod index a7a8bbfc..c2c36f8c 100644 --- a/go.mod +++ b/go.mod @@ -3,17 +3,15 @@ module github.com/jfrog/build-info-go go 1.20 require ( - github.com/BurntSushi/toml v1.2.1 + github.com/BurntSushi/toml v1.3.2 github.com/CycloneDX/cyclonedx-go v0.7.1 github.com/buger/jsonparser v1.1.1 github.com/jfrog/gofrog v1.3.0 - github.com/minio/sha256-simd v1.0.1-0.20230222114820-6096f891a77b - github.com/pkg/errors v0.9.1 - github.com/stretchr/testify v1.8.2 - github.com/urfave/cli/v2 v2.25.1 + github.com/minio/sha256-simd v1.0.1 + github.com/stretchr/testify v1.8.4 + github.com/urfave/cli/v2 v2.25.7 github.com/xeipuuv/gojsonschema v1.2.0 - golang.org/x/exp v0.0.0-20230418202329-0354be287a23 - + golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b ) require ( diff --git a/go.sum b/go.sum index d4b71372..65cd60bd 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= -github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= +github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/CycloneDX/cyclonedx-go v0.7.1 h1:5w1SxjGm9MTMNTuRbEPyw21ObdbaagTWF/KfF0qHTRE= github.com/CycloneDX/cyclonedx-go v0.7.1/go.mod h1:N/nrdWQI2SIjaACyyDs/u7+ddCkyl/zkNs8xFsHF2Ps= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= @@ -14,24 +14,18 @@ github.com/jfrog/gofrog v1.3.0 h1:o4zgsBZE4QyDbz2M7D4K6fXPTBJht+8lE87mS9bw7Gk= github.com/jfrog/gofrog v1.3.0/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0= github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU= github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= -github.com/minio/sha256-simd v1.0.1-0.20230222114820-6096f891a77b h1:kr87H4ULRbe6LQNF5f3A+nGY8TQLgckmdG9BLJ/QB18= -github.com/minio/sha256-simd v1.0.1-0.20230222114820-6096f891a77b/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= +github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/urfave/cli/v2 v2.25.1 h1:zw8dSP7ghX0Gmm8vugrs6q9Ku0wzweqPyshy+syu9Gw= -github.com/urfave/cli/v2 v2.25.1/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs= +github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= @@ -40,13 +34,12 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= -golang.org/x/exp v0.0.0-20230418202329-0354be287a23 h1:4NKENAGIctmZYLK9W+X1kDK8ObBFqOSCJM6WE7CvkJY= -golang.org/x/exp v0.0.0-20230418202329-0354be287a23/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b h1:r+vk0EmXNmekl0S0BascoeeoHk/L7wmaW2QF90K+kYI= +golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 7f5b99cde7b4d82a686575697e3f26297deb4521 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 2 Aug 2023 19:12:33 +0300 Subject: [PATCH 7/8] update crypto Signed-off-by: Michael Sverdlov --- build-info.json | 345 ------------------------------------------------ 1 file changed, 345 deletions(-) delete mode 100644 build-info.json diff --git a/build-info.json b/build-info.json deleted file mode 100644 index 736f3c46..00000000 --- a/build-info.json +++ /dev/null @@ -1,345 +0,0 @@ -{ - "name": "go-build", - "number": "1", - "agent": {}, - "buildAgent": { - "name": "GENERIC" - }, - "modules": [ - { - "type": "go", - "id": "github.com/jfrog/build-info-go", - "dependencies": [ - { - "id": "github.com/pmezard/go-difflib:v1.0.0", - "type": "zip", - "requestedBy": [ - [ - "github.com/CycloneDX/cyclonedx-go:v0.7.1", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/jfrog/gofrog:v1.3.0", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/jfrog/build-info-go" - ], - [ - "github.com/stretchr/testify:v1.8.2", - "github.com/CycloneDX/cyclonedx-go:v0.7.1", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/stretchr/testify:v1.8.2", - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "f200e2a5211b527ef2d2ff301718ccc4ad5c705b", - "md5": "fb72df530a7f3fca56ccc192c9f30a58", - "sha256": "de04cecc1a4b8d53e4357051026794bcbc54f2e6a260cfac508ce69d5d6457a0" - }, - { - "id": "github.com/urfave/cli/v2:v2.25.1", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "1a92db5e29bdd82bad97d48b8345af27c06fce8b", - "md5": "761f115010a0fc45c0950edacdec8e35", - "sha256": "779fdd63dc246087efbddb0aed29351b5764226ba75181cbfc56e916aa8729b1" - }, - { - "id": "github.com/pkg/errors:v0.9.1", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/gofrog:v1.3.0", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "6ac37cf1eab63f464a8ec2d20bc7224271528d7d", - "md5": "5d8002959a144c1bea1f86228fe09755", - "sha256": "d4c36b8bcd0616290a3913215e0f53b931bd6e00670596f2960df1b44af2bd07" - }, - { - "id": "github.com/!cyclone!d!x/cyclonedx-go:v0.7.1", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "5f8aecf69069b522e1dd066a4db85a0124f579e7", - "md5": "9528e04062f189c6e53af39e91f487de", - "sha256": "f83d84c60b300bba77eb2e853989c50c7abf98c59620fb5a0b6e31da07776805" - }, - { - "id": "github.com/cpuguy83/go-md2man/v2:v2.0.2", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ], - [ - "github.com/urfave/cli/v2:v2.25.1", - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "cab8c09415bb3aa49892aac866a2732980d44c95", - "md5": "86a066c9aaad807da54f481b8286f8ce", - "sha256": "70a7e609809cf2a92c5535104db5eb82d75c54bfcfed2d224e87dd2fd9729f62" - }, - { - "id": "github.com/minio/sha256-simd:v1.0.1-0.20230222114820-6096f891a77b", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "acecfdf33b21b042ac08417ba7c845e2b3e04044", - "md5": "cf0413af37c19aefe8fddea66edb4ce4", - "sha256": "230880088ce2269538439d6d0d9a579c164a442f6169ad0e22ef846c68b93436" - }, - { - "id": "github.com/xeipuuv/gojsonreference:v0.0.0-20180127040603-bd5ef7bd5415", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ], - [ - "github.com/xeipuuv/gojsonschema:v1.2.0", - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "133e9c4987a455db1a748f79522b79e95bd395ff", - "md5": "1355152ef669012354342f3f0a133987", - "sha256": "7ec98f4df894413f4dc58c8df330ca8b24ff425b05a8e1074c3028c99f7e45e7" - }, - { - "id": "github.com/xeipuuv/gojsonschema:v1.2.0", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "e1529901eb2cf8c9ff2b1fbf504cb08d05d3d578", - "md5": "ebbf84ea1a07065b100c33e2736e6d03", - "sha256": "55c8ce068257aa0d263aad7470113dafcd50f955ee754fc853c2fdcd31ad096f" - }, - { - "id": "gopkg.in/yaml.v3:v3.0.1", - "type": "zip", - "requestedBy": [ - [ - "github.com/CycloneDX/cyclonedx-go:v0.7.1", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/jfrog/gofrog:v1.3.0", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/stretchr/testify:v1.8.2", - "github.com/CycloneDX/cyclonedx-go:v0.7.1", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/stretchr/testify:v1.8.2", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/urfave/cli/v2:v2.25.1", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "65825246447882d6f2bddb3f89ac4b9abc2612ef", - "md5": "292e318d64256fb05395c45c176c94c2", - "sha256": "aab8fbc4e6300ea08e6afe1caea18a21c90c79f489f52c53e2f20431f1a9a015" - }, - { - "id": "github.com/stretchr/testify:v1.8.2", - "type": "zip", - "requestedBy": [ - [ - "github.com/CycloneDX/cyclonedx-go:v0.7.1", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "1321bb535d2d6b92bbaf804fa8abcc9fe34234fc", - "md5": "5fd93697a6df28ed6704b74bfc9b10e9", - "sha256": "400e18c88e5c4beb7ecca5d675048f1915a6e675b30fc03f8f563eb4dfde079a" - }, - { - "id": "github.com/jfrog/gofrog:v1.3.0", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "3573718594f8e6adc6cf8b6dbb47d3f0303a8ca6", - "md5": "5d9e342169edaebb03848c040018ed37", - "sha256": "142a4e680245cbd253dfcffbfea62ad2fc7c112cfd21e6f84755c62630acb637" - }, - { - "id": "github.com/klauspost/cpuid/v2:v2.2.3", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ], - [ - "github.com/minio/sha256-simd:v1.0.1-0.20230222114820-6096f891a77b", - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "6429461f86edd94bb679272748c522f41f6453df", - "md5": "1bbcae037201b315dccd6e535b20bca0", - "sha256": "f68ff82caa807940fee615b4898d428365761eeb36861959ca8b91a034bd0e7e" - }, - { - "id": "github.com/davecgh/go-spew:v1.1.1", - "type": "zip", - "requestedBy": [ - [ - "github.com/CycloneDX/cyclonedx-go:v0.7.1", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/jfrog/build-info-go" - ], - [ - "github.com/jfrog/gofrog:v1.3.0", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/stretchr/testify:v1.8.2", - "github.com/CycloneDX/cyclonedx-go:v0.7.1", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/stretchr/testify:v1.8.2", - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "0f9760bda0c6ccacac5e57f62d0f5ad9c7dab03f", - "md5": "feef6644bd69286382139b28be3f0b91", - "sha256": "6b44a843951f371b7010c754ecc3cabefe815d5ced1c5b9409fb2d697e8a890d" - }, - { - "id": "github.com/russross/blackfriday/v2:v2.1.0", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ], - [ - "github.com/cpuguy83/go-md2man/v2:v2.0.2", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/cpuguy83/go-md2man/v2:v2.0.2", - "github.com/urfave/cli/v2:v2.25.1", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/urfave/cli/v2:v2.25.1", - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "b733cda2c795193ad2a65e13dcd7529b93bf04e9", - "md5": "eea4411c54002a5fb7d0db351270eefe", - "sha256": "7852750d58a053ce38b01f2c203208817564f552ebf371b2b630081d7004c6ae" - }, - { - "id": "golang.org/x/exp:v0.0.0-20230418202329-0354be287a23", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "8c7c92a4b219e6138d5d1bdf6c3b9ad50b78f7ba", - "md5": "ba5fd44152526428564448abdd71c467", - "sha256": "c2bbeffc6c46927056154ce505a15dd436d31c08baa8f71795c6a47d2d663a82" - }, - { - "id": "github.com/xeipuuv/gojsonpointer:v0.0.0-20180127040702-4e3ac2762d5f", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ], - [ - "github.com/xeipuuv/gojsonschema:v1.2.0", - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "c00ffab826fdd7e3aa1284ed3a0918cbdf2ec095", - "md5": "812aaf45e505b2953d31a75ce668e46e", - "sha256": "5b1a4bcc8e003f214c92b3fa52959d9eb0e3af1c0c529efa55815db951146e48" - }, - { - "id": "github.com/xrash/smetrics:v0.0.0-20201216005158-039620a65673", - "type": "zip", - "requestedBy": [ - [ - "github.com/urfave/cli/v2:v2.25.1", - "github.com/jfrog/build-info-go" - ], - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "79a771d85bf5b4df5b583c8435343b323f52995e", - "md5": "b5a17afb05c11c10713e33e390729bd7", - "sha256": "bbebb9a00f44ff3e27bec16111effdcf2706d727821a4833ec8da19aad96e26d" - }, - { - "id": "github.com/!burnt!sushi/toml:v1.2.1", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ], - [ - "github.com/urfave/cli/v2:v2.25.1", - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "03b80e70043e52b2f3599d056ab4eb6620e2bb62", - "md5": "41001e8e47b9b3ec81f9f7790d585da0", - "sha256": "6fb658e8262179ffd34d57eaef6b076b25c77e8b2129659b66697cded29a7121" - }, - { - "id": "github.com/buger/jsonparser:v1.1.1", - "type": "zip", - "requestedBy": [ - [ - "github.com/jfrog/build-info-go" - ] - ], - "sha1": "e0c54d96564262a70bc7ed33fb3ee2b15596f68f", - "md5": "7ab77d10951f73b96b9c19a6cca51bb1", - "sha256": "be17ef1b44c22eac645eeac80f0e26cdfc70d77262e631358e00c2aa817eab8c" - } - ] - } - ], - "started": "2023-05-21T14:08:25.458+0000" -} From a9ddc19b09a69103394a4a5b8cbad64e7a407f79 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Tue, 19 Mar 2024 16:38:23 +0200 Subject: [PATCH 8/8] simplify defer closers Signed-off-by: Michael Sverdlov --- build/build.go | 15 +++------------ build/maven.go | 5 +---- go.mod | 4 ++-- go.sum | 8 ++++---- utils/checksum.go | 6 ++---- utils/pythonutils/piputils.go | 5 +---- 6 files changed, 13 insertions(+), 30 deletions(-) diff --git a/build/build.go b/build/build.go index d6987db3..10b3aaef 100644 --- a/build/build.go +++ b/build/build.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "fmt" + ioutils "github.com/jfrog/gofrog/io" "os" "path/filepath" "sort" @@ -225,12 +226,7 @@ func (b *Build) SaveBuildInfo(buildInfo *entities.BuildInfo) (err error) { if err != nil { return } - defer func() { - e := tempFile.Close() - if err == nil { - err = e - } - }() + defer ioutils.Close(tempFile, &err) _, err = tempFile.Write(content.Bytes()) return } @@ -257,12 +253,7 @@ func (b *Build) SavePartialBuildInfo(partial *entities.Partial) (err error) { if err != nil { return } - defer func() { - e := tempFile.Close() - if err == nil { - err = e - } - }() + defer ioutils.Close(tempFile, &err) _, err = tempFile.Write(content.Bytes()) return } diff --git a/build/maven.go b/build/maven.go index 091c28f0..36bc29ab 100644 --- a/build/maven.go +++ b/build/maven.go @@ -173,10 +173,7 @@ func (mm *MavenModule) CalcDependencies() (err error) { defer func() { fileExist, e := utils.IsFileExists(mvnRunConfig.buildInfoProperties, false) if fileExist && e == nil { - e = os.Remove(mvnRunConfig.buildInfoProperties) - } - if err == nil { - err = e + err = errors.Join(err, os.Remove(mvnRunConfig.buildInfoProperties)) } }() mvnRunConfig.SetOutputWriter(mm.outputWriter) diff --git a/go.mod b/go.mod index 5f2f414c..909d30c7 100644 --- a/go.mod +++ b/go.mod @@ -8,10 +8,10 @@ require ( github.com/buger/jsonparser v1.1.1 github.com/jfrog/gofrog v1.6.3 github.com/minio/sha256-simd v1.0.1 - github.com/stretchr/testify v1.8.4 + github.com/stretchr/testify v1.9.0 github.com/urfave/cli/v2 v2.27.1 github.com/xeipuuv/gojsonschema v1.2.0 - golang.org/x/exp v0.0.0-20240213143201-ec583247a57a + golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 ) require ( diff --git a/go.sum b/go.sum index 2817b1be..8550baf8 100644 --- a/go.sum +++ b/go.sum @@ -22,8 +22,8 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/terminalstatic/go-xsd-validate v0.1.5 h1:RqpJnf6HGE2CB/lZB1A8BYguk8uRtcvYAPLCF15qguo= github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho= github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= @@ -35,8 +35,8 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= -golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE= -golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= +golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 h1:6R2FC06FonbXQ8pK11/PDFY6N6LWlf9KlzibaCapmqc= +golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= diff --git a/utils/checksum.go b/utils/checksum.go index 8508404b..93d8fab8 100644 --- a/utils/checksum.go +++ b/utils/checksum.go @@ -2,7 +2,7 @@ package utils import ( "bufio" - "errors" + ioutils "github.com/jfrog/gofrog/io" //#nosec G501 -- md5 is supported by Artifactory. "crypto/md5" @@ -37,9 +37,7 @@ func GetFileChecksums(filePath string, checksumType ...Algorithm) (checksums map if err != nil { return } - defer func() { - err = errors.Join(err, file.Close()) - }() + defer ioutils.Close(file, &err) return CalcChecksums(file, checksumType...) } diff --git a/utils/pythonutils/piputils.go b/utils/pythonutils/piputils.go index 5953c64b..b420aa19 100644 --- a/utils/pythonutils/piputils.go +++ b/utils/pythonutils/piputils.go @@ -115,10 +115,7 @@ func getEgginfoPkginfoContent(setuppyFilePath string) (output []byte, err error) return nil, err } defer func() { - e := utils.RemoveTempDir(eggBase) - if err == nil { - err = e - } + err = errors.Join(err, utils.RemoveTempDir(eggBase)) }() // Run python 'egg_info --egg-base ' command.