Skip to content

Commit 5c3d445

Browse files
chore(): upgraded 'github.com/hairyhenderson/gomplate' to v4 (#26)
* fixed CVE-2024-45337 'golang.org/x/crypto/ssh' by updating 'github.com/hairyhenderson/gomplate/' * updated k8s.io/client-go
1 parent 528b47c commit 5c3d445

File tree

5 files changed

+517
-1151
lines changed

5 files changed

+517
-1151
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.5-bookworm AS build
1+
FROM golang:1.23-bookworm AS build
22

33
WORKDIR /pikolo
44

@@ -11,7 +11,7 @@ RUN go mod download
1111
COPY . .
1212
RUN env CGO_ENABLED=0 go build -ldflags="-s -w"
1313

14-
FROM debian:bookworm-20240701-slim
14+
FROM debian:bookworm-20241223-slim
1515

1616
# Update package lists and upgrade existing packages
1717
RUN apt-get update && apt-get upgrade -y

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.14.1
1+
0.14.2

go.mod

Lines changed: 132 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,148 +1,181 @@
11
module github.com/codefresh-io/pikolo
22

3-
go 1.21
4-
5-
toolchain go1.22.4
3+
go 1.23.4
64

75
require (
86
github.com/ghodss/yaml v1.0.0
9-
github.com/hairyhenderson/gomplate/v3 v3.11.5
7+
github.com/hairyhenderson/gomplate/v4 v4.3.0
108
github.com/imdario/mergo v0.3.13
119
github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec
12-
github.com/spf13/cobra v1.4.0
13-
github.com/stretchr/testify v1.9.0
10+
github.com/spf13/cobra v1.8.1
11+
github.com/stretchr/testify v1.10.0
1412
)
1513

1614
require (
17-
cloud.google.com/go v0.102.0 // indirect
18-
cloud.google.com/go/compute v1.6.1 // indirect
19-
cloud.google.com/go/iam v0.3.0 // indirect
20-
cloud.google.com/go/storage v1.22.1 // indirect
15+
cel.dev/expr v0.16.1 // indirect
16+
cloud.google.com/go v0.116.0 // indirect
17+
cloud.google.com/go/auth v0.9.8 // indirect
18+
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
19+
cloud.google.com/go/compute/metadata v0.5.2 // indirect
20+
cloud.google.com/go/iam v1.2.1 // indirect
21+
cloud.google.com/go/monitoring v1.21.1 // indirect
22+
cloud.google.com/go/storage v1.44.0 // indirect
23+
cuelang.org/go v0.11.0 // indirect
2124
dario.cat/mergo v1.0.0 // indirect
25+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 // indirect
26+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect
27+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
28+
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.5.0 // indirect
29+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
30+
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
31+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
32+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect
33+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
34+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
2235
github.com/Masterminds/goutils v1.1.1 // indirect
23-
github.com/Microsoft/go-winio v0.6.1 // indirect
36+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
37+
github.com/Microsoft/go-winio v0.6.2 // indirect
2438
github.com/ProtonMail/go-crypto v1.0.0 // indirect
25-
github.com/Shopify/ejson v1.3.3 // indirect
26-
github.com/apparentlymart/go-cidr v1.1.0 // indirect
27-
github.com/armon/go-metrics v0.4.0 // indirect
28-
github.com/armon/go-radix v1.0.0 // indirect
29-
github.com/aws/aws-sdk-go v1.44.206 // indirect
30-
github.com/aws/aws-sdk-go-v2 v1.16.4 // indirect
31-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 // indirect
32-
github.com/aws/aws-sdk-go-v2/config v1.15.9 // indirect
33-
github.com/aws/aws-sdk-go-v2/credentials v1.12.4 // indirect
34-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5 // indirect
35-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.14 // indirect
36-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11 // indirect
37-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.5 // indirect
38-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.12 // indirect
39-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.2 // indirect
40-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1 // indirect
41-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.6 // indirect
42-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.5 // indirect
43-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.5 // indirect
44-
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.10 // indirect
45-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.7 // indirect
46-
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6 // indirect
47-
github.com/aws/smithy-go v1.11.2 // indirect
48-
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
49-
github.com/cloudflare/circl v1.3.7 // indirect
50-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
51-
github.com/davecgh/go-spew v1.1.1 // indirect
52-
github.com/docker/libkv v0.2.2-0.20180912205406-458977154600 // indirect
39+
github.com/Shopify/ejson v1.5.3 // indirect
40+
github.com/armon/go-metrics v0.4.1 // indirect
41+
github.com/aws/aws-sdk-go v1.55.5 // indirect
42+
github.com/aws/aws-sdk-go-v2 v1.32.6 // indirect
43+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
44+
github.com/aws/aws-sdk-go-v2/config v1.28.6 // indirect
45+
github.com/aws/aws-sdk-go-v2/credentials v1.17.47 // indirect
46+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
47+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10 // indirect
48+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
49+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
50+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
51+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25 // indirect
52+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.6 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
55+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.6 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/s3 v1.71.0 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.7 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.1 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
60+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
61+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
62+
github.com/aws/smithy-go v1.22.1 // indirect
63+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
64+
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
65+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
66+
github.com/cloudflare/circl v1.3.9 // indirect
67+
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
68+
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
69+
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
70+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5371
github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad // indirect
5472
github.com/emirpasic/gods v1.18.1 // indirect
55-
github.com/fatih/color v1.13.0 // indirect
73+
github.com/envoyproxy/go-control-plane v0.13.0 // indirect
74+
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
75+
github.com/fatih/color v1.17.0 // indirect
76+
github.com/felixge/httpsnoop v1.0.4 // indirect
5677
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
57-
github.com/go-git/go-billy/v5 v5.5.0 // indirect
58-
github.com/go-git/go-git/v5 v5.12.0 // indirect
78+
github.com/go-git/go-billy/v5 v5.6.0 // indirect
79+
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
80+
github.com/go-logr/logr v1.4.2 // indirect
81+
github.com/go-logr/stdr v1.2.2 // indirect
5982
github.com/go-stack/stack v1.8.0 // indirect
83+
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
6084
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
61-
github.com/golang/protobuf v1.5.4 // indirect
62-
github.com/golang/snappy v0.0.4 // indirect
85+
github.com/google/s2a-go v0.1.8 // indirect
6386
github.com/google/uuid v1.6.0 // indirect
64-
github.com/google/wire v0.5.0 // indirect
65-
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
66-
github.com/googleapis/go-type-adapters v1.0.0 // indirect
67-
github.com/gosimple/slug v1.12.0 // indirect
87+
github.com/google/wire v0.6.0 // indirect
88+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
89+
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
90+
github.com/gosimple/slug v1.14.0 // indirect
6891
github.com/gosimple/unidecode v1.0.1 // indirect
69-
github.com/hairyhenderson/go-fsimpl v0.0.0-20220529183339-9deae3e35047 // indirect
92+
github.com/hack-pad/hackpadfs v0.2.4 // indirect
93+
github.com/hairyhenderson/go-fsimpl v0.2.1 // indirect
94+
github.com/hairyhenderson/go-git/v5 v5.12.1-0.20240530140403-1b868a7b8a3c // indirect
7095
github.com/hairyhenderson/toml v0.4.2-0.20210923231440-40456b8e66cf // indirect
96+
github.com/hairyhenderson/xignore v0.3.3-0.20230403012150-95fe86932830 // indirect
7197
github.com/hairyhenderson/yaml v0.0.0-20220618171115-2d35fca545ce // indirect
72-
github.com/hashicorp/consul/api v1.13.0 // indirect
98+
github.com/hashicorp/consul/api v1.30.0 // indirect
7399
github.com/hashicorp/errwrap v1.1.0 // indirect
74100
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
75-
github.com/hashicorp/go-hclog v1.2.0 // indirect
101+
github.com/hashicorp/go-hclog v1.6.3 // indirect
76102
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
77103
github.com/hashicorp/go-multierror v1.1.1 // indirect
78-
github.com/hashicorp/go-plugin v1.4.4 // indirect
79-
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
104+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
80105
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
81-
github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
82-
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.5 // indirect
106+
github.com/hashicorp/go-secure-stdlib/awsutil v0.3.0 // indirect
107+
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
83108
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
84-
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
109+
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
85110
github.com/hashicorp/go-uuid v1.0.3 // indirect
86111
github.com/hashicorp/go-version v1.5.0 // indirect
87-
github.com/hashicorp/golang-lru v0.5.4 // indirect
112+
github.com/hashicorp/golang-lru v1.0.2 // indirect
88113
github.com/hashicorp/hcl v1.0.0 // indirect
89-
github.com/hashicorp/serf v0.9.7 // indirect
90-
github.com/hashicorp/vault/api v1.6.0 // indirect
91-
github.com/hashicorp/vault/sdk v0.5.0 // indirect
92-
github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
93-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
114+
github.com/hashicorp/serf v0.10.1 // indirect
115+
github.com/hashicorp/vault/api v1.15.0 // indirect
116+
github.com/hashicorp/vault/api/auth/approle v0.8.0 // indirect
117+
github.com/hashicorp/vault/api/auth/aws v0.8.0 // indirect
118+
github.com/hashicorp/vault/api/auth/userpass v0.8.0 // indirect
119+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
120+
github.com/itchyny/gojq v0.12.17 // indirect
121+
github.com/itchyny/timefmt-go v0.1.6 // indirect
94122
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
95123
github.com/jmespath/go-jmespath v0.4.0 // indirect
96-
github.com/joho/godotenv v1.4.0 // indirect
124+
github.com/joho/godotenv v1.5.1 // indirect
97125
github.com/kevinburke/ssh_config v1.2.0 // indirect
98-
github.com/mattn/go-colorable v0.1.12 // indirect
99-
github.com/mattn/go-isatty v0.0.14 // indirect
100-
github.com/mitchellh/copystructure v1.2.0 // indirect
126+
github.com/kylelemons/godebug v1.1.0 // indirect
127+
github.com/mattn/go-colorable v0.1.13 // indirect
128+
github.com/mattn/go-isatty v0.0.20 // indirect
101129
github.com/mitchellh/go-homedir v1.1.0 // indirect
102-
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
103130
github.com/mitchellh/mapstructure v1.5.0 // indirect
104-
github.com/mitchellh/reflectwalk v1.0.2 // indirect
105-
github.com/oklog/run v1.1.0 // indirect
106-
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
131+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
107132
github.com/pjbgf/sha1cd v0.3.0 // indirect
133+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
108134
github.com/pkg/errors v0.9.1 // indirect
109-
github.com/pmezard/go-difflib v1.0.0 // indirect
110-
github.com/rs/zerolog v1.26.1 // indirect
135+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
136+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
111137
github.com/ryanuber/go-glob v1.0.0 // indirect
112138
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
113139
github.com/skeema/knownhosts v1.2.2 // indirect
114-
github.com/spf13/afero v1.8.2 // indirect
115140
github.com/spf13/pflag v1.0.5 // indirect
116-
github.com/ugorji/go/codec v1.2.7 // indirect
141+
github.com/ugorji/go/codec v1.2.12 // indirect
117142
github.com/xanzy/ssh-agent v0.3.3 // indirect
118-
github.com/zealic/xignore v0.3.3 // indirect
119-
go.etcd.io/bbolt v1.3.6 // indirect
120-
go.opencensus.io v0.23.0 // indirect
121-
go.uber.org/atomic v1.9.0 // indirect
122-
go4.org/intern v0.0.0-20230205224052-192e9f60865c // indirect
123-
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect
124-
gocloud.dev v0.25.1-0.20220408200107-09b10f7359f7 // indirect
125-
golang.org/x/crypto v0.23.0 // indirect
126-
golang.org/x/mod v0.12.0 // indirect
127-
golang.org/x/net v0.25.0 // indirect
128-
golang.org/x/oauth2 v0.20.0 // indirect
129-
golang.org/x/sync v0.7.0 // indirect
130-
golang.org/x/sys v0.20.0 // indirect
131-
golang.org/x/text v0.15.0 // indirect
132-
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
133-
golang.org/x/tools v0.13.0 // indirect
134-
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
135-
google.golang.org/api v0.81.0 // indirect
136-
google.golang.org/appengine v1.6.7 // indirect
137-
google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58 // indirect
138-
google.golang.org/grpc v1.65.0 // indirect
139-
google.golang.org/protobuf v1.34.1 // indirect
140-
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
143+
go.opencensus.io v0.24.0 // indirect
144+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
145+
go.opentelemetry.io/contrib/detectors/gcp v1.29.0 // indirect
146+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
147+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
148+
go.opentelemetry.io/otel v1.33.0 // indirect
149+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
150+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
151+
go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect
152+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
153+
go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
154+
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
155+
go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect
156+
gocloud.dev v0.40.0 // indirect
157+
golang.org/x/crypto v0.31.0 // indirect
158+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
159+
golang.org/x/mod v0.21.0 // indirect
160+
golang.org/x/net v0.32.0 // indirect
161+
golang.org/x/oauth2 v0.24.0 // indirect
162+
golang.org/x/sync v0.10.0 // indirect
163+
golang.org/x/sys v0.28.0 // indirect
164+
golang.org/x/text v0.21.0 // indirect
165+
golang.org/x/time v0.7.0 // indirect
166+
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
167+
google.golang.org/api v0.201.0 // indirect
168+
google.golang.org/genproto v0.0.0-20241007155032-5fefd90f89a9 // indirect
169+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
170+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
171+
google.golang.org/grpc v1.68.1 // indirect
172+
google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect
173+
google.golang.org/protobuf v1.35.2 // indirect
141174
gopkg.in/warnings.v0 v0.1.2 // indirect
142175
gopkg.in/yaml.v2 v2.4.0 // indirect
143176
gopkg.in/yaml.v3 v3.0.1 // indirect
144-
inet.af/netaddr v0.0.0-20220811202034-502d2d690317 // indirect
145-
k8s.io/client-go v11.0.0+incompatible // indirect
177+
inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a // indirect
178+
k8s.io/client-go v0.32.0 // indirect
146179
)
147180

148181
replace gopkg.in/hairyhenderson/yaml.v2 => github.com/maxaudron/yaml v0.0.0-20190411130442-27c13492fe3c

0 commit comments

Comments
 (0)