Frrist/tests/migrate to v2 client (#4147)

Closes #4146, #4141, #4119, and #4143 --------- Authored-by: frrist <[email protected]>
bacalhau-project · Jul 2, 2024 · 844b276 · 844b276
1 parent 6cd4a5f
commit 844b276
Show file tree

Hide file tree

Showing 50 changed files with 355 additions and 2,788 deletions.
diff --git a/Makefile b/Makefile
@@ -339,7 +339,6 @@ integration-test:
 
 .PHONY: bash-test
 bash-test: 
-	export REQUESTER_ENDPOINT_USE_DEPRECATED_ENV=true
 	${BINARY_PATH}
 	cd test && bin/bashtub *.sh
 

diff --git a/cmd/cli/serve/serve_test.go b/cmd/cli/serve/serve_test.go
@@ -15,7 +15,8 @@ import (
 	"github.com/stretchr/testify/suite"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/bacalhau-project/bacalhau/pkg/publicapi/client"
+	"github.com/bacalhau-project/bacalhau/pkg/models"
+	"github.com/bacalhau-project/bacalhau/pkg/publicapi/apimodels"
 	clientv2 "github.com/bacalhau-project/bacalhau/pkg/publicapi/client/v2"
 	apitest "github.com/bacalhau-project/bacalhau/pkg/publicapi/test"
 
@@ -26,7 +27,6 @@ import (
 	cmd2 "github.com/bacalhau-project/bacalhau/cmd/cli"
 	cfgtypes "github.com/bacalhau-project/bacalhau/pkg/config/types"
 	"github.com/bacalhau-project/bacalhau/pkg/logger"
-	"github.com/bacalhau-project/bacalhau/pkg/model"
 	"github.com/bacalhau-project/bacalhau/pkg/setup"
 	"github.com/bacalhau-project/bacalhau/pkg/system"
 	"github.com/bacalhau-project/bacalhau/pkg/types"
@@ -200,16 +200,28 @@ func (s *ServeSuite) TestCanSubmitJob() {
 	docker.MustHaveDocker(s.T())
 	port, err := s.serve("--node-type", "requester,compute")
 	s.Require().NoError(err)
-	client, err := client.NewAPIClient(client.NoTLS, s.config.User, "localhost", port)
-	s.Require().NoError(err)
-
-	clientV2 := clientv2.New(fmt.Sprintf("http://127.0.0.1:%d", port))
-	s.Require().NoError(apitest.WaitForAlive(s.ctx, clientV2))
-
-	job, err := model.NewJobWithSaneProductionDefaults()
-	s.Require().NoError(err)
 
-	_, err = client.Submit(s.ctx, job)
+	client := clientv2.New(fmt.Sprintf("http://127.0.0.1:%d", port))
+	s.Require().NoError(apitest.WaitForAlive(s.ctx, client))
+
+	job := &models.Job{
+		Name:  s.T().Name(),
+		Type:  models.JobTypeBatch,
+		Count: 1,
+		Tasks: []*models.Task{
+			{
+				Name: s.T().Name(),
+				Engine: &models.SpecConfig{
+					Type:   models.EngineNoop,
+					Params: make(map[string]interface{}),
+				},
+			},
+		},
+	}
+	job.Normalize()
+	_, err = client.Jobs().Put(s.ctx, &apimodels.PutJobRequest{
+		Job: job,
+	})
 	s.NoError(err)
 }
 

diff --git a/cmd/cli/serve/timeout_test.go b/cmd/cli/serve/timeout_test.go
@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/bacalhau-project/bacalhau/pkg/docker"
-	legacy_job "github.com/bacalhau-project/bacalhau/pkg/legacyjob"
 	"github.com/bacalhau-project/bacalhau/pkg/model"
-	"github.com/bacalhau-project/bacalhau/pkg/publicapi/client"
+	"github.com/bacalhau-project/bacalhau/pkg/models"
+	"github.com/bacalhau-project/bacalhau/pkg/publicapi/apimodels"
 	clientv2 "github.com/bacalhau-project/bacalhau/pkg/publicapi/client/v2"
 	apitest "github.com/bacalhau-project/bacalhau/pkg/publicapi/test"
 )
@@ -53,26 +53,44 @@ func (s *ServeSuite) TestNoTimeoutSetOrApplied() {
 
 			port, err := s.serve(args...)
 			s.Require().NoError(err)
-			client, err := client.NewAPIClient(client.NoTLS, s.config.User, "localhost", port)
-			s.Require().NoError(err)
+
 			clientV2 := clientv2.New(fmt.Sprintf("http://127.0.0.1:%d", port))
 			s.Require().NoError(apitest.WaitForAlive(s.ctx, clientV2))
 
-			testJob := model.NewJob()
-			specOpts := []legacy_job.SpecOpt{}
+			testJob := &models.Job{
+				Name:  s.T().Name(),
+				Type:  models.JobTypeBatch,
+				Count: 1,
+				Tasks: []*models.Task{
+					{
+						Name: s.T().Name(),
+						Engine: &models.SpecConfig{
+							Type:   models.EngineNoop,
+							Params: make(map[string]interface{}),
+						},
+						Publisher: &models.SpecConfig{
+							Type:   models.PublisherNoop,
+							Params: make(map[string]interface{}),
+						},
+					},
+				},
+			}
+
 			if tc.timeoutSpecified != nil {
-				specOpts = append(specOpts, legacy_job.WithTimeout(int64(tc.timeoutSpecified.Seconds())))
+				testJob.Task().Timeouts = &models.TimeoutConfig{
+					TotalTimeout: int64(tc.timeoutSpecified.Seconds()),
+				}
 			}
-			testJob.Spec, err = legacy_job.MakeSpec(specOpts...)
-			s.Require().NoError(err)
 
-			returnedJob, err := client.Submit(s.ctx, testJob)
+			putResp, err := clientV2.Jobs().Put(s.ctx, &apimodels.PutJobRequest{
+				Job: testJob,
+			})
 			s.Require().NoError(err)
 
 			s.Eventually(func() bool {
-				jobState, err := client.GetJobState(s.ctx, returnedJob.ID())
+				getResp, err := clientV2.Jobs().Get(s.ctx, &apimodels.GetJobRequest{JobID: putResp.JobID})
 				s.Require().NoError(err)
-				s.Require().Equal(model.JobStateError.String(), jobState.State.String())
+				s.Require().Equal(models.JobStateTypeFailed, getResp.Job.State.StateType)
 				return true
 			}, 5*time.Second, 50*time.Millisecond)
 		})

diff --git a/cmd/cli/version/version.go b/cmd/cli/version/version.go
@@ -25,7 +25,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/bacalhau-project/bacalhau/pkg/config/types"
-	"github.com/bacalhau-project/bacalhau/pkg/publicapi/client"
+	clientv2 "github.com/bacalhau-project/bacalhau/pkg/publicapi/client/v2"
 	"github.com/bacalhau-project/bacalhau/pkg/version"
 
 	"github.com/bacalhau-project/bacalhau/cmd/util"
@@ -59,7 +59,7 @@ func NewCmd() *cobra.Command {
 				return fmt.Errorf("failed to setup repo: %w", err)
 			}
 			// create an api client
-			api, err := util.GetAPIClient(cfg)
+			api, err := util.GetAPIClientV2(cmd, cfg)
 			if err != nil {
 				return fmt.Errorf("failed to create api client: %w", err)
 			}
@@ -72,7 +72,7 @@ func NewCmd() *cobra.Command {
 	return versionCmd
 }
 
-func runVersion(cmd *cobra.Command, cfg types.BacalhauConfig, api *client.APIClient, oV *VersionOptions) error {
+func runVersion(cmd *cobra.Command, cfg types.BacalhauConfig, api clientv2.API, oV *VersionOptions) error {
 	ctx := cmd.Context()
 
 	err := oV.Run(ctx, cmd, cfg, api)
@@ -103,7 +103,7 @@ var updateMessageColumn = output.TableColumn[util.Versions]{
 	Value:        func(v util.Versions) string { return v.UpdateMessage },
 }
 
-func (oV *VersionOptions) Run(ctx context.Context, cmd *cobra.Command, cfg types.BacalhauConfig, api *client.APIClient) error {
+func (oV *VersionOptions) Run(ctx context.Context, cmd *cobra.Command, cfg types.BacalhauConfig, api clientv2.API) error {
 	var (
 		versions util.Versions
 		columns  []output.TableColumn[util.Versions]

diff --git a/cmd/testing/base.go b/cmd/testing/base.go
@@ -22,7 +22,6 @@ import (
 	noop_executor "github.com/bacalhau-project/bacalhau/pkg/executor/noop"
 	"github.com/bacalhau-project/bacalhau/pkg/logger"
 	"github.com/bacalhau-project/bacalhau/pkg/node"
-	"github.com/bacalhau-project/bacalhau/pkg/publicapi/client"
 	clientv2 "github.com/bacalhau-project/bacalhau/pkg/publicapi/client/v2"
 	"github.com/bacalhau-project/bacalhau/pkg/setup"
 	"github.com/bacalhau-project/bacalhau/pkg/test/teststack"
@@ -31,7 +30,6 @@ import (
 type BaseSuite struct {
 	suite.Suite
 	Node            *node.Node
-	Client          *client.APIClient
 	ClientV2        clientv2.API
 	Config          types.BacalhauConfig
 	Host            string
@@ -78,8 +76,6 @@ func (s *BaseSuite) SetupTest() {
 	s.Node = stack.Nodes[0]
 	s.Host = s.Node.APIServer.Address
 	s.Port = s.Node.APIServer.Port
-	s.Client, err = client.NewAPIClient(client.NoTLS, cfg.User, s.Host, s.Port)
-	s.Require().NoError(err)
 	s.ClientV2 = clientv2.New(fmt.Sprintf("http://%s:%d", s.Host, s.Port))
 }
 

diff --git a/cmd/testing/basetls.go b/cmd/testing/basetls.go
@@ -11,7 +11,6 @@ import (
 	noop_executor "github.com/bacalhau-project/bacalhau/pkg/executor/noop"
 	"github.com/bacalhau-project/bacalhau/pkg/logger"
 	"github.com/bacalhau-project/bacalhau/pkg/node"
-	"github.com/bacalhau-project/bacalhau/pkg/publicapi/client"
 	clientv2 "github.com/bacalhau-project/bacalhau/pkg/publicapi/client/v2"
 	"github.com/bacalhau-project/bacalhau/pkg/setup"
 	"github.com/bacalhau-project/bacalhau/pkg/test/teststack"
@@ -69,8 +68,6 @@ func (s *BaseTLSSuite) SetupTest() {
 	s.Node = stack.Nodes[0]
 	s.Host = s.Node.APIServer.Address // NOTE: 0.0.0.0 will not work because we're testing TLS validation
 	s.Port = s.Node.APIServer.Port
-	s.Client, err = client.NewAPIClient(client.LegacyTLSSupport{UseTLS: true, Insecure: false}, cfg.User, s.Host, s.Port)
-	s.Require().NoError(err)
 	s.ClientV2 = clientv2.New(fmt.Sprintf("http://%s:%d", s.Host, s.Port), clientv2.WithTLS(true), clientv2.WithInsecureTLS(true))
 }
 

diff --git a/cmd/util/api.go b/cmd/util/api.go
@@ -11,44 +11,10 @@ import (
 	"github.com/bacalhau-project/bacalhau/cmd/util/auth"
 	"github.com/bacalhau-project/bacalhau/pkg/config/types"
 	"github.com/bacalhau-project/bacalhau/pkg/publicapi/apimodels"
-	"github.com/bacalhau-project/bacalhau/pkg/publicapi/client"
 	clientv2 "github.com/bacalhau-project/bacalhau/pkg/publicapi/client/v2"
 	"github.com/bacalhau-project/bacalhau/pkg/version"
 )
 
-func GetAPIClient(cfg types.BacalhauConfig) (*client.APIClient, error) {
-	tlsCfg := cfg.Node.ClientAPI.ClientTLS
-	apiHost := cfg.Node.ClientAPI.Host
-	apiPort := cfg.Node.ClientAPI.Port
-	tokenPath := cfg.Auth.TokensPath
-
-	if tlsCfg.CACert != "" {
-		if _, err := os.Stat(tlsCfg.CACert); os.IsNotExist(err) {
-			return nil, fmt.Errorf("CA certificate file %q does not exists", tlsCfg.CACert)
-		} else if err != nil {
-			return nil, fmt.Errorf("CA certificate file %q cannot be read: %w", tlsCfg.CACert, err)
-		}
-	}
-
-	apiClient, err := client.NewAPIClient(client.LegacyTLSSupport(tlsCfg), cfg.User, apiHost, uint16(apiPort))
-	if err != nil {
-		return nil, err
-	}
-
-	apiSheme := "http"
-	if tlsCfg.UseTLS {
-		apiSheme = "https"
-	}
-
-	if token, err := ReadToken(tokenPath, fmt.Sprintf("%s://%s:%d", apiSheme, apiHost, apiPort)); err != nil {
-		log.Warn().Err(err).Msg("Failed to read access tokens – API calls will be without authorization")
-	} else if token != nil {
-		apiClient.DefaultHeaders["Authorization"] = token.String()
-	}
-
-	return apiClient, nil
-}
-
 func GetAPIClientV2(cmd *cobra.Command, cfg types.BacalhauConfig) (clientv2.API, error) {
 	tlsCfg := cfg.Node.ClientAPI.ClientTLS
 	apiHost := cfg.Node.ClientAPI.Host

diff --git a/cmd/util/execute.go b/cmd/util/execute.go