Fix API changes

Fix code sections that required update due to API changes with the recent release of Shipwright Build.
elephant-graveyard · Jun 1, 2022 · 6ebda65 · 6ebda65
1 parent bcaf314
commit 6ebda65
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/internal/load/build.go b/internal/load/build.go
@@ -28,11 +28,11 @@ import (
 )
 
 func buildError(build buildv1alpha1.Build) error {
-	if build.Status.Registered == corev1.ConditionTrue {
+	if build.Status.Registered != nil && *build.Status.Registered == corev1.ConditionTrue {
 		return nil
 	}
 
-	return fmt.Errorf("build failed to register. Reason=%s. Message=%s", build.Status.Reason, build.Status.Message)
+	return fmt.Errorf("build failed to register. Reason=%v. Message=%v", build.Status.Reason, build.Status.Message)
 }
 
 func registerSingleBuild(kubeAccess KubeAccess, namespace string, name string, buildSpec buildv1alpha1.BuildSpec, buildAnnotations map[string]string, options ...BuildRunOption) (*Result, error) {
@@ -102,7 +102,11 @@ func waitForBuildRegistered(kubeAccess KubeAccess, build *buildv1alpha1.Build) (
 			return false, err
 		}
 
-		switch build.Status.Registered {
+		if build.Status.Registered == nil {
+			return false, nil
+		}
+
+		switch *build.Status.Registered {
 		case corev1.ConditionTrue:
 			return true, nil
 

diff --git a/internal/load/kubeops.go b/internal/load/kubeops.go
@@ -29,6 +29,7 @@ import (
 	pipelinev1alpha1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/pointer"
 
 	"github.com/gonvenience/bunt"
 	"github.com/gonvenience/neat"
@@ -83,7 +84,7 @@ func newBuildRun(name string, build buildv1alpha1.Build, serviceAccountName stri
 			ServiceAccount: func() *buildv1alpha1.ServiceAccount {
 				if serviceAccountName == "generated" {
 					return &buildv1alpha1.ServiceAccount{
-						Generate: true,
+						Generate: pointer.Bool(true),
 					}
 				}
 

diff --git a/internal/load/models.go b/internal/load/models.go
@@ -212,15 +212,15 @@ func createBuildSpec(name string, buildCfg BuildConfig) (*buildv1alpha.BuildSpec
 	}
 
 	return &buildv1alpha.BuildSpec{
-		Strategy: &buildv1alpha.Strategy{
+		Strategy: buildv1alpha.Strategy{
 			Name: buildCfg.ClusterBuildStrategy,
 			Kind: strategyRefKind(buildv1alpha.ClusterBuildStrategyKind),
 		},
 
 		Source: buildv1alpha.Source{
-			URL:         buildCfg.SourceURL,
-			Revision:    pointer.StringPtr(buildCfg.SourceRevision),
-			ContextDir:  pointer.StringPtr(buildCfg.SourceContextDir),
+			URL:         pointer.String(buildCfg.SourceURL),
+			Revision:    pointer.String(buildCfg.SourceRevision),
+			ContextDir:  pointer.String(buildCfg.SourceContextDir),
 			Credentials: secrefRef(buildCfg.SourceSecretRef),
 		},