Merge pull request #10038 from php-coder/omit_empty_secrets

OpenShift Bot · web-flow · commit 3378ee5a4be6 · 2016-07-27T09:52:38.000-04:00
Merged by openshift-bot
diff --git a/api/swagger-spec/oapi-v1.json b/api/swagger-spec/oapi-v1.json
@@ -20051,8 +20051,7 @@
     "id": "v1.BuildSource",
     "description": "BuildSource is the SCM used for the build.",
     "required": [
-     "type",
-     "secrets"
+     "type"
     ],
     "properties": {
      "type": {
diff --git a/pkg/build/api/v1/types.go b/pkg/build/api/v1/types.go
@@ -252,7 +252,7 @@ type BuildSource struct {
 
 	// secrets represents a list of secrets and their destinations that will
 	// be used only for the build.
-	Secrets []SecretBuildSource `json:"secrets" protobuf:"bytes,8,rep,name=secrets"`
+	Secrets []SecretBuildSource `json:"secrets,omitempty" protobuf:"bytes,8,rep,name=secrets"`
 }
 
 // ImageSource describes an image that is used as source for the build

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ type BuildSource struct {`
`252`	`252`
`253`	`253`	`// secrets represents a list of secrets and their destinations that will`
`254`	`254`	`// be used only for the build.`
`255`		- Secrets []SecretBuildSource `json:"secrets" protobuf:"bytes,8,rep,name=secrets"`
	`255`	+ Secrets []SecretBuildSource `json:"secrets,omitempty" protobuf:"bytes,8,rep,name=secrets"`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`// ImageSource describes an image that is used as source for the build`