Merge pull request #1441 from SaschaSchwarze0/sascha-build-spec-sourc…

…e-git-url-required

Make Build.spec.source.git.url required

deploy/crds/shipwright.io_buildruns.yaml

@@ -6703,6 +6703,8 @@ spec:
                               url:
                                 description: URL describes the URL of the Git repository.
                                 type: string
+                            required:
+                            - url
                             type: object
                           local:
                             description: LocalSource
@@ -10695,6 +10697,8 @@ spec:
                           url:
                             description: URL describes the URL of the Git repository.
                             type: string
+                        required:
+                        - url
                         type: object
                       local:
                         description: LocalSource

deploy/crds/shipwright.io_builds.yaml

@@ -2478,6 +2478,8 @@ spec:
                       url:
                         description: URL describes the URL of the Git repository.
                         type: string
+                    required:
+                    - url
                     type: object
                   local:
                     description: LocalSource

pkg/apis/build/v1beta1/build_conversion.go

@@ -126,10 +126,10 @@ func (dest *BuildSpec) ConvertFrom(orig *v1alpha1.BuildSpec) error {
 			if orig.Source.Credentials != nil {
 				specSource.OCIArtifact.PullSecret = &orig.Source.Credentials.Name
 			}
-		} else {
+		} else if orig.Source.URL != nil {
 			specSource.Type = GitType
 			specSource.GitSource = &Git{
-				URL:      orig.Source.URL,
+				URL:      *orig.Source.URL,
 				Revision: orig.Source.Revision,
 			}
 			if orig.Source.Credentials != nil {
@@ -434,7 +434,7 @@ func getAlphaBuildSource(src BuildSpec) v1alpha1.Source {
 			}
 		}
 		if src.Source.GitSource != nil {
-			source.URL = src.Source.GitSource.URL
+			source.URL = &src.Source.GitSource.URL
 			revision = src.Source.GitSource.Revision
 		}
 

pkg/apis/build/v1beta1/source.go

@@ -44,9 +44,7 @@ type Local struct {
 // Git describes the git repository to pull
 type Git struct {
 	// URL describes the URL of the Git repository.
-	//
-	// +optional
-	URL *string `json:"url,omitempty"`
+	URL string `json:"url"`
 
 	// Revision describes the Git revision (e.g., branch, tag, commit SHA,
 	// etc.) to fetch.

pkg/webhook/conversion/converter_test.go

@@ -732,7 +732,7 @@ request:
 						Type:       v1beta1.GitType,
 						ContextDir: &ctxDir,
 						GitSource: &v1beta1.Git{
-							URL:         &url,
+							URL:         url,
 							Revision:    &revision,
 							CloneSecret: &secretName,
 						},

test/e2e/v1beta1/common_suite_test.go

@@ -79,7 +79,7 @@ func (b *buildPrototype) SourceGit(repository string) *buildPrototype {
 	if b.build.Spec.Source.GitSource == nil {
 		b.build.Spec.Source.GitSource = &buildv1beta1.Git{}
 	}
-	b.build.Spec.Source.GitSource.URL = pointer.String(repository)
+	b.build.Spec.Source.GitSource.URL = repository
 	b.build.Spec.Source.OCIArtifact = nil
 	return b
 }

test/e2e/v1beta1/common_test.go

@@ -111,7 +111,7 @@ func amendSourceURL(b *buildv1beta1.Build, sourceURL string) {
 	if sourceURL == "" {
 		return
 	}
-	b.Spec.Source.GitSource.URL = &sourceURL
+	b.Spec.Source.GitSource.URL = sourceURL
 }
 
 // amendBuild make changes on build object.

test/v1beta1_samples/catalog.go

@@ -100,8 +100,9 @@ func (c *Catalog) BuildWithClusterBuildStrategyAndFalseSourceAnnotation(name str
 		Spec: build.BuildSpec{
 			Source: build.Source{
 				GitSource: &build.Git{
-					URL: pointer.String("foobar"),
+					URL: "foobar",
 				},
+				Type: build.GitType,
 			},
 			Strategy: build.Strategy{
 				Name: strategyName,
@@ -125,8 +126,9 @@ func (c *Catalog) BuildWithClusterBuildStrategy(name string, ns string, strategy
 		Spec: build.BuildSpec{
 			Source: build.Source{
 				GitSource: &build.Git{
-					URL: pointer.String("https://github.com/shipwright-io/sample-go"),
+					URL: "https://github.com/shipwright-io/sample-go",
 				},
+				Type: build.GitType,
 			},
 			Strategy: build.Strategy{
 				Name: strategyName,
@@ -152,9 +154,10 @@ func (c *Catalog) BuildWithClusterBuildStrategyAndSourceSecret(name string, ns s
 		Spec: build.BuildSpec{
 			Source: build.Source{
 				GitSource: &build.Git{
-					URL:         pointer.String("https://github.com/shipwright-io/sample-go"),
+					URL:         "https://github.com/shipwright-io/sample-go",
 					CloneSecret: &secret,
 				},
+				Type: build.GitType,
 			},
 			Strategy: build.Strategy{
 				Name: strategyName,
@@ -178,8 +181,9 @@ func (c *Catalog) BuildWithBuildStrategy(name string, ns string, strategyName st
 		Spec: build.BuildSpec{
 			Source: build.Source{
 				GitSource: &build.Git{
-					URL: pointer.String("https://github.com/shipwright-io/sample-go"),
+					URL: "https://github.com/shipwright-io/sample-go",
 				},
+				Type: build.GitType,
 			},
 			Strategy: build.Strategy{
 				Name: strategyName,
@@ -199,8 +203,9 @@ func (c *Catalog) BuildWithNilBuildStrategyKind(name string, ns string, strategy
 		Spec: build.BuildSpec{
 			Source: build.Source{
 				GitSource: &build.Git{
-					URL: pointer.String("https://github.com/shipwright-io/sample-go"),
+					URL: "https://github.com/shipwright-io/sample-go",
 				},
+				Type: build.GitType,
 			},
 			Strategy: build.Strategy{
 				Name: strategyName,
@@ -219,8 +224,9 @@ func (c *Catalog) BuildWithOutputSecret(name string, ns string, secretName strin
 		Spec: build.BuildSpec{
 			Source: build.Source{
 				GitSource: &build.Git{
-					URL: pointer.String("https://github.com/shipwright-io/sample-go"),
+					URL: "https://github.com/shipwright-io/sample-go",
 				},
+				Type: build.GitType,
 			},
 			Output: build.Image{
 				PushSecret: &secretName,