++ add accessor to support deprecated option

Signed-off-by: Ivan Mikheykin <ivan.mikheykin@flant.com>

cmd/werf/bundle/export/export.go

@@ -297,7 +297,7 @@ func runExport(ctx context.Context, imagesToProcess build.ImagesToProcess) error
 		defer conveyorWithRetry.Terminate()
 
 		if err := conveyorWithRetry.WithRetryBlock(ctx, func(c *build.Conveyor) error {
-			if *commonCmdData.RequireBuildImages {
+			if common.GetRequireBuiltImages(&commonCmdData) {
 				shouldBeBuiltOptions, err := common.GetShouldBeBuiltOptions(&commonCmdData, giterminismManager, werfConfig)
 				if err != nil {
 					return err

cmd/werf/bundle/publish/publish.go

@@ -303,7 +303,7 @@ func runPublish(ctx context.Context, imagesToProcess build.ImagesToProcess) erro
 		defer conveyorWithRetry.Terminate()
 
 		if err := conveyorWithRetry.WithRetryBlock(ctx, func(c *build.Conveyor) error {
-			if *commonCmdData.RequireBuildImages {
+			if common.GetRequireBuiltImages(&commonCmdData) {
 				shouldBeBuiltOptions, err := common.GetShouldBeBuiltOptions(&commonCmdData, giterminismManager, werfConfig)
 				if err != nil {
 					return err

cmd/werf/common/cmd_data.go

@@ -55,7 +55,7 @@ type CmdData struct {
 	CacheStagesStorage     *[]string
 
 	SkipBuild          *bool
-	RequireBuildImages *bool
+	RequireBuiltImages *bool
 	StubTags           *bool
 
 	AddCustomTag *[]string

cmd/werf/common/common.go

@@ -808,8 +808,8 @@ func SetupSkipBuild(cmdData *CmdData, cmd *cobra.Command) {
 }
 
 func SetupRequireBuiltImages(cmdData *CmdData, cmd *cobra.Command) {
-	cmdData.RequireBuildImages = new(bool)
-	cmd.Flags().BoolVarP(cmdData.RequireBuildImages, "require-built-images", "Z", util.GetBoolEnvironmentDefaultFalse("WERF_REQUIRE_BUILT_IMAGES"), "Requires all used images to be previously built and exist in repo. Exits with error if needed images are not cached and so require to run build instructions (default $WERF_REQUIRE_BUILT_IMAGES)")
+	cmdData.RequireBuiltImages = new(bool)
+	cmd.Flags().BoolVarP(cmdData.RequireBuiltImages, "require-built-images", "Z", util.GetBoolEnvironmentDefaultFalse("WERF_REQUIRE_BUILT_IMAGES"), "Requires all used images to be previously built and exist in repo. Exits with error if needed images are not cached and so require to run build instructions (default $WERF_REQUIRE_BUILT_IMAGES)")
 }
 
 func SetupStubTags(cmdData *CmdData, cmd *cobra.Command) {
@@ -1173,6 +1173,19 @@ func GetOptionalRelease(cmdData *CmdData) string {
 	return *cmdData.Release
 }
 
+// GetRequireBuiltImages returns true if --require-built-images is set or --skip-build is set.
+// There is no way to determine if both options are used, so no warning.
+func GetRequireBuiltImages(cmdData *CmdData) bool {
+	if cmdData.RequireBuiltImages != nil && *cmdData.RequireBuiltImages {
+		return true
+	}
+	// Support for deprecated option.
+	if cmdData.SkipBuild != nil && *cmdData.SkipBuild {
+		return true
+	}
+	return false
+}
+
 func GetIntrospectOptions(cmdData *CmdData, werfConfig *config.WerfConfig) (build.IntrospectOptions, error) {
 	isStageExist := func(sName string) bool {
 		for _, stageName := range allStagesNames() {

cmd/werf/compose/main.go

@@ -409,7 +409,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
 			defer conveyorWithRetry.Terminate()
 
 			if err := conveyorWithRetry.WithRetryBlock(ctx, func(c *build.Conveyor) error {
-				if *commonCmdData.RequireBuildImages {
+				if common.GetRequireBuiltImages(&commonCmdData) {
 					if err := c.ShouldBeBuilt(ctx, build.ShouldBeBuiltOptions{}); err != nil {
 						return err
 					}

cmd/werf/converge/converge.go

@@ -345,7 +345,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
 		defer conveyorWithRetry.Terminate()
 
 		if err := conveyorWithRetry.WithRetryBlock(ctx, func(c *build.Conveyor) error {
-			if *commonCmdData.RequireBuildImages {
+			if common.GetRequireBuiltImages(&commonCmdData) {
 				shouldBeBuiltOptions, err := common.GetShouldBeBuiltOptions(&commonCmdData, giterminismManager, werfConfig)
 				if err != nil {
 					return err

cmd/werf/export/export.go

@@ -266,7 +266,7 @@ func run(ctx context.Context, imagesToProcess build.ImagesToProcess, tagTemplate
 		return c.Export(ctx, build.ExportOptions{
 			BuildPhaseOptions: build.BuildPhaseOptions{
 				BuildOptions:      build.BuildOptions{SkipImageMetadataPublication: *commonCmdData.Dev},
-				ShouldBeBuiltMode: *commonCmdData.RequireBuildImages,
+				ShouldBeBuiltMode: common.GetRequireBuiltImages(&commonCmdData),
 			},
 			ExportPhaseOptions: build.ExportPhaseOptions{
 				ExportImageNameList: imageNameList,

cmd/werf/kube_run/kube_run.go

@@ -407,7 +407,7 @@ func run(ctx context.Context, pod, secret, namespace string, werfConfig *config.
 
 	var image string
 	if err := conveyorWithRetry.WithRetryBlock(ctx, func(c *build.Conveyor) error {
-		if *commonCmdData.RequireBuildImages {
+		if common.GetRequireBuiltImages(&commonCmdData) {
 			if err := c.ShouldBeBuilt(ctx, build.ShouldBeBuiltOptions{}); err != nil {
 				return err
 			}

cmd/werf/render/render.go

@@ -322,7 +322,7 @@ func runRender(ctx context.Context, imagesToProcess build.ImagesToProcess) error
 
 			if err := conveyorWithRetry.WithRetryBlock(ctx, func(c *build.Conveyor) error {
 				buildFunc := func(ctx context.Context) error {
-					if *commonCmdData.RequireBuildImages {
+					if common.GetRequireBuiltImages(&commonCmdData) {
 						shouldBeBuiltOptions, err := common.GetShouldBeBuiltOptions(&commonCmdData, giterminismManager, werfConfig)
 						if err != nil {
 							return err

cmd/werf/run/run.go

@@ -393,7 +393,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
 
 	var dockerImageName string
 	if err := conveyorWithRetry.WithRetryBlock(ctx, func(c *build.Conveyor) error {
-		if *commonCmdData.RequireBuildImages {
+		if common.GetRequireBuiltImages(&commonCmdData) {
 			if err := c.ShouldBeBuilt(ctx, build.ShouldBeBuiltOptions{}); err != nil {
 				return err
 			}