Refactor code due to Shipwright changes

Modify to use the new field names.
gabemontero · Apr 3, 2021 · 4b40a50 · 4b40a50
1 parent 5c67f0c
commit 4b40a50
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/pkg/shp/cmd/build/create.go b/pkg/shp/cmd/build/create.go
@@ -65,19 +65,19 @@ func (c *CreateCommand) initializeBuild() {
  Name: c.name,
  },
  Spec: buildv1alpha1.BuildSpec{
- StrategyRef: &buildv1alpha1.StrategyRef{
+ Strategy: &buildv1alpha1.Strategy{
  Name: c.strategy,
  Kind: &strategyKind,
  },
- Source: buildv1alpha1.GitSource{
+ Source: buildv1alpha1.Source{
  URL: c.url,
  },
  },
  }
 
  if c.image != "" {
  c.build.Spec.Output = buildv1alpha1.Image{
- ImageURL: c.image,
+ Image: c.image,
  }
  }
 }

diff --git a/pkg/shp/cmd/build/list.go b/pkg/shp/cmd/build/list.go
@@ -67,7 +67,7 @@ func (c *ListCommand) Run(params *params.Params) error {
  }
 
  for _, b := range buildList.Items {
- fmt.Fprintf(writer, columnTemplate, b.Name, b.Spec.Output.ImageURL, b.Status.Message)
+ fmt.Fprintf(writer, columnTemplate, b.Name, b.Spec.Output.Image, b.Status.Message)
  }
 
  writer.Flush()

diff --git a/pkg/shp/flags/build_run.go b/pkg/shp/flags/build_run.go
@@ -18,7 +18,7 @@ func BuildRunSpecFlags(flags *pflag.FlagSet) *buildv1alpha1.BuildRunSpec {
  ServiceAccount: &buildv1alpha1.ServiceAccount{Name: &empty},
  Timeout: &metav1.Duration{},
  Output: &buildv1alpha1.Image{
- SecretRef: &corev1.LocalObjectReference{},
+ Credentials: &corev1.LocalObjectReference{},
  },
  }
 
@@ -75,12 +75,12 @@ func timeoutFlags(flags *pflag.FlagSet, timeout *metav1.Duration) {
 // serviceAccountFlags register flags for BuildRun's spec.output attribute.
 func outputFlags(flags *pflag.FlagSet, output *buildv1alpha1.Image) {
  flags.StringVar(
- &output.ImageURL,
+ &output.Image,
  "output-image",
  "",
  "output image URL",
  )
- secretRefFlags(flags, output.SecretRef)
+ secretRefFlags(flags, output.Credentials)
 }
 
 // serviceAccountFlags register flags for BuildRun's spec.output.credentials attribute.

diff --git a/test/stub/stub.go b/test/stub/stub.go
@@ -20,15 +20,15 @@ func TestBuild(name, image, source string) *buildv1alpha1.Build {
  Name: name,
  },
  Spec: buildv1alpha1.BuildSpec{
- StrategyRef: &buildv1alpha1.StrategyRef{
+ Strategy: &buildv1alpha1.Strategy{
  Name: "buildah",
  Kind: &strategyKind,
  },
- Source: buildv1alpha1.GitSource{
+ Source: buildv1alpha1.Source{
  URL: source,
  },
  Output: buildv1alpha1.Image{
- ImageURL: image,
+ Image: image,
  },
  },
  }