Rename CAFile to CaFile for consistency

banjoh · banjoh · commit 7a22dd28d13b · 2024-11-19T21:18:27.000Z
Signed-off-by: Evans Mungai &lt;mbuevans@gmail.com&gt;
diff --git a/cmd/helm/dependency.go b/cmd/helm/dependency.go
@@ -132,5 +132,5 @@ func addDependencySubcommandFlags(f *pflag.FlagSet, client *action.Dependency) {
 	f.StringVar(&client.KeyFile, "key-file", "", "identify HTTPS client using this SSL key file")
 	f.BoolVar(&client.InsecureSkipTLSverify, "insecure-skip-tls-verify", false, "skip tls certificate checks for the chart download")
 	f.BoolVar(&client.PlainHTTP, "plain-http", false, "use insecure HTTP connections for the chart download")
-	f.StringVar(&client.CAFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle")
+	f.StringVar(&client.CaFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle")
 }
diff --git a/cmd/helm/dependency_build.go b/cmd/helm/dependency_build.go
@@ -54,7 +54,7 @@ func newDependencyBuildCmd(out io.Writer) *cobra.Command {
 			if len(args) > 0 {
 				chartpath = filepath.Clean(args[0])
 			}
-			registryClient, err := newRegistryClient(client.CertFile, client.KeyFile, client.CAFile,
+			registryClient, err := newRegistryClient(client.CertFile, client.KeyFile, client.CaFile,
 				client.InsecureSkipTLSverify, client.PlainHTTP, client.Username, client.Password)
 			if err != nil {
 				return fmt.Errorf("missing registry client: %w", err)
diff --git a/cmd/helm/dependency_update.go b/cmd/helm/dependency_update.go
@@ -58,7 +58,7 @@ func newDependencyUpdateCmd(_ *action.Configuration, out io.Writer) *cobra.Comma
 			if len(args) > 0 {
 				chartpath = filepath.Clean(args[0])
 			}
-			registryClient, err := newRegistryClient(client.CertFile, client.KeyFile, client.CAFile,
+			registryClient, err := newRegistryClient(client.CertFile, client.KeyFile, client.CaFile,
 				client.InsecureSkipTLSverify, client.PlainHTTP, client.Username, client.Password)
 			if err != nil {
 				return fmt.Errorf("missing registry client: %w", err)
diff --git a/cmd/helm/package.go b/cmd/helm/package.go
@@ -75,7 +75,7 @@ func newPackageCmd(out io.Writer) *cobra.Command {
 				return err
 			}
 
-			registryClient, err := newRegistryClient(client.CertFile, client.KeyFile, client.CAFile,
+			registryClient, err := newRegistryClient(client.CertFile, client.KeyFile, client.CaFile,
 				client.InsecureSkipTLSverify, client.PlainHTTP, client.Username, client.Password)
 			if err != nil {
 				return fmt.Errorf("missing registry client: %w", err)
@@ -131,7 +131,7 @@ func newPackageCmd(out io.Writer) *cobra.Command {
 	f.StringVar(&client.KeyFile, "key-file", "", "identify HTTPS client using this SSL key file")
 	f.BoolVar(&client.InsecureSkipTLSverify, "insecure-skip-tls-verify", false, "skip tls certificate checks for the chart download")
 	f.BoolVar(&client.PlainHTTP, "plain-http", false, "use insecure HTTP connections for the chart download")
-	f.StringVar(&client.CAFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle")
+	f.StringVar(&client.CaFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle")
 
 	return cmd
 }
diff --git a/pkg/action/dependency.go b/pkg/action/dependency.go
@@ -42,7 +42,7 @@ type Dependency struct {
 	Password              string
 	CertFile              string
 	KeyFile               string
-	CAFile                string
+	CaFile                string
 	InsecureSkipTLSverify bool
 	PlainHTTP             bool
 }
diff --git a/pkg/action/package.go b/pkg/action/package.go
@@ -51,7 +51,7 @@ type Package struct {
 	Password              string
 	CertFile              string
 	KeyFile               string
-	CAFile                string
+	CaFile                string
 	InsecureSkipTLSverify bool
 }
 

Original file line number	Diff line number	Diff line change
`@@ -132,5 +132,5 @@ func addDependencySubcommandFlags(f pflag.FlagSet, client action.Dependency) {`
`132`	`132`	`f.StringVar(&client.KeyFile, "key-file", "", "identify HTTPS client using this SSL key file")`
`133`	`133`	`f.BoolVar(&client.InsecureSkipTLSverify, "insecure-skip-tls-verify", false, "skip tls certificate checks for the chart download")`
`134`	`134`	`f.BoolVar(&client.PlainHTTP, "plain-http", false, "use insecure HTTP connections for the chart download")`
`135`		`- f.StringVar(&client.CAFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle")`
	`135`	`+ f.StringVar(&client.CaFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle")`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func newDependencyBuildCmd(out io.Writer) *cobra.Command {`
`54`	`54`	`if len(args) > 0 {`
`55`	`55`	`chartpath = filepath.Clean(args[0])`
`56`	`56`	`}`
`57`		`- registryClient, err := newRegistryClient(client.CertFile, client.KeyFile, client.CAFile,`
	`57`	`+ registryClient, err := newRegistryClient(client.CertFile, client.KeyFile, client.CaFile,`
`58`	`58`	`client.InsecureSkipTLSverify, client.PlainHTTP, client.Username, client.Password)`
`59`	`59`	`if err != nil {`
`60`	`60`	`return fmt.Errorf("missing registry client: %w", err)`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func newDependencyUpdateCmd(_ action.Configuration, out io.Writer) cobra.Comma`
`58`	`58`	`if len(args) > 0 {`
`59`	`59`	`chartpath = filepath.Clean(args[0])`
`60`	`60`	`}`
`61`		`- registryClient, err := newRegistryClient(client.CertFile, client.KeyFile, client.CAFile,`
	`61`	`+ registryClient, err := newRegistryClient(client.CertFile, client.KeyFile, client.CaFile,`
`62`	`62`	`client.InsecureSkipTLSverify, client.PlainHTTP, client.Username, client.Password)`
`63`	`63`	`if err != nil {`
`64`	`64`	`return fmt.Errorf("missing registry client: %w", err)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ type Dependency struct {`
`42`	`42`	`Password string`
`43`	`43`	`CertFile string`
`44`	`44`	`KeyFile string`
`45`		`- CAFile string`
	`45`	`+ CaFile string`
`46`	`46`	`InsecureSkipTLSverify bool`
`47`	`47`	`PlainHTTP bool`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ type Package struct {`
`51`	`51`	`Password string`
`52`	`52`	`CertFile string`
`53`	`53`	`KeyFile string`
`54`		`- CAFile string`
	`54`	`+ CaFile string`
`55`	`55`	`InsecureSkipTLSverify bool`
`56`	`56`	`}`
`57`	`57`