From 4b1784e201ccbb2365979624ab559a0499a7d102 Mon Sep 17 00:00:00 2001 From: Sheridan C Rawlins Date: Mon, 26 Sep 2022 21:55:19 -0700 Subject: [PATCH 1/3] Client key and cert should not be required. Fixing schema change from #3302 Signed-off-by: Sheridan C Rawlins --- www/docs/static/schema.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/www/docs/static/schema.json b/www/docs/static/schema.json index 2142906bbf2..2fff7061e27 100644 --- a/www/docs/static/schema.json +++ b/www/docs/static/schema.json @@ -2538,11 +2538,7 @@ } }, "additionalProperties": false, - "type": "object", - "required": [ - "client_x509_cert", - "client_x509_key" - ] + "type": "object" }, "Webhook": { "properties": { @@ -2575,4 +2571,4 @@ } }, "description": "goreleaser configuration definition file" - } \ No newline at end of file + } From 46416c28d16bfda1f40267c5fb570eb502793005 Mon Sep 17 00:00:00 2001 From: Sheridan C Rawlins Date: Mon, 26 Sep 2022 21:59:04 -0700 Subject: [PATCH 2/3] Also add the omitempty field for the json of client cert and key. Signed-off-by: Sheridan C Rawlins --- pkg/config/config.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/config/config.go b/pkg/config/config.go index 86407bfdc8e..349fbdb755e 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -319,15 +319,15 @@ type Build struct { UnproxiedDir string `yaml:"-" json:"-"` // used by gomod.proxy BuildDetails `yaml:",inline" json:",inline"` // nolint: tagliatelle - BuildDetailsOverrides []BuildDetailsOverride `yaml:"overrides,omitempty" json:"overrides,omitempty"` + BuildDetailsOverrides []BuildDetailsOverride `yaml:"overrides,omitempty" json:"overrides,omitempty"` } type BuildDetailsOverride struct { - Goos string `yaml:"goos,omitempty" json:"goos,omitempty"` - Goarch string `yaml:"goarch,omitempty" json:"goarch,omitempty"` - Goarm string `yaml:"goarm,omitempty" json:"goarm,omitempty"` - Gomips string `yaml:"gomips,omitempty" json:"gomips,omitempty"` - Goamd64 string `yaml:"goamd64,omitempty" json:"goamd64,omitempty"` + Goos string `yaml:"goos,omitempty" json:"goos,omitempty"` + Goarch string `yaml:"goarch,omitempty" json:"goarch,omitempty"` + Goarm string `yaml:"goarm,omitempty" json:"goarm,omitempty"` + Gomips string `yaml:"gomips,omitempty" json:"gomips,omitempty"` + Goamd64 string `yaml:"goamd64,omitempty" json:"goamd64,omitempty"` BuildDetails `yaml:",inline" json:",inline"` // nolint: tagliatelle } @@ -531,7 +531,7 @@ type ExtraFile struct { // NFPM config. type NFPM struct { NFPMOverridables `yaml:",inline" json:",inline"` // nolint: tagliatelle - Overrides map[string]NFPMOverridables `yaml:"overrides,omitempty" json:"overrides,omitempty"` + Overrides map[string]NFPMOverridables `yaml:"overrides,omitempty" json:"overrides,omitempty"` ID string `yaml:"id,omitempty" json:"id,omitempty"` Builds []string `yaml:"builds,omitempty" json:"builds,omitempty"` @@ -854,8 +854,8 @@ type Upload struct { Mode string `yaml:"mode,omitempty" json:"mode,omitempty"` Method string `yaml:"method,omitempty" json:"method,omitempty"` ChecksumHeader string `yaml:"checksum_header,omitempty" json:"checksum_header,omitempty"` - ClientX509Cert string `yaml:"client_x509_cert" json:"client_x509_cert"` - ClientX509Key string `yaml:"client_x509_key" json:"client_x509_key"` + ClientX509Cert string `yaml:"client_x509_cert,omitempty" json:"client_x509_cert,omitempty"` + ClientX509Key string `yaml:"client_x509_key,omitempty" json:"client_x509_key,omitempty"` TrustedCerts string `yaml:"trusted_certificates,omitempty" json:"trusted_certificates,omitempty"` Checksum bool `yaml:"checksum,omitempty" json:"checksum,omitempty"` Signature bool `yaml:"signature,omitempty" json:"signature,omitempty"` From c620799642df84cce5cc0e329290d9c2759827f1 Mon Sep 17 00:00:00 2001 From: Carlos A Becker Date: Tue, 27 Sep 2022 10:11:12 -0300 Subject: [PATCH 3/3] chore: gofumpt Signed-off-by: Carlos A Becker --- pkg/config/config.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/config/config.go b/pkg/config/config.go index 349fbdb755e..ae2ebe9258a 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -319,15 +319,15 @@ type Build struct { UnproxiedDir string `yaml:"-" json:"-"` // used by gomod.proxy BuildDetails `yaml:",inline" json:",inline"` // nolint: tagliatelle - BuildDetailsOverrides []BuildDetailsOverride `yaml:"overrides,omitempty" json:"overrides,omitempty"` + BuildDetailsOverrides []BuildDetailsOverride `yaml:"overrides,omitempty" json:"overrides,omitempty"` } type BuildDetailsOverride struct { - Goos string `yaml:"goos,omitempty" json:"goos,omitempty"` - Goarch string `yaml:"goarch,omitempty" json:"goarch,omitempty"` - Goarm string `yaml:"goarm,omitempty" json:"goarm,omitempty"` - Gomips string `yaml:"gomips,omitempty" json:"gomips,omitempty"` - Goamd64 string `yaml:"goamd64,omitempty" json:"goamd64,omitempty"` + Goos string `yaml:"goos,omitempty" json:"goos,omitempty"` + Goarch string `yaml:"goarch,omitempty" json:"goarch,omitempty"` + Goarm string `yaml:"goarm,omitempty" json:"goarm,omitempty"` + Gomips string `yaml:"gomips,omitempty" json:"gomips,omitempty"` + Goamd64 string `yaml:"goamd64,omitempty" json:"goamd64,omitempty"` BuildDetails `yaml:",inline" json:",inline"` // nolint: tagliatelle } @@ -531,7 +531,7 @@ type ExtraFile struct { // NFPM config. type NFPM struct { NFPMOverridables `yaml:",inline" json:",inline"` // nolint: tagliatelle - Overrides map[string]NFPMOverridables `yaml:"overrides,omitempty" json:"overrides,omitempty"` + Overrides map[string]NFPMOverridables `yaml:"overrides,omitempty" json:"overrides,omitempty"` ID string `yaml:"id,omitempty" json:"id,omitempty"` Builds []string `yaml:"builds,omitempty" json:"builds,omitempty"`