From b17dd66513bce717146f03e84fac10bdd867a9bf Mon Sep 17 00:00:00 2001 From: Asaf Ambar Date: Thu, 4 Jan 2024 09:29:31 +0200 Subject: [PATCH 1/2] Graph Scan internal API - New GraphNode field added to GraphNode (#884) --- xray/services/utils/graph.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xray/services/utils/graph.go b/xray/services/utils/graph.go index d976d55a6..f4d09a485 100644 --- a/xray/services/utils/graph.go +++ b/xray/services/utils/graph.go @@ -30,11 +30,13 @@ type OtherComponentIds struct { // Audit Graph Node type GraphNode struct { - Id string `json:"component_id,omitempty"` - // List of subcomponents. - Nodes []*GraphNode `json:"nodes,omitempty"` // Node parent (for internal use) Parent *GraphNode `json:"-"` + // Node file types (tar, jar, zip, pom) + Types *[]string `json:"-"` + Id string `json:"component_id,omitempty"` + // List of subcomponents. + Nodes []*GraphNode `json:"nodes,omitempty"` } func (currNode *GraphNode) NodeHasLoop() bool { From 908b262b8fdd18267e9ee1e77b32b7c67f215e82 Mon Sep 17 00:00:00 2001 From: Omer Zidkoni <50792403+omerzi@users.noreply.github.com> Date: Sun, 7 Jan 2024 14:16:14 +0200 Subject: [PATCH 2/2] Promote to 1.35.6 (#885) --- go.mod | 6 +++--- go.sum | 12 ++++++------ tests/utils_test.go | 2 +- utils/utils.go | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 3337905bf..dbf6f61fd 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ require ( github.com/go-git/go-git/v5 v5.11.0 github.com/golang-jwt/jwt/v4 v4.5.0 github.com/gookit/color v1.5.4 - github.com/jfrog/build-info-go v1.9.19 - github.com/jfrog/gofrog v1.4.0 - github.com/mholt/archiver/v3 v3.5.1 + github.com/jfrog/archiver/v3 v3.5.3 + github.com/jfrog/build-info-go v1.9.20 + github.com/jfrog/gofrog v1.4.1 github.com/stretchr/testify v1.8.4 github.com/xanzy/ssh-agent v0.3.3 golang.org/x/crypto v0.17.0 diff --git a/go.sum b/go.sum index db7476e10..3b346ba89 100644 --- a/go.sum +++ b/go.sum @@ -50,10 +50,12 @@ github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0= github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jfrog/build-info-go v1.9.19 h1:tFPR0Je+ETLXcJqa7UrICkSjwc27zeY06AoWaMYPdQI= -github.com/jfrog/build-info-go v1.9.19/go.mod h1:DBxqvz1N/uI9iI/1gkCfjKjOrlcCzQ3hiKXqtKJUrrY= -github.com/jfrog/gofrog v1.4.0 h1:s7eysVnmIBfVheMs4LPU43MAlxwPa4K8u2N5h7kwzXA= -github.com/jfrog/gofrog v1.4.0/go.mod h1:AQo5Fq0G9nDEF6icH7MYQK0iohR4HuEAXl8jaxRuT6Q= +github.com/jfrog/archiver/v3 v3.5.3 h1:Udz6+z/YIhTFmcEp1TeW2DEwNyo7JSAnrGUsrbL2FZI= +github.com/jfrog/archiver/v3 v3.5.3/go.mod h1:/MbmBhPzkliu9PtweAg9lCYHGcKdapwMMZS/QS09T5c= +github.com/jfrog/build-info-go v1.9.20 h1:tQF6EMjt/EEX8syTrgpL/c7FjhlBSjtv848jNvxpMp8= +github.com/jfrog/build-info-go v1.9.20/go.mod h1:Vxv6zmx4e1NWsx40OHaDWCCYDeYAq2yXzpJ4nsDChbE= +github.com/jfrog/gofrog v1.4.1 h1:jz4kXBdsvVCNRDVkGLRiZIQ+uTO6/DSxQ9LjfvmLfoY= +github.com/jfrog/gofrog v1.4.1/go.mod h1:wQqagqq2VpuCWRPlq/65GbH9gsRz+7Bgc1Q+PKD4Y+k= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= @@ -69,8 +71,6 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/mholt/archiver/v3 v3.5.1 h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo= -github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4= 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/nwaples/rardecode v1.1.0 h1:vSxaY8vQhOcVr4mm5e8XllHWTiM4JF507A0Katqw7MQ= diff --git a/tests/utils_test.go b/tests/utils_test.go index a4694afc2..22b095d1c 100644 --- a/tests/utils_test.go +++ b/tests/utils_test.go @@ -28,6 +28,7 @@ import ( "github.com/jfrog/jfrog-client-go/artifactory/services/utils/tests" + "github.com/jfrog/archiver/v3" artifactoryAuth "github.com/jfrog/jfrog-client-go/artifactory/auth" "github.com/jfrog/jfrog-client-go/artifactory/services" "github.com/jfrog/jfrog-client-go/artifactory/services/utils" @@ -41,7 +42,6 @@ import ( "github.com/jfrog/jfrog-client-go/utils/log" xrayAuth "github.com/jfrog/jfrog-client-go/xray/auth" xrayServices "github.com/jfrog/jfrog-client-go/xray/services" - "github.com/mholt/archiver/v3" "github.com/stretchr/testify/assert" ) diff --git a/utils/utils.go b/utils/utils.go index 5e68bd969..00889b654 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -27,7 +27,7 @@ import ( const ( Development = "development" Agent = "jfrog-client-go" - Version = "1.35.5" + Version = "1.35.6" ) type MinVersionProduct string