feat: root directory support for git (#190)

* feat: in docker config generator support to add codepath has been added

* chore: remove debug statements

* feat: add support for provide codepath

* feat: add support for provide codepath

Author: tanmoysrt

container_manager/image.go

@@ -5,29 +5,30 @@ import (
 	"context"
 	"errors"
 	"os"
+	"strings"
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/archive"
 )
 
-/*
-CreateImage builds a Docker image from a Dockerfile and returns a scanner to read the build logs.
-It takes the Dockerfile content as a string, a map of build arguments, the path to the code directory, and the name of the image to be built.
-It returns a scanner to read the build logs and an error if any.
-*/
-func (m Manager) CreateImage(dockerfile string, buildargs map[string]string, codepath string, imagename string) (*bufio.Scanner, error) {
-	return m.CreateImageWithContext(m.ctx, dockerfile, buildargs, codepath, imagename)
-}
-
 /*
 CreateImageWithContext builds a Docker image from a Dockerfile and returns a scanner to read the build logs.
 It takes the Dockerfile content as a string, a map of build arguments, the path to the code directory, and the name of the image to be built.
 It returns a scanner to read the build logs and an error if any.
 It takes a context.Context as an additional argument.
 */
-func (m Manager) CreateImageWithContext(ctx context.Context, dockerfile string, buildargs map[string]string, codepath string, imagename string) (*bufio.Scanner, error) {
-	// Move the dockerfile to the codepath
-	err := os.WriteFile(codepath+"/Dockerfile", []byte(dockerfile), 0777)
+func (m Manager) CreateImageWithContext(ctx context.Context, dockerfile string, buildargs map[string]string, sourceCodeDirectory string, codePath string, imagename string) (*bufio.Scanner, error) {
+	// add path
+	codePath = strings.TrimSpace(codePath)
+	if codePath != "" && codePath != "/" {
+		sourceCodeDirectory = sourceCodeDirectory + "/" + codePath
+		sourceCodeDirectory = strings.ReplaceAll(sourceCodeDirectory, "\\", "/")
+		sourceCodeDirectory = strings.ReplaceAll(sourceCodeDirectory, "//", "/")
+		sourceCodeDirectory = strings.ReplaceAll(sourceCodeDirectory, "../", "")
+		sourceCodeDirectory = strings.ReplaceAll(sourceCodeDirectory, "./", "")
+	}
+	// Move the dockerfile to the sourceCodeDirectory
+	err := os.WriteFile(sourceCodeDirectory+"/Dockerfile", []byte(dockerfile), 0777)
 	if err != nil {
 		return nil, errors.New("failed to write the dockerfile")
 	}
@@ -40,10 +41,10 @@ func (m Manager) CreateImageWithContext(ctx context.Context, dockerfile string,
 		*ptrValue = string(valueBytes)
 		final_buildargs[key] = ptrValue
 	}
-	// tar the codepath
-	tar, err := archive.TarWithOptions(codepath, &archive.TarOptions{})
+	// tar the sourceCodeDirectory
+	tar, err := archive.TarWithOptions(sourceCodeDirectory, &archive.TarOptions{})
 	if err != nil {
-		return nil, errors.New("failed to tar the codepath")
+		return nil, errors.New("failed to tar the sourceCodeDirectory")
 	}
 	// Build the image
 	response, err := m.client.ImageBuild(ctx, tar, types.ImageBuildOptions{

docker_config_generator/utils.go

@@ -13,7 +13,7 @@ import (
 )
 
 // Generate DockerConfig from git repository.
-func (m Manager) GenerateConfigFromGitRepository(git_url string, branch string, username string, password string) (DockerFileConfig, error) {
+func (m Manager) GenerateConfigFromGitRepository(git_url string, branch string, codePath string, username string, password string) (DockerFileConfig, error) {
 	tmpFolder := "/tmp/" + uuid.New().String()
 	if os.Mkdir(tmpFolder, 0777) != nil {
 		return DockerFileConfig{}, errors.New("failed to create tmp folder")
@@ -25,7 +25,7 @@ func (m Manager) GenerateConfigFromGitRepository(git_url string, branch string,
 		return DockerFileConfig{}, errors.New("failed to clone repository")
 	}
 	// Generate config from source code directory
-	return m.generateConfigFromSourceCodeDirectory(tmpFolder)
+	return m.generateConfigFromSourceCodeDirectory(tmpFolder, codePath)
 }
 
 // Generate DockerConfig from source code .tar file.
@@ -39,11 +39,20 @@ func (m Manager) GenerateConfigFromSourceCodeTar(tarFile string) (DockerFileConf
 		return DockerFileConfig{}, errors.New("failed to extract tar file")
 	}
 	// Generate config from source code directory
-	return m.generateConfigFromSourceCodeDirectory(tmpFolder)
+	return m.generateConfigFromSourceCodeDirectory(tmpFolder, "")
 }
 
 // Generate DockerConfig from source code directory.
-func (m Manager) generateConfigFromSourceCodeDirectory(directory string) (DockerFileConfig, error) {
+func (m Manager) generateConfigFromSourceCodeDirectory(directory string, codePath string) (DockerFileConfig, error) {
+	// add path
+	codePath = strings.TrimSpace(codePath)
+	if codePath != "" && codePath != "/" {
+		directory = directory + "/" + codePath
+		directory = strings.ReplaceAll(directory, "\\", "/")
+		directory = strings.ReplaceAll(directory, "//", "/")
+		directory = strings.ReplaceAll(directory, "../", "")
+		directory = strings.ReplaceAll(directory, "./", "")
+	}
 	// Try to find docker file
 	file, err := os.ReadFile(directory + "/Dockerfile")
 	if err != nil {

swiftwave_service/core/application.operations.go

@@ -172,6 +172,7 @@ func (application *Application) Create(ctx context.Context, db gorm.DB, dockerMa
 		RepositoryName:   application.LatestDeployment.RepositoryName,
 		RepositoryBranch: application.LatestDeployment.RepositoryBranch,
 		CommitHash:       application.LatestDeployment.CommitHash,
+		CodePath:         application.LatestDeployment.CodePath,
 		// Fields for UpstreamType = SourceCode
 		SourceCodeCompressedFileName: application.LatestDeployment.SourceCodeCompressedFileName,
 		// Fields for UpstreamType = Image

swiftwave_service/core/deployment.operations.go

@@ -105,6 +105,7 @@ func (deployment *Deployment) Update(ctx context.Context, db gorm.DB) (*Deployme
 		deployment.RepositoryName != latestDeployment.RepositoryName ||
 		deployment.RepositoryBranch != latestDeployment.RepositoryBranch ||
 		deployment.CommitHash != latestDeployment.CommitHash ||
+		deployment.CodePath != latestDeployment.CodePath ||
 		deployment.SourceCodeCompressedFileName != latestDeployment.SourceCodeCompressedFileName ||
 		deployment.DockerImage != latestDeployment.DockerImage ||
 		deployment.ImageRegistryCredentialID != latestDeployment.ImageRegistryCredentialID ||

swiftwave_service/core/models.go

@@ -132,6 +132,7 @@ type Deployment struct {
 	RepositoryOwner  string      `json:"repositoryOwner"`
 	RepositoryName   string      `json:"repositoryName"`
 	RepositoryBranch string      `json:"repositoryBranch"`
+	CodePath         string      `json:"codePath"`
 	CommitHash       string      `json:"commitHash"`
 	// Fields for UpstreamType = SourceCode
 	SourceCodeCompressedFileName string `json:"sourceCodeCompressedFileName"`

swiftwave_service/graphql/docker_config_generator.resolvers.go

@@ -131,6 +131,7 @@ func applicationInputToDeploymentDatabaseObject(record *model.ApplicationInput)
 		RepositoryName:               DefaultString(record.RepositoryName, ""),
 		RepositoryBranch:             DefaultString(record.RepositoryBranch, ""),
 		CommitHash:                   "",
+		CodePath:                     DefaultString(record.CodePath, ""),
 		SourceCodeCompressedFileName: DefaultString(record.SourceCodeCompressedFileName, ""),
 		DockerImage:                  DefaultString(record.DockerImage, ""),
 		ImageRegistryCredentialID:    record.ImageRegistryCredentialID,
@@ -195,6 +196,7 @@ func deploymentToGraphqlObject(record *core.Deployment) *model.Deployment {
 		RepositoryName:               record.RepositoryName,
 		RepositoryBranch:             record.RepositoryBranch,
 		CommitHash:                   record.CommitHash,
+		CodePath:                     record.CodePath,
 		SourceCodeCompressedFileName: record.SourceCodeCompressedFileName,
 		DockerImage:                  record.DockerImage,
 		ImageRegistryCredentialID:    imageRegistryCredentialId,

swiftwave_service/graphql/generated.go

@@ -39,6 +39,7 @@ input ApplicationInput {
     repositoryOwner: String
     repositoryName: String
     repositoryBranch: String
+    codePath: String
     # required for upstreamType = "SourceCode"
     sourceCodeCompressedFileName: String
     # required for upstreamType = "Image"