Merge pull request #38 from tsuru/job-build

feat: add job build image capability
tsuru · Nov 8, 2023 · fa68d88 · fa68d88
2 parents 3dccc1c + 070afa0
commit fa68d88
Show file tree

Hide file tree

Showing 7 changed files with 285 additions and 118 deletions.
diff --git a/pkg/build/buildkit/build.go b/pkg/build/buildkit/build.go
@@ -116,6 +116,9 @@ func (b *BuildKit) Build(ctx context.Context, r *pb.BuildRequest, w io.Writer) (
 	case "BUILD_KIND_APP_BUILD_WITH_CONTAINER_IMAGE":
 		return b.buildFromContainerImage(ctx, c, r, ow)
 
+	case "BUILD_KIND_JOB_CREATE_WITH_CONTAINER_IMAGE":
+		return b.buildFromContainerImage(ctx, c, r, ow)
+
 	case "BUILD_KIND_APP_BUILD_WITH_CONTAINER_FILE":
 		return b.buildFromContainerFile(ctx, c, r, ow)
 
@@ -418,6 +421,11 @@ func callBuildKitBuild(ctx context.Context, c *client.Client, buildContextDir st
 			ID:       "tsuru-app-envvars",
 			FilePath: filepath.Join(buildContextDir, "secrets", "envs.sh"),
 		})
+	} else if r.Job != nil {
+		secretSources = append(secretSources, secretsprovider.Source{
+			ID:       "tsuru-job-envvars",
+			FilePath: filepath.Join(buildContextDir, "secrets", "envs.sh"),
+		})
 	}
 
 	secrets, err := secretsprovider.NewStore(secretSources)

diff --git a/pkg/build/buildkit/build_test.go b/pkg/build/buildkit/build_test.go
@@ -375,6 +375,30 @@ func TestBuildKit_Build_FromContainerImages(t *testing.T) {
 			},
 		}, appFiles)
 	})
+
+	t.Run("container image without Tsuru app files (tsuru.yaml, Procfile) + job image push", func(t *testing.T) {
+		req := &pb.BuildRequest{
+			Kind: pb.BuildKind_BUILD_KIND_JOB_CREATE_WITH_CONTAINER_IMAGE,
+			Job: &pb.TsuruJob{
+				Name: "my-job",
+			},
+			SourceImage:       "nginx:1.22-alpine",
+			DestinationImages: []string{baseRegistry(t, "job-my-job", "")},
+			PushOptions:       &pb.PushOptions{InsecureRegistry: registryHTTP},
+		}
+
+		appFiles, err := NewBuildKit(bc, BuildKitOptions{TempDir: t.TempDir()}).
+			Build(context.TODO(), req, os.Stdout)
+
+		require.NoError(t, err)
+		assert.Equal(t, &pb.TsuruConfig{
+			ImageConfig: &pb.ContainerImageConfig{
+				Entrypoint:   []string{"/docker-entrypoint.sh"},
+				Cmd:          []string{"nginx", "-g", "daemon off;"},
+				ExposedPorts: []string{"80/tcp"},
+			},
+		}, appFiles)
+	})
 }
 
 func TestBuildKit_Build_FromContainerFile(t *testing.T) {

diff --git a/pkg/build/grpc_build_v1/build_service.pb.go b/pkg/build/grpc_build_v1/build_service.pb.go
diff --git a/pkg/build/grpc_build_v1/build_service.proto b/pkg/build/grpc_build_v1/build_service.proto
@@ -50,6 +50,11 @@ message BuildRequest {
 
   // PushOptions contains the options push the generated images.
   PushOptions push_options = 10;
+
+  // Job is the Tsuru job which is being deployed, if any.
+  //
+  // NOTE: mandatory field when build kind starts with BUILD_KIND_JOB_.
+  TsuruJob job = 11;
 }
 
 enum BuildKind {
@@ -65,6 +70,8 @@ enum BuildKind {
 
   BUILD_KIND_PLATFORM_WITH_CONTAINER_IMAGE   = 5; // tsuru platform add/update ... -i registry.example.com/tsuru/python:latest
   BUILD_KIND_PLATFORM_WITH_CONTAINER_FILE    = 6; // tsuru platform add/update ... --dockerfile Dockerfile
+
+  BUILD_KIND_JOB_CREATE_WITH_CONTAINER_IMAGE = 7; // tsuru job create ... -i registry.example.com/tsuru/my-job:latest
 }
 
 message BuildResponse {
@@ -83,6 +90,13 @@ message TsuruApp {
   map<string, string> env_vars = 3;
 }
 
+message TsuruJob {
+  // Name is the Tsuru job name.
+  string name = 1;
+  // EnvVars are the enviroment variables set on the job.
+  map<string, string> env_vars = 3;
+}
+
 message TsuruPlatform {
   // Name is the Tsuru platform name.
   string name = 1;

diff --git a/pkg/build/grpc_build_v1/build_service_grpc.pb.go b/pkg/build/grpc_build_v1/build_service_grpc.pb.go
diff --git a/pkg/build/server.go b/pkg/build/server.go
@@ -85,6 +85,10 @@ func validateBuildRequest(r *pb.BuildRequest) error {
 		return status.Error(codes.InvalidArgument, "app cannot be nil")
 	}
 
+	if strings.HasPrefix(kind, "BUILD_KIND_JOB_") && r.Job == nil {
+		return status.Error(codes.InvalidArgument, "job cannot be nil")
+	}
+
 	if strings.HasPrefix(kind, "BUILD_KIND_PLATFORM_") && r.Platform == nil {
 		return status.Error(codes.InvalidArgument, "platform cannot be nil")
 	}

diff --git a/pkg/build/server_test.go b/pkg/build/server_test.go
@@ -114,6 +114,20 @@ func TestBuild(t *testing.T) {
 			},
 		},
 
+		"missing job, when kind is from job": {
+			req: &pb.BuildRequest{
+				SourceImage:       "tsuru/scratch:latest",
+				DestinationImages: []string{"registry.example.com/tsuru/app-my-app:v1"},
+				Kind:              pb.BuildKind_BUILD_KIND_JOB_CREATE_WITH_CONTAINER_IMAGE,
+			},
+			assert: func(t *testing.T, stream pb.Build_BuildClient, err error) {
+				require.NoError(t, err)
+				require.NotNil(t, stream)
+				_, _, err = readResponse(t, stream)
+				assert.EqualError(t, err, status.Error(codes.InvalidArgument, "job cannot be nil").Error())
+			},
+		},
+
 		"deploy from source code, empty source image": {
 			req: &pb.BuildRequest{
 				DestinationImages: []string{"registry.example.com/tsuru/app-my-app:v1"},