feat(v2): remove deprecated --skip-build option

Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
werf · Apr 24, 2024 · 14d1c72 · 14d1c72
1 parent ded7731
commit 14d1c72
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 22 deletions.
diff --git a/cmd/werf/bundle/publish/publish.go b/cmd/werf/bundle/publish/publish.go
@@ -135,7 +135,6 @@ func NewCmd(ctx context.Context) *cobra.Command {
 	common.SetupAllowedLocalCacheVolumeUsageMargin(&commonCmdData, cmd)
 	common.SetupDockerServerStoragePath(&commonCmdData, cmd)
 
-	common.SetupSkipBuild(&commonCmdData, cmd)
 	common.SetupRequireBuiltImages(&commonCmdData, cmd)
 	commonCmdData.SetupPlatform(cmd)
 

diff --git a/cmd/werf/common/cmd_data.go b/cmd/werf/common/cmd_data.go
@@ -55,7 +55,6 @@ type CmdData struct {
 	SecondaryStagesStorage *[]string
 	CacheStagesStorage     *[]string
 
-	SkipBuild          *bool
 	RequireBuiltImages *bool
 	StubTags           *bool
 

diff --git a/cmd/werf/common/common.go b/cmd/werf/common/common.go
@@ -873,14 +873,6 @@ IMAGE_NAME is the name of an image or artifact described in werf.yaml, the namel
 STAGE_NAME should be one of the following: `+strings.Join(allStagesNames(), ", "))
 }
 
-// SetupSkipBuild
-// Deprecated. See [SetupRequireBuiltImages].
-func SetupSkipBuild(cmdData *CmdData, cmd *cobra.Command) {
-	cmdData.SkipBuild = new(bool)
-	cmd.Flags().BoolVarP(cmdData.SkipBuild, "skip-build", "", util.GetBoolEnvironmentDefaultFalse("WERF_SKIP_BUILD"), "DEPRECATED: use --require-built-images.")
-	_ = cmd.Flags().MarkHidden("skip-build")
-}
-
 // SetupRequireBuiltImages adds --require-built-images flag.
 // See also [quireBuiltImages].
 func SetupRequireBuiltImages(cmdData *CmdData, cmd *cobra.Command) {
@@ -1271,11 +1263,7 @@ func GetRequireBuiltImages(ctx context.Context, cmdData *CmdData) bool {
 	if cmdData.RequireBuiltImages != nil && *cmdData.RequireBuiltImages {
 		return true
 	}
-	// Support for deprecated option.
-	if cmdData.SkipBuild != nil && *cmdData.SkipBuild {
-		logboek.Context(ctx).Warn().LogF("DEPRECATED: use --require-built-images ($WERF_REQUIRE_BUILT_IMAGES) instead of --skip-build\n")
-		return true
-	}
+
 	return false
 }
 

diff --git a/cmd/werf/compose/main.go b/cmd/werf/compose/main.go
@@ -193,7 +193,6 @@ func newCmd(ctx context.Context, composeCmdName string, options *newCmdOptions)
 	common.SetupRepoOptions(&commonCmdData, cmd, common.RepoDataOptions{OptionalRepo: true})
 	common.SetupFinalRepo(&commonCmdData, cmd)
 
-	common.SetupSkipBuild(&commonCmdData, cmd)
 	common.SetupRequireBuiltImages(&commonCmdData, cmd)
 
 	if options.FollowSupport {

diff --git a/cmd/werf/converge/converge.go b/cmd/werf/converge/converge.go
@@ -190,7 +190,6 @@ werf converge --repo registry.mydomain.com/web --env production`,
 	common.SetupVirtualMerge(&commonCmdData, cmd)
 
 	common.SetupParallelOptions(&commonCmdData, cmd, common.DefaultBuildParallelTasksLimit)
-	common.SetupSkipBuild(&commonCmdData, cmd)
 	common.SetupRequireBuiltImages(&commonCmdData, cmd)
 	commonCmdData.SetupPlatform(cmd)
 	common.SetupFollow(&commonCmdData, cmd)

diff --git a/cmd/werf/export/export.go b/cmd/werf/export/export.go
@@ -104,7 +104,6 @@ func NewExportCmd(ctx context.Context) *cobra.Command {
 	common.SetupRepoOptions(&commonCmdData, cmd, common.RepoDataOptions{OptionalRepo: true})
 	common.SetupFinalRepo(&commonCmdData, cmd)
 
-	common.SetupSkipBuild(&commonCmdData, cmd)
 	common.SetupRequireBuiltImages(&commonCmdData, cmd)
 
 	common.SetupDockerConfig(&commonCmdData, cmd, "Command needs granted permissions to read and pull images from the specified repo")

diff --git a/cmd/werf/kube_run/kube_run.go b/cmd/werf/kube_run/kube_run.go
@@ -171,7 +171,6 @@ func NewCmd(ctx context.Context) *cobra.Command {
 	common.SetupRepoOptions(&commonCmdData, cmd, common.RepoDataOptions{})
 	common.SetupFinalRepo(&commonCmdData, cmd)
 
-	common.SetupSkipBuild(&commonCmdData, cmd)
 	common.SetupRequireBuiltImages(&commonCmdData, cmd)
 
 	common.SetupFollow(&commonCmdData, cmd)

diff --git a/cmd/werf/plan/plan.go b/cmd/werf/plan/plan.go
@@ -177,7 +177,6 @@ werf plan --repo registry.mydomain.com/web --env production`,
 	common.SetupVirtualMerge(&commonCmdData, cmd)
 
 	common.SetupParallelOptions(&commonCmdData, cmd, common.DefaultBuildParallelTasksLimit)
-	common.SetupSkipBuild(&commonCmdData, cmd)
 	common.SetupRequireBuiltImages(&commonCmdData, cmd)
 	commonCmdData.SetupPlatform(cmd)
 	common.SetupFollow(&commonCmdData, cmd)

diff --git a/cmd/werf/render/render.go b/cmd/werf/render/render.go
@@ -162,7 +162,6 @@ func NewCmd(ctx context.Context) *cobra.Command {
 
 	common.SetupParallelOptions(&commonCmdData, cmd, common.DefaultBuildParallelTasksLimit)
 
-	common.SetupSkipBuild(&commonCmdData, cmd)
 	common.SetupRequireBuiltImages(&commonCmdData, cmd)
 	commonCmdData.SetupPlatform(cmd)
 

diff --git a/cmd/werf/run/run.go b/cmd/werf/run/run.go
@@ -139,7 +139,6 @@ func NewCmd(ctx context.Context) *cobra.Command {
 	common.SetupRepoOptions(&commonCmdData, cmd, common.RepoDataOptions{OptionalRepo: true})
 	common.SetupFinalRepo(&commonCmdData, cmd)
 
-	common.SetupSkipBuild(&commonCmdData, cmd)
 	common.SetupRequireBuiltImages(&commonCmdData, cmd)
 
 	common.SetupFollow(&commonCmdData, cmd)