Skip to content

Commit 822db21

Browse files
authored
Merge pull request #180 from projectsyn/renovate/github.com-getkin-kin-openapi-0.x
Update module github.com/getkin/kin-openapi to v0.98.0
2 parents ccf9d4f + 02cb3c2 commit 822db21

File tree

5 files changed

+52
-45
lines changed

5 files changed

+52
-45
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/AlekSi/pointer v1.2.0
77
github.com/cosmtrek/air v1.40.4
88
github.com/deepmap/oapi-codegen v1.9.0
9-
github.com/getkin/kin-openapi v0.94.0
9+
github.com/getkin/kin-openapi v0.98.0
1010
github.com/hashicorp/golang-lru v0.5.4
1111
github.com/labstack/echo/v4 v4.7.2
1212
github.com/projectsyn/lieutenant-operator v1.3.0
@@ -39,6 +39,7 @@ require (
3939
github.com/google/gofuzz v1.2.0 // indirect
4040
github.com/gorilla/mux v1.8.0 // indirect
4141
github.com/imdario/mergo v0.3.12 // indirect
42+
github.com/invopop/yaml v0.1.0 // indirect
4243
github.com/josharian/intern v1.0.0 // indirect
4344
github.com/json-iterator/go v1.1.12 // indirect
4445
github.com/labstack/gommon v0.3.1 // indirect

go.sum

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSy
114114
github.com/getkin/kin-openapi v0.80.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
115115
github.com/getkin/kin-openapi v0.94.0 h1:bAxg2vxgnHHHoeefVdmGbR+oxtJlcv5HsJJa3qmAHuo=
116116
github.com/getkin/kin-openapi v0.94.0/go.mod h1:LWZfzOd7PRy8GJ1dJ6mCU6tNdSfOwRac1BUPam4aw6Q=
117+
github.com/getkin/kin-openapi v0.98.0 h1:lIACvCG9cxmFsEywz+LCoVhcZHFLUy+Nv5QSkb43eAE=
118+
github.com/getkin/kin-openapi v0.98.0/go.mod h1:w4lRPHiyOdwGbOkLIyk+P0qCwlu7TXPCHD/64nSXzgE=
117119
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
118120
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
119121
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
@@ -239,6 +241,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:
239241
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
240242
github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
241243
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
244+
github.com/invopop/yaml v0.1.0 h1:YW3WGUoJEXYfzWBjn00zIlrw7brGVD0fUKRYDPAPhrc=
245+
github.com/invopop/yaml v0.1.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q=
242246
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
243247
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
244248
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -773,6 +777,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
773777
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
774778
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
775779
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
780+
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
776781
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
777782
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
778783
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

openapi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ components:
212212
type: string
213213
description: Specifies if a repo should be managed by the git controller. A value of 'unmanaged' means it's not manged by the controller
214214
example: auto
215-
default: auto
216215
deployKey:
217216
type: string
218217
description: SSH public key / deploy key for clusterconfiguration catalog Git repository. This property is managed by Steward.

pkg/api/openapi.go

Lines changed: 43 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/service/tenant_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ func TestCreateTenant(t *testing.T) {
6666
assert.Contains(t, tenant.Id, api.TenantIDPrefix)
6767
assert.Equal(t, newTenant.DisplayName, tenant.DisplayName)
6868
assert.Equal(t, newTenant.GitRepo.Url, tenant.GitRepo.Url)
69+
assert.NotNil(t, tenant.GitRepo.Type)
70+
assert.Equal(t, "auto", *tenant.GitRepo.Type)
6971
assert.Contains(t, *tenant.Annotations, "new")
7072
assert.Len(t, *tenant.Annotations, 1)
7173

0 commit comments

Comments
 (0)