Refactor to address linting.

alyssacgoins · alyssacgoins · commit 240efdfe48a4 · 2025-10-06T12:54:42.000-04:00
Signed-off-by: agoins &lt;alyssacgoins@gmail.com&gt;
diff --git a/backend/src/common/client/api_server/util.go b/backend/src/common/client/api_server/util.go
@@ -75,7 +75,7 @@ func NewHTTPRuntime(clientConfig clientcmd.ClientConfig, debug bool, tlsCfg *tls
 		if testconfig.ApiScheme != nil {
 			scheme = append(scheme, *testconfig.ApiScheme)
 		}
-		if *testconfig.DisableTlsCheck {
+		if *testconfig.DisableTLSCheck {
 			tr := &http.Transport{
 				TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 			}
diff --git a/backend/src/common/util/service.go b/backend/src/common/util/service.go
@@ -103,7 +103,7 @@ func GetKubernetesClientFromClientConfig(clientConfig clientcmd.ClientConfig) (
 	return clientSet, config, namespace, nil
 }
 
-func GetRpcConnectionWithTimeout(address string, tlsCfg *tls.Config, timeout time.Time) (*grpc.ClientConn, error) {
+func GetRPCConnectionWithTimeout(address string, tlsCfg *tls.Config, timeout time.Time) (*grpc.ClientConn, error) {
 	creds := insecure.NewCredentials()
 	if tlsCfg != nil {
 		creds = credentials.NewTLS(tlsCfg)
@@ -124,7 +124,7 @@ func GetRpcConnection(address string, tlsCfg *tls.Config) (*grpc.ClientConn, err
 		creds = credentials.NewTLS(tlsCfg)
 	}
 
-	conn, err := grpc.Dial(
+	conn, err := grpc.NewClient(
 		address,
 		grpc.WithTransportCredentials(creds),
 	)
diff --git a/backend/src/common/util/tls_config.go b/backend/src/common/util/tls_config.go
@@ -6,6 +6,8 @@ import (
 	"os"
 )
 
+// Util to create TLS config.
+
 // GetTLSConfig returns TLS config set with system CA certs as well as custom CA stored at input caCertPath if provided.
 func GetTLSConfig(caCertPath string) (*tls.Config, error) {
 	caCertPool, err := x509.SystemCertPool()
diff --git a/backend/src/crd/controller/scheduledworkflow/main.go b/backend/src/crd/controller/scheduledworkflow/main.go
@@ -111,7 +111,7 @@ func main() {
 		log.Fatalf("Error creating tls config: %s", err.Error())
 	}
 
-	apiConnection, err := commonutil.GetRpcConnectionWithTimeout(grpcAddress, tlsCfg, time.Now().Add(time.Minute))
+	apiConnection, err := commonutil.GetRPCConnectionWithTimeout(grpcAddress, tlsCfg, time.Now().Add(time.Minute))
 	if err != nil {
 		log.Fatalf("Error connecting to the API server after trying for one minute: %v", err)
 	}
diff --git a/backend/src/v2/cacheutils/cache.go b/backend/src/v2/cacheutils/cache.go
@@ -87,11 +87,12 @@ func NewClient(cacheDisabled bool, tlsCfg *tls.Config) (Client, error) {
 		creds = credentials.NewTLS(tlsCfg)
 	}
 	glog.Infof("Connecting to cache endpoint %s", defaultKfpApiEndpoint)
-	conn, err := grpc.Dial(
+	conn, err := grpc.NewClient(
 		defaultKfpApiEndpoint,
 		grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(MaxClientGRPCMessageSize)),
 		grpc.WithTransportCredentials(creds),
 	)
+
 	if err != nil {
 		return nil, fmt.Errorf("metadata.NewClient() failed: %w", err)
 	}
diff --git a/backend/src/v2/metadata/testutils/test_utils.go b/backend/src/v2/metadata/testutils/test_utils.go
@@ -7,18 +7,19 @@ import (
 	pb "github.com/kubeflow/pipelines/third_party/ml-metadata/go/ml_metadata"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 )
 
 func NewTestMlmdClient(testMlmdServerAddress string, testMlmdServerPort string, tlsEnabled bool, caCertPath string) (pb.MetadataStoreServiceClient, error) {
-	dialOption := grpc.WithInsecure()
+	creds := insecure.NewCredentials()
 	if tlsEnabled {
 		tlsCfg, err := test.GetTLSConfig(caCertPath)
 		if err != nil {
 			return nil, err
 		}
-		creds := credentials.NewTLS(tlsCfg)
-		dialOption = grpc.WithTransportCredentials(creds)
+		creds = credentials.NewTLS(tlsCfg)
 	}
+	dialOption := grpc.WithTransportCredentials(creds)
 	conn, err := grpc.Dial(fmt.Sprintf("%s:%s", testMlmdServerAddress, testMlmdServerPort),
 		dialOption,
 	)
diff --git a/backend/test/config/flags.go b/backend/test/config/flags.go
@@ -30,11 +30,11 @@ var (
 	ApiHost                       = flag.String("apiHost", "localhost", "The hostname of the API server")
 	ApiPort                       = flag.String("apiPort", "8888", "The port on which the API server is listening")
 	ApiUrl                        = flag.String("apiUrl", fmt.Sprintf("%s://%s:%s", *ApiScheme, *ApiHost, *ApiPort), "The URL of the API server")
-	DisableTlsCheck               = flag.Bool("disableTlsCheck", false, "Whether to use server certificate chain and hostname.")
+	DisableTLSCheck               = flag.Bool("disableTlsCheck", false, "Whether to use server certificate chain and hostname")
 	InClusterRun                  = flag.Bool("runInCluster", false, "Whether to run your tests from within the K8s cluster")
 	AuthToken                     = flag.String("authToken", "", "The default auth token that will be injected to all your API request")
-	TlsEnabled                    = flag.Bool("tlsEnabled", false, "Set to true if mlpipeline API server and metadata server serve over TLS.")
-	CaCertPath                    = flag.String("caCertPath", "", "The path to the CA certificate to trust on connections to the ML pipeline API server and metadata server.")
+	TLSEnabled                    = flag.Bool("tlsEnabled", false, "Set to true if mlpipeline API server and metadata server serve over TLS")
+	CaCertPath                    = flag.String("caCertPath", "", "The path to the CA certificate to trust on connections to the ML pipeline API server and metadata server")
 )
 
 var (
diff --git a/backend/test/end2end/e2e_suite_test.go b/backend/test/end2end/e2e_suite_test.go
@@ -70,7 +70,7 @@ var _ = BeforeSuite(func() {
 	k8Client, err = testutil.CreateK8sClient()
 	Expect(err).To(BeNil(), "Failed to initialize K8s client")
 	var tlsCfg *tls.Config
-	if *config.TlsEnabled {
+	if *config.TLSEnabled {
 		tlsCfg, err = test.GetTLSConfig(*config.CaCertPath)
 		if err != nil {
 			log.Fatalf("Error getting TLS Config: %v", err)
diff --git a/backend/test/integration/pipeline_version_api_test.go b/backend/test/integration/pipeline_version_api_test.go
@@ -23,7 +23,6 @@ import (
 	params "github.com/kubeflow/pipelines/backend/api/v1beta1/go_http_client/pipeline_client/pipeline_service"
 	"github.com/kubeflow/pipelines/backend/api/v1beta1/go_http_client/pipeline_model"
 	uploadParams "github.com/kubeflow/pipelines/backend/api/v1beta1/go_http_client/pipeline_upload_client/pipeline_upload_service"
-	"github.com/kubeflow/pipelines/backend/src/apiserver/template"
 	pipelinetemplate "github.com/kubeflow/pipelines/backend/src/apiserver/template"
 	api_server "github.com/kubeflow/pipelines/backend/src/common/client/api_server/v1"
 	"github.com/kubeflow/pipelines/backend/src/common/util"
@@ -337,7 +336,7 @@ func (s *PipelineVersionApiTest) TestArgoSpec() {
 	require.Nil(t, err)
 	bytes, err := os.ReadFile("../resources/arguments-parameters.yaml")
 	require.Nil(t, err)
-	expected, err := pipelinetemplate.New(bytes, template.TemplateOptions{CacheDisabled: true})
+	expected, err := pipelinetemplate.New(bytes, pipelinetemplate.TemplateOptions{CacheDisabled: true})
 	require.Nil(t, err)
 	assert.Equal(t, expected, tmpl)
 }
@@ -370,7 +369,7 @@ func (s *PipelineVersionApiTest) TestV2Spec() {
 	require.Nil(t, err)
 	bytes, err := os.ReadFile("../resources/v2-hello-world.yaml")
 	require.Nil(t, err)
-	expected, err := pipelinetemplate.New(bytes, template.TemplateOptions{CacheDisabled: true})
+	expected, err := pipelinetemplate.New(bytes, pipelinetemplate.TemplateOptions{CacheDisabled: true})
 	require.Nil(t, err)
 	assert.Equal(t, expected, tmpl, "Discrepancy found in template's pipeline name. Created pipeline's name - %s.", pipeline.Name)
 }
diff --git a/backend/test/testutil/test_utils.go b/backend/test/testutil/test_utils.go
@@ -62,7 +62,7 @@ func CheckIfSkipping(stringValue string) {
 		ginkgo.Skip(fmt.Sprintf("Skipping pipeline run test because of a known issue: https://github.com/kubeflow/pipelines/issues/%s", issue))
 	}
 	// Skip pipeline 'pipeline_submit_request' test if TLS is not enabled
-	if !*config.TlsEnabled && strings.Contains(strings.ToLower(stringValue), "pipeline_submit_request") {
+	if !*config.TLSEnabled && strings.Contains(strings.ToLower(stringValue), "pipeline_submit_request") {
 		ginkgo.Skip(fmt.Sprintf("Skipping pipeline run test because TLS is not enabled"))
 	}
 }
diff --git a/backend/test/v2/api/integration_suite_test.go b/backend/test/v2/api/integration_suite_test.go
@@ -75,7 +75,7 @@ var _ = BeforeSuite(func() {
 	k8Client, err = testutil.CreateK8sClient()
 	Expect(err).To(BeNil(), "Failed to initialize K8s client")
 	var tlsCfg *tls.Config
-	if *config.TlsEnabled {
+	if *config.TLSEnabled {
 		tlsCfg, err = test.GetTLSConfig(*config.CaCertPath)
 		if err != nil {
 			log.Fatalf("Error getting TLS Config: %v", err)
diff --git a/backend/test/v2/integration/cache_test.go b/backend/test/v2/integration/cache_test.go
@@ -46,7 +46,7 @@ func TestCache(t *testing.T) {
 
 func (s *CacheTestSuite) SetupSuite() {
 	var err error
-	s.mlmdClient, err = testutils.NewTestMlmdClient("127.0.0.1", metadata.DefaultConfig().Port, *config.TlsEnabled, *config.CaCertPath)
+	s.mlmdClient, err = testutils.NewTestMlmdClient("127.0.0.1", metadata.DefaultConfig().Port, *config.TLSEnabled, *config.CaCertPath)
 	require.NoError(s.T(), err)
 	require.NotNil(s.T(), s.mlmdClient)
 }
diff --git a/backend/test/v2/integration/experiment_api_test.go b/backend/test/v2/integration/experiment_api_test.go
@@ -69,7 +69,7 @@ func (s *ExperimentApiTest) SetupTest() {
 	var newRecurringRunClient func() (*api_server.RecurringRunClient, error)
 	var tlsCfg *tls.Config
 	var err error
-	if *config.TlsEnabled {
+	if *config.TLSEnabled {
 		tlsCfg, err = test.GetTLSConfig(*config.CaCertPath)
 		if err != nil {
 			glog.Fatalf("Error creating tls config: %s", err.Error())
diff --git a/backend/test/v2/integration/pipeline_api_test.go b/backend/test/v2/integration/pipeline_api_test.go
@@ -67,7 +67,7 @@ func (s *PipelineApiTest) SetupTest() {
 	var newPipelineClient func() (*api_server.PipelineClient, error)
 	var tlsCfg *tls.Config
 	var err error
-	if *config.TlsEnabled {
+	if *config.TLSEnabled {
 		tlsCfg, err = test.GetTLSConfig(*config.CaCertPath)
 		if err != nil {
 			glog.Exitf("Failed to get TLS config. Error: %s", err.Error())
diff --git a/backend/test/v2/integration/pipeline_version_api_test.go b/backend/test/v2/integration/pipeline_version_api_test.go
@@ -70,7 +70,7 @@ func (s *PipelineVersionApiTest) SetupTest() {
 	s.namespace = *config.Namespace
 	var tlsCfg *tls.Config
 	var err error
-	if *config.TlsEnabled {
+	if *config.TLSEnabled {
 		tlsCfg, err = test.GetTLSConfig(*config.CaCertPath)
 		if err != nil {
 			glog.Fatalf("Error creating tls config: %s", err.Error())
diff --git a/backend/test/v2/integration/recurring_run_api_test.go b/backend/test/v2/integration/recurring_run_api_test.go
@@ -86,7 +86,7 @@ func (s *RecurringRunApiTestSuite) SetupTest() {
 	var newRecurringRunClient func() (*api_server.RecurringRunClient, error)
 	var tlsCfg *tls.Config
 	var err error
-	if *config.TlsEnabled {
+	if *config.TLSEnabled {
 		tlsCfg, err = test.GetTLSConfig(*config.CaCertPath)
 		if err != nil {
 			glog.Fatalf("Error creating tls config: %s", err.Error())
diff --git a/backend/test/v2/integration/run_api_test.go b/backend/test/v2/integration/run_api_test.go
@@ -69,7 +69,7 @@ func (s *RunAPITestSuite) SetupTest() {
 	var newRunClient func() (*api_server.RunClient, error)
 	var tlsCfg *tls.Config
 	var err error
-	if *config.TlsEnabled {
+	if *config.TLSEnabled {
 		tlsCfg, err = test.GetTLSConfig(*config.CaCertPath)
 		if err != nil {
 			glog.Fatalf("Error creating tls config: %s", err.Error())

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func NewHTTPRuntime(clientConfig clientcmd.ClientConfig, debug bool, tlsCfg *tls`
`75`	`75`	`if testconfig.ApiScheme != nil {`
`76`	`76`	`scheme = append(scheme, *testconfig.ApiScheme)`
`77`	`77`	`}`
`78`		`- if *testconfig.DisableTlsCheck {`
	`78`	`+ if *testconfig.DisableTLSCheck {`
`79`	`79`	`tr := &http.Transport{`
`80`	`80`	`TLSClientConfig: &tls.Config{InsecureSkipVerify: true},`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func GetKubernetesClientFromClientConfig(clientConfig clientcmd.ClientConfig) (`
`103`	`103`	`return clientSet, config, namespace, nil`
`104`	`104`	`}`
`105`	`105`
`106`		`-func GetRpcConnectionWithTimeout(address string, tlsCfg tls.Config, timeout time.Time) (grpc.ClientConn, error) {`
	`106`	`+func GetRPCConnectionWithTimeout(address string, tlsCfg tls.Config, timeout time.Time) (grpc.ClientConn, error) {`
`107`	`107`	`creds := insecure.NewCredentials()`
`108`	`108`	`if tlsCfg != nil {`
`109`	`109`	`creds = credentials.NewTLS(tlsCfg)`
`@@ -124,7 +124,7 @@ func GetRpcConnection(address string, tlsCfg tls.Config) (grpc.ClientConn, err`
`124`	`124`	`creds = credentials.NewTLS(tlsCfg)`
`125`	`125`	`}`
`126`	`126`
`127`		`- conn, err := grpc.Dial(`
	`127`	`+ conn, err := grpc.NewClient(`
`128`	`128`	`address,`
`129`	`129`	`grpc.WithTransportCredentials(creds),`
`130`	`130`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ import (`
`6`	`6`	`"os"`
`7`	`7`	`)`
`8`	`8`
	`9`	`+// Util to create TLS config.`
	`10`	`+`
`9`	`11`	`// GetTLSConfig returns TLS config set with system CA certs as well as custom CA stored at input caCertPath if provided.`
`10`	`12`	`func GetTLSConfig(caCertPath string) (*tls.Config, error) {`
`11`	`13`	`caCertPool, err := x509.SystemCertPool()`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func main() {`
`111`	`111`	`log.Fatalf("Error creating tls config: %s", err.Error())`
`112`	`112`	`}`
`113`	`113`
`114`		`- apiConnection, err := commonutil.GetRpcConnectionWithTimeout(grpcAddress, tlsCfg, time.Now().Add(time.Minute))`
	`114`	`+ apiConnection, err := commonutil.GetRPCConnectionWithTimeout(grpcAddress, tlsCfg, time.Now().Add(time.Minute))`
`115`	`115`	`if err != nil {`
`116`	`116`	`log.Fatalf("Error connecting to the API server after trying for one minute: %v", err)`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,12 @@ func NewClient(cacheDisabled bool, tlsCfg *tls.Config) (Client, error) {`
`87`	`87`	`creds = credentials.NewTLS(tlsCfg)`
`88`	`88`	`}`
`89`	`89`	`glog.Infof("Connecting to cache endpoint %s", defaultKfpApiEndpoint)`
`90`		`- conn, err := grpc.Dial(`
	`90`	`+ conn, err := grpc.NewClient(`
`91`	`91`	`defaultKfpApiEndpoint,`
`92`	`92`	`grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(MaxClientGRPCMessageSize)),`
`93`	`93`	`grpc.WithTransportCredentials(creds),`
`94`	`94`	`)`
	`95`	`+`
`95`	`96`	`if err != nil {`
`96`	`97`	`return nil, fmt.Errorf("metadata.NewClient() failed: %w", err)`
`97`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,18 +7,19 @@ import (`
`7`	`7`	`pb "github.com/kubeflow/pipelines/third_party/ml-metadata/go/ml_metadata"`
`8`	`8`	`"google.golang.org/grpc"`
`9`	`9`	`"google.golang.org/grpc/credentials"`
	`10`	`+ "google.golang.org/grpc/credentials/insecure"`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`func NewTestMlmdClient(testMlmdServerAddress string, testMlmdServerPort string, tlsEnabled bool, caCertPath string) (pb.MetadataStoreServiceClient, error) {`
`13`		`- dialOption := grpc.WithInsecure()`
	`14`	`+ creds := insecure.NewCredentials()`
`14`	`15`	`if tlsEnabled {`
`15`	`16`	`tlsCfg, err := test.GetTLSConfig(caCertPath)`
`16`	`17`	`if err != nil {`
`17`	`18`	`return nil, err`
`18`	`19`	`}`
`19`		`- creds := credentials.NewTLS(tlsCfg)`
`20`		`- dialOption = grpc.WithTransportCredentials(creds)`
	`20`	`+ creds = credentials.NewTLS(tlsCfg)`
`21`	`21`	`}`
	`22`	`+ dialOption := grpc.WithTransportCredentials(creds)`
`22`	`23`	`conn, err := grpc.Dial(fmt.Sprintf("%s:%s", testMlmdServerAddress, testMlmdServerPort),`
`23`	`24`	`dialOption,`
`24`	`25`	`)`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func CheckIfSkipping(stringValue string) {`
`62`	`62`	`ginkgo.Skip(fmt.Sprintf("Skipping pipeline run test because of a known issue: https://github.com/kubeflow/pipelines/issues/%s", issue))`
`63`	`63`	`}`
`64`	`64`	`// Skip pipeline 'pipeline_submit_request' test if TLS is not enabled`
`65`		`- if !*config.TlsEnabled && strings.Contains(strings.ToLower(stringValue), "pipeline_submit_request") {`
	`65`	`+ if !*config.TLSEnabled && strings.Contains(strings.ToLower(stringValue), "pipeline_submit_request") {`
`66`	`66`	`ginkgo.Skip(fmt.Sprintf("Skipping pipeline run test because TLS is not enabled"))`
`67`	`67`	`}`
`68`	`68`	`}`