Skip to content

Ci Build config API backward compatibilty #2598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 9, 2022
Merged

Ci Build config API backward compatibilty #2598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fa633a
docker build config added as backward compatible changes
kripanshdevtron Nov 8, 2022
2da7f01
dependency injection fix
kripanshdevtron Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions api/appbean/AppDetail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,19 @@ type GitMaterial struct {
}

type DockerConfig struct {
DockerRegistry string `json:"dockerRegistry" validate:"required"`
DockerRepository string `json:"dockerRepository" validate:"required"`
CiBuildConfig *bean.CiBuildConfigBean `json:"ciBuildConfig" validate:"required"`
CheckoutPath string `json:"checkoutPath"`
DockerRegistry string `json:"dockerRegistry" validate:"required"`
DockerRepository string `json:"dockerRepository" validate:"required"`
CiBuildConfig *bean.CiBuildConfigBean `json:"ciBuildConfig"`
DockerBuildConfig *DockerBuildConfig `json:"dockerBuildConfig,omitempty"` // Deprecated, should use CiBuildConfig for development
CheckoutPath string `json:"checkoutPath"`
}

type DockerBuildConfig struct {
GitCheckoutPath string `json:"gitCheckoutPath,omitempty" validate:"required"`
DockerfileRelativePath string `json:"dockerfileRelativePath,omitempty" validate:"required"`
Args map[string]string `json:"args,omitempty"`
TargetPlatform string `json:"targetPlatform"`
DockerBuildOptions map[string]string `json:"dockerBuildOptions,omitempty"`
}

type DeploymentTemplate struct {
Expand Down
14 changes: 13 additions & 1 deletion api/restHandler/CoreAppRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (
chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
repository2 "github.com/devtron-labs/devtron/pkg/cluster/repository"
"github.com/devtron-labs/devtron/pkg/pipeline"
bean2 "github.com/devtron-labs/devtron/pkg/pipeline/bean"
"github.com/devtron-labs/devtron/pkg/sql"
"github.com/devtron-labs/devtron/pkg/team"
"github.com/devtron-labs/devtron/pkg/user"
Expand Down Expand Up @@ -1244,7 +1245,18 @@ func (handler CoreAppRestHandlerImpl) createGitMaterials(appId int, gitMaterials
// create docker config
func (handler CoreAppRestHandlerImpl) createDockerConfig(appId int, dockerConfig *appBean.DockerConfig, userId int32) (error, int) {
handler.logger.Infow("Create App - creating docker config", "appId", appId, "DockerConfig", dockerConfig)

dockerBuildConfig := dockerConfig.DockerBuildConfig
if dockerBuildConfig != nil {
dockerConfig.CheckoutPath = dockerBuildConfig.GitCheckoutPath
dockerConfig.CiBuildConfig = &bean2.CiBuildConfigBean{
DockerBuildConfig: &bean2.DockerBuildConfig{
DockerfilePath: dockerBuildConfig.DockerfileRelativePath,
DockerBuildOptions: dockerBuildConfig.DockerBuildOptions,
Args: dockerBuildConfig.Args,
TargetPlatform: dockerBuildConfig.TargetPlatform,
},
}
}
createDockerConfigRequest := &bean.CiConfigRequest{
AppId: appId,
UserId: userId,
Expand Down
2 changes: 1 addition & 1 deletion wire_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.