From 2177336a355a857bab5ac53203450797591220f4 Mon Sep 17 00:00:00 2001 From: Shantanu Bansal Date: Wed, 13 Sep 2023 14:09:28 +0530 Subject: [PATCH 1/5] Moving Away from SHA1 to SHA512 --- internal/pkg/crypto/sha.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/pkg/crypto/sha.go b/internal/pkg/crypto/sha.go index 043fc2273..7f850b0a7 100644 --- a/internal/pkg/crypto/sha.go +++ b/internal/pkg/crypto/sha.go @@ -1,7 +1,7 @@ package crypto import ( - "crypto/sha1" + "crypto/sha512" "fmt" "io" @@ -10,7 +10,7 @@ import ( // GenerateSHA generates SHA from string func GenerateSHA(data string) string { - hasher := sha1.New() + hasher := sha512.New() _, err := io.WriteString(hasher, data) if err != nil { logrus.Errorf("Unable to write data in hash writer %v", err) From c9a25c957dac61b2b8f044fda49187673937c62a Mon Sep 17 00:00:00 2001 From: Shantanu Bansal Date: Thu, 14 Sep 2023 21:37:06 +0530 Subject: [PATCH 2/5] Updating Go Mod --- go.mod | 4 ++-- go.sum | 16 ++++------------ internal/pkg/util/config.go | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 1ebc7d255..88f6fcf1e 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/argoproj/argo-rollouts v1.5.1 - github.com/openshift/api v3.9.0+incompatible - github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb + github.com/openshift/api v0.0.0-20230914122746-448e48019998 + github.com/openshift/client-go v0.0.0-20230911120204-48b43e1706c2 github.com/parnurzeal/gorequest v0.2.16 github.com/prometheus/client_golang v1.16.0 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 20adc2217..875ab9211 100644 --- a/go.sum +++ b/go.sum @@ -85,10 +85,10 @@ github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM= github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= -github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs= -github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= -github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb h1:laYRaVm1tMdTLkZERvj9muJDvUtYo2HjRoo4Xu55EfM= -github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb/go.mod h1:eCLby3OeidJ9+8GcvvGROU6hsCv2XAPQw8EO7d8NbQA= +github.com/openshift/api v0.0.0-20230914122746-448e48019998 h1:Hn60SZjPn0fh2TANpJGqfAjgPiXXNwcHzjuGC52gUmg= +github.com/openshift/api v0.0.0-20230914122746-448e48019998/go.mod h1:/Wa3swVlVamMzt31raMRj+9H3LMwa4iNGBk5s/inucY= +github.com/openshift/client-go v0.0.0-20230911120204-48b43e1706c2 h1:q9f3sAb5Dg1AYcEgjQSjXwQYluX3OuxPEyW6SNCFQo4= +github.com/openshift/client-go v0.0.0-20230911120204-48b43e1706c2/go.mod h1:s657ogO13BZyP7baTBxd16c4DidmOZnxYb0kALi/ndI= github.com/parnurzeal/gorequest v0.2.16 h1:T/5x+/4BT+nj+3eSknXmCTnEVGSzFzPGdpqmUVVZXHQ= github.com/parnurzeal/gorequest v0.2.16/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -192,24 +192,16 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/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= -k8s.io/api v0.28.0 h1:3j3VPWmN9tTDI68NETBWlDiA9qOiGJ7sdKeufehBYsM= -k8s.io/api v0.28.0/go.mod h1:0l8NZJzB0i/etuWnIXcwfIv+xnDOhL3lLW919AWYDuY= k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= -k8s.io/apimachinery v0.28.0 h1:ScHS2AG16UlYWk63r46oU3D5y54T53cVI5mMJwwqFNA= -k8s.io/apimachinery v0.28.0/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= -k8s.io/client-go v0.28.0 h1:ebcPRDZsCjpj62+cMk1eGNX1QkMdRmQ6lmz5BLoFWeM= -k8s.io/client-go v0.28.0/go.mod h1:0Asy9Xt3U98RypWJmU1ZrRAGKhP6NqDPmptlAzK2kMc= k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= -k8s.io/kubectl v0.28.0 h1:qhfju0OaU+JGeBlToPeeIg2UJUWP++QwTkpio6nlPKg= -k8s.io/kubectl v0.28.0/go.mod h1:1We+E5nSX3/TVoSQ6y5Bzld5OhTBHZHlKEYl7g/NaTk= k8s.io/kubectl v0.28.1 h1:jAq4yKEqQL+fwkWcEsUWxhJ7uIRcOYQraJxx4SyAMTY= k8s.io/kubectl v0.28.1/go.mod h1:a0nk/lMMeKBulp0lMTJAKbkjZg1ykqfLfz/d6dnv1ak= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= diff --git a/internal/pkg/util/config.go b/internal/pkg/util/config.go index c86b69ebd..003717c8a 100644 --- a/internal/pkg/util/config.go +++ b/internal/pkg/util/config.go @@ -6,7 +6,7 @@ import ( v1 "k8s.io/api/core/v1" ) -//Config contains rolling upgrade configuration parameters +// Config contains rolling upgrade configuration parameters type Config struct { Namespace string ResourceName string From f6dcb6e00dd9d967449d6e14365f4cedc0714f4b Mon Sep 17 00:00:00 2001 From: Shantanu Bansal Date: Thu, 14 Sep 2023 22:05:05 +0530 Subject: [PATCH 3/5] Revert "Updating Go Mod" This reverts commit c9a25c957dac61b2b8f044fda49187673937c62a. --- go.mod | 4 ++-- go.sum | 16 ++++++++++++---- internal/pkg/util/config.go | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 88f6fcf1e..1ebc7d255 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/argoproj/argo-rollouts v1.5.1 - github.com/openshift/api v0.0.0-20230914122746-448e48019998 - github.com/openshift/client-go v0.0.0-20230911120204-48b43e1706c2 + github.com/openshift/api v3.9.0+incompatible + github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb github.com/parnurzeal/gorequest v0.2.16 github.com/prometheus/client_golang v1.16.0 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 875ab9211..20adc2217 100644 --- a/go.sum +++ b/go.sum @@ -85,10 +85,10 @@ github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM= github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= -github.com/openshift/api v0.0.0-20230914122746-448e48019998 h1:Hn60SZjPn0fh2TANpJGqfAjgPiXXNwcHzjuGC52gUmg= -github.com/openshift/api v0.0.0-20230914122746-448e48019998/go.mod h1:/Wa3swVlVamMzt31raMRj+9H3LMwa4iNGBk5s/inucY= -github.com/openshift/client-go v0.0.0-20230911120204-48b43e1706c2 h1:q9f3sAb5Dg1AYcEgjQSjXwQYluX3OuxPEyW6SNCFQo4= -github.com/openshift/client-go v0.0.0-20230911120204-48b43e1706c2/go.mod h1:s657ogO13BZyP7baTBxd16c4DidmOZnxYb0kALi/ndI= +github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs= +github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= +github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb h1:laYRaVm1tMdTLkZERvj9muJDvUtYo2HjRoo4Xu55EfM= +github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb/go.mod h1:eCLby3OeidJ9+8GcvvGROU6hsCv2XAPQw8EO7d8NbQA= github.com/parnurzeal/gorequest v0.2.16 h1:T/5x+/4BT+nj+3eSknXmCTnEVGSzFzPGdpqmUVVZXHQ= github.com/parnurzeal/gorequest v0.2.16/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -192,16 +192,24 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/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= +k8s.io/api v0.28.0 h1:3j3VPWmN9tTDI68NETBWlDiA9qOiGJ7sdKeufehBYsM= +k8s.io/api v0.28.0/go.mod h1:0l8NZJzB0i/etuWnIXcwfIv+xnDOhL3lLW919AWYDuY= k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= +k8s.io/apimachinery v0.28.0 h1:ScHS2AG16UlYWk63r46oU3D5y54T53cVI5mMJwwqFNA= +k8s.io/apimachinery v0.28.0/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= +k8s.io/client-go v0.28.0 h1:ebcPRDZsCjpj62+cMk1eGNX1QkMdRmQ6lmz5BLoFWeM= +k8s.io/client-go v0.28.0/go.mod h1:0Asy9Xt3U98RypWJmU1ZrRAGKhP6NqDPmptlAzK2kMc= k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= +k8s.io/kubectl v0.28.0 h1:qhfju0OaU+JGeBlToPeeIg2UJUWP++QwTkpio6nlPKg= +k8s.io/kubectl v0.28.0/go.mod h1:1We+E5nSX3/TVoSQ6y5Bzld5OhTBHZHlKEYl7g/NaTk= k8s.io/kubectl v0.28.1 h1:jAq4yKEqQL+fwkWcEsUWxhJ7uIRcOYQraJxx4SyAMTY= k8s.io/kubectl v0.28.1/go.mod h1:a0nk/lMMeKBulp0lMTJAKbkjZg1ykqfLfz/d6dnv1ak= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= diff --git a/internal/pkg/util/config.go b/internal/pkg/util/config.go index 003717c8a..c86b69ebd 100644 --- a/internal/pkg/util/config.go +++ b/internal/pkg/util/config.go @@ -6,7 +6,7 @@ import ( v1 "k8s.io/api/core/v1" ) -// Config contains rolling upgrade configuration parameters +//Config contains rolling upgrade configuration parameters type Config struct { Namespace string ResourceName string From 91e5ad5a2bd3b00b60849bb269ffe566d3e8c320 Mon Sep 17 00:00:00 2001 From: Shantanu Bansal Date: Thu, 14 Sep 2023 22:05:07 +0530 Subject: [PATCH 4/5] Update sha_test.go --- internal/pkg/crypto/sha_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/pkg/crypto/sha_test.go b/internal/pkg/crypto/sha_test.go index 60d5af635..d3fbe1a1c 100644 --- a/internal/pkg/crypto/sha_test.go +++ b/internal/pkg/crypto/sha_test.go @@ -1,14 +1,16 @@ package crypto import ( + "fmt" "testing" ) // TestGenerateSHA generates the sha from given data and verifies whether it is correct or not func TestGenerateSHA(t *testing.T) { data := "www.stakater.com" - sha := "abd4ed82fb04548388a6cf3c339fd9dc84d275df" + sha := "f9c4c51315e9ad36ec77279db875ab3f1d854b9deb77dabf7eb874427c36c2f12ab409318d3afd3e029a10913f18c0ca098a1e674fe914c5d8841f14e31542b3" result := GenerateSHA(data) + fmt.Println(result) if result != sha { t.Errorf("Failed to generate SHA") } From f40824d90b5d54a75fd94e64c735a576f2695fb7 Mon Sep 17 00:00:00 2001 From: Shantanu Bansal Date: Thu, 14 Sep 2023 22:05:51 +0530 Subject: [PATCH 5/5] Removing the fmt statement --- internal/pkg/crypto/sha_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/pkg/crypto/sha_test.go b/internal/pkg/crypto/sha_test.go index d3fbe1a1c..f91a11db1 100644 --- a/internal/pkg/crypto/sha_test.go +++ b/internal/pkg/crypto/sha_test.go @@ -1,7 +1,6 @@ package crypto import ( - "fmt" "testing" ) @@ -10,7 +9,6 @@ func TestGenerateSHA(t *testing.T) { data := "www.stakater.com" sha := "f9c4c51315e9ad36ec77279db875ab3f1d854b9deb77dabf7eb874427c36c2f12ab409318d3afd3e029a10913f18c0ca098a1e674fe914c5d8841f14e31542b3" result := GenerateSHA(data) - fmt.Println(result) if result != sha { t.Errorf("Failed to generate SHA") }