@@ -3,7 +3,7 @@ package build
33import (
44 "fmt"
55
6- buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1 "
6+ buildv1beta1 "github.com/shipwright-io/build/pkg/apis/build/v1beta1 "
77 "github.com/spf13/cobra"
88
99 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -18,8 +18,11 @@ import (
1818type CreateCommand struct {
1919 cmd * cobra.Command // cobra command instance
2020
21- name string // build resource's name
22- buildSpec * buildv1alpha1.BuildSpec // stores command-line flags
21+ name string // build resource's name
22+ buildSpec * buildv1beta1.BuildSpec // stores command-line flags
23+ dockerfile * string // For dockerfile parameter
24+ builderImage * string // For builder image parameter
25+
2326}
2427
2528const buildCreateLongDesc = `
@@ -54,7 +57,7 @@ func (c *CreateCommand) Validate() error {
5457
5558// Run executes the creation of a new Build instance using flags to fill up the details.
5659func (c * CreateCommand ) Run (params * params.Params , io * genericclioptions.IOStreams ) error {
57- b := & buildv1alpha1 .Build {
60+ b := & buildv1beta1 .Build {
5861 ObjectMeta : metav1.ObjectMeta {
5962 Name : c .name ,
6063 },
@@ -63,16 +66,44 @@ func (c *CreateCommand) Run(params *params.Params, io *genericclioptions.IOStrea
6366
6467 flags .SanitizeBuildSpec (& b .Spec )
6568
66- // print warning with regards to source bundle image being used
67- if b .Spec .Source .BundleContainer != nil && b .Spec .Source .BundleContainer .Image != "" {
68- fmt .Fprintf (io .Out , "Build %q uses a source bundle image, which means source code will be transferred to a container registry. It is advised to use private images to ensure the security of the source code being uploaded.\n " , c .name )
69+ if b .Spec .Source != nil {
70+ if b .Spec .Source .OCIArtifact != nil && b .Spec .Source .OCIArtifact .Image != "" {
71+ b .Spec .Source .Type = buildv1beta1 .OCIArtifactType
72+ } else if b .Spec .Source .Git != nil && b .Spec .Source .Git .URL != "" {
73+ b .Spec .Source .Type = buildv1beta1 .GitType
74+ }
75+
76+ // print warning with regards to source bundle image being used
77+ if b .Spec .Source .OCIArtifact != nil && b .Spec .Source .OCIArtifact .Image != "" {
78+ fmt .Fprintf (io .Out , "Build %q uses a source bundle image, which means source code will be transferred to a container registry. It is advised to use private images to ensure the security of the source code being uploaded.\n " , c .name )
79+ }
80+ }
81+
82+ if c .dockerfile != nil && * c .dockerfile != "" {
83+ dockerfileParam := buildv1beta1.ParamValue {
84+ Name : "dockerfile" ,
85+ SingleValue : & buildv1beta1.SingleValue {
86+ Value : c .dockerfile ,
87+ },
88+ }
89+ c .buildSpec .ParamValues = append (c .buildSpec .ParamValues , dockerfileParam )
90+ }
91+
92+ if c .builderImage != nil && * c .builderImage != "" {
93+ builderParam := buildv1beta1.ParamValue {
94+ Name : "builder-image" ,
95+ SingleValue : & buildv1beta1.SingleValue {
96+ Value : c .builderImage ,
97+ },
98+ }
99+ c .buildSpec .ParamValues = append (c .buildSpec .ParamValues , builderParam )
69100 }
70101
71102 clientset , err := params .ShipwrightClientSet ()
72103 if err != nil {
73104 return err
74105 }
75- if _ , err := clientset .ShipwrightV1alpha1 ().Builds (params .Namespace ()).Create (c .cmd .Context (), b , metav1.CreateOptions {}); err != nil {
106+ if _ , err := clientset .ShipwrightV1beta1 ().Builds (params .Namespace ()).Create (c .cmd .Context (), b , metav1.CreateOptions {}); err != nil {
76107 return err
77108 }
78109 fmt .Fprintf (io .Out , "Created build %q\n " , c .name )
@@ -89,13 +120,15 @@ func createCmd() runner.SubCommand {
89120
90121 // instantiating command-line flags and the build-spec structure which receives the informed flag
91122 // values, also marking certain flags as mandatory
92- buildSpecFlags := flags .BuildSpecFromFlags (cmd .Flags ())
123+ buildSpecFlags , dockerfileFlag , builderImageFlag := flags .BuildSpecFromFlags (cmd .Flags ())
93124 if err := cmd .MarkFlagRequired (flags .OutputImageFlag ); err != nil {
94125 panic (err )
95126 }
96127
97128 return & CreateCommand {
98- cmd : cmd ,
99- buildSpec : buildSpecFlags ,
129+ cmd : cmd ,
130+ buildSpec : buildSpecFlags ,
131+ dockerfile : dockerfileFlag ,
132+ builderImage : builderImageFlag ,
100133 }
101134}
0 commit comments