Make the tenant GitRepo URL required

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Upgrade to Go 1.15 ([#77])
 - Removed playbook.yml from project and replaced with ad-hoc command ([#79])
 - Update default Steward version ([#82])
+- Make the tenant GitRepo URL required ([#83])
 
 ## [v0.2.0] - 2020-07-23
 ### Changed
@@ -58,3 +59,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#71]: https://github.com/projectsyn/lieutenant-api/pull/71
 [#77]: https://github.com/projectsyn/lieutenant-api/pull/77
 [#82]: https://github.com/projectsyn/lieutenant-api/pull/82
+[#83]: https://github.com/projectsyn/lieutenant-api/pull/83

openapi.yaml

@@ -222,9 +222,7 @@ paths:
         The ID is generated by the API (in the form `t-<adjective>-<noun>-<digits>` where
         all the words are lowercase, max 63 characters in total).
         It generates the `Tenant` object in the configured namespace (usually the same namespace where the API runs).
-        The customer config Git repository (the `<GitRepoSpec>`) is automatically
-        generated based on default configuration or using the provided values.
-        If `gitRepo` is already set on creation, no `<GitRepoSpec>` will be added.
+        The customer config Git repository URL is required.
       tags:
         - tenant
       requestBody:

pkg/service/tenant.go

@@ -33,6 +33,11 @@ func (s *APIImpl) CreateTenant(c echo.Context) error {
 	if err := ctx.Bind(&newTenant); err != nil {
 		return echo.NewHTTPError(http.StatusBadRequest, err)
 	}
+	if newTenant.GitRepo == nil ||
+		newTenant.GitRepo.Url == nil ||
+		*newTenant.GitRepo.Url == "" {
+		return echo.NewHTTPError(http.StatusBadRequest, "GitRepo URL is required")
+	}
 	apiTenant := &api.Tenant{
 		TenantProperties: api.TenantProperties(*newTenant),
 	}

pkg/service/tenant_test.go

@@ -37,6 +37,9 @@ func TestCreateTenant(t *testing.T) {
 
 	newTenant := api.TenantProperties{
 		DisplayName: pointer.ToString("My test Tenant"),
+		GitRepo: &api.GitRepo{
+			Url: pointer.ToString("ssh://git@git.example.com/test.git"),
+		},
 	}
 	result := testutil.NewRequest().
 		Post("/tenants").
@@ -48,8 +51,10 @@ func TestCreateTenant(t *testing.T) {
 	err := result.UnmarshalJsonToObject(tenant)
 	assert.NoError(t, err)
 	assert.NotNil(t, tenant)
+	assert.NotNil(t, tenant.GitRepo)
 	assert.Contains(t, tenant.Id, api.TenantIDPrefix)
 	assert.Equal(t, newTenant.DisplayName, tenant.DisplayName)
+	assert.Equal(t, newTenant.GitRepo.Url, tenant.GitRepo.Url)
 }
 
 func TestCreateTenantFail(t *testing.T) {
@@ -82,6 +87,25 @@ func TestCreateTenantEmpty(t *testing.T) {
 	assert.Contains(t, reason.Reason, "must have a value")
 }
 
+func TestCreateTenantNoGitURL(t *testing.T) {
+	e, _ := setupTest(t)
+
+	newTenant := api.TenantProperties{
+		DisplayName: pointer.ToString("Tenant without a Git URL"),
+	}
+
+	result := testutil.NewRequest().
+		Post("/tenants/").
+		WithHeader(echo.HeaderAuthorization, bearerToken).
+		WithJsonBody(newTenant).
+		Go(t, e)
+	assert.Equal(t, http.StatusBadRequest, result.Code())
+	reason := &api.Reason{}
+	err := result.UnmarshalJsonToObject(reason)
+	assert.NoError(t, err)
+	assert.Contains(t, reason.Reason, "required")
+}
+
 func TestTenantDelete(t *testing.T) {
 	e, _ := setupTest(t)