From bef467a53b4f1cd0a6f2dd304a799f361fa0e1da Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Tue, 28 May 2024 14:07:39 +1000 Subject: [PATCH] chore: tidy go modules --- .../crd/bases/crd.lagoon.sh_lagoonbuilds.yaml | 104 ++++++++++++++++++ .../crd/bases/crd.lagoon.sh_lagoontasks.yaml | 104 ++++++++++++++++++ go.mod | 10 +- go.sum | 20 ++-- 4 files changed, 223 insertions(+), 15 deletions(-) diff --git a/config/crd/bases/crd.lagoon.sh_lagoonbuilds.yaml b/config/crd/bases/crd.lagoon.sh_lagoonbuilds.yaml index 4d8db47c..ed182224 100644 --- a/config/crd/bases/crd.lagoon.sh_lagoonbuilds.yaml +++ b/config/crd/bases/crd.lagoon.sh_lagoonbuilds.yaml @@ -239,6 +239,32 @@ spec: type: string environmentId: type: integer + environmentServices: + items: + description: EnvironmentService is based on the Lagoon + API type. + properties: + containers: + items: + description: ServiceContainer is based on the Lagoon + API type. + properties: + name: + type: string + type: object + type: array + created: + type: string + id: + type: integer + name: + type: string + type: + type: string + updated: + type: string + type: object + type: array jobName: type: string jobStatus: @@ -328,6 +354,32 @@ spec: type: string environmentId: type: integer + environmentServices: + items: + description: EnvironmentService is based on the Lagoon + API type. + properties: + containers: + items: + description: ServiceContainer is based on the Lagoon + API type. + properties: + name: + type: string + type: object + type: array + created: + type: string + id: + type: integer + name: + type: string + type: + type: string + updated: + type: string + type: object + type: array jobName: type: string jobStatus: @@ -419,6 +471,32 @@ spec: type: string environmentId: type: integer + environmentServices: + items: + description: EnvironmentService is based on the Lagoon + API type. + properties: + containers: + items: + description: ServiceContainer is based on the Lagoon + API type. + properties: + name: + type: string + type: object + type: array + created: + type: string + id: + type: integer + name: + type: string + type: + type: string + updated: + type: string + type: object + type: array jobName: type: string jobStatus: @@ -512,6 +590,32 @@ spec: type: string environmentId: type: integer + environmentServices: + items: + description: EnvironmentService is based on the Lagoon + API type. + properties: + containers: + items: + description: ServiceContainer is based on the Lagoon + API type. + properties: + name: + type: string + type: object + type: array + created: + type: string + id: + type: integer + name: + type: string + type: + type: string + updated: + type: string + type: object + type: array jobName: type: string jobStatus: diff --git a/config/crd/bases/crd.lagoon.sh_lagoontasks.yaml b/config/crd/bases/crd.lagoon.sh_lagoontasks.yaml index 0f88b0bd..5be4d4aa 100644 --- a/config/crd/bases/crd.lagoon.sh_lagoontasks.yaml +++ b/config/crd/bases/crd.lagoon.sh_lagoontasks.yaml @@ -221,6 +221,32 @@ spec: type: string environmentId: type: integer + environmentServices: + items: + description: EnvironmentService is based on the Lagoon + API type. + properties: + containers: + items: + description: ServiceContainer is based on the Lagoon + API type. + properties: + name: + type: string + type: object + type: array + created: + type: string + id: + type: integer + name: + type: string + type: + type: string + updated: + type: string + type: object + type: array jobName: type: string jobStatus: @@ -310,6 +336,32 @@ spec: type: string environmentId: type: integer + environmentServices: + items: + description: EnvironmentService is based on the Lagoon + API type. + properties: + containers: + items: + description: ServiceContainer is based on the Lagoon + API type. + properties: + name: + type: string + type: object + type: array + created: + type: string + id: + type: integer + name: + type: string + type: + type: string + updated: + type: string + type: object + type: array jobName: type: string jobStatus: @@ -401,6 +453,32 @@ spec: type: string environmentId: type: integer + environmentServices: + items: + description: EnvironmentService is based on the Lagoon + API type. + properties: + containers: + items: + description: ServiceContainer is based on the Lagoon + API type. + properties: + name: + type: string + type: object + type: array + created: + type: string + id: + type: integer + name: + type: string + type: + type: string + updated: + type: string + type: object + type: array jobName: type: string jobStatus: @@ -494,6 +572,32 @@ spec: type: string environmentId: type: integer + environmentServices: + items: + description: EnvironmentService is based on the Lagoon + API type. + properties: + containers: + items: + description: ServiceContainer is based on the Lagoon + API type. + properties: + name: + type: string + type: object + type: array + created: + type: string + id: + type: integer + name: + type: string + type: + type: string + updated: + type: string + type: object + type: array jobName: type: string jobStatus: diff --git a/go.mod b/go.mod index b394be17..055b8ee3 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.29.0 github.com/prometheus/client_golang v1.16.0 - github.com/uselagoon/machinery v0.0.17-0.20240109062854-3b567fb41003 + github.com/uselagoon/machinery v0.0.22 github.com/vshn/k8up v1.99.99 github.com/xhit/go-str2duration/v2 v2.1.0 gopkg.in/matryer/try.v1 v1.0.0-20150601225556-312d2599e12e @@ -84,10 +84,10 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/net v0.19.0 // indirect - golang.org/x/oauth2 v0.10.0 // indirect - golang.org/x/sys v0.15.0 // indirect - golang.org/x/term v0.15.0 // indirect + golang.org/x/net v0.21.0 // indirect + golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/sys v0.17.0 // indirect + golang.org/x/term v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.3.0 // indirect gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect diff --git a/go.sum b/go.sum index f689c8cf..9711aa9a 100644 --- a/go.sum +++ b/go.sum @@ -1254,8 +1254,8 @@ github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/uselagoon/machinery v0.0.17-0.20240109062854-3b567fb41003 h1:fLhncKjshd8f0DBFB45u7OWsF1H6OgNmpkswJYqwCA8= -github.com/uselagoon/machinery v0.0.17-0.20240109062854-3b567fb41003/go.mod h1:Duljjz/3d/7m0jbmF1nVRDTNaMxMr6m+5LkgjiRrQaU= +github.com/uselagoon/machinery v0.0.22 h1:4FVJRLS8he2NAZYMIJXQqVb25jQ03tF8dNhQbrBMX3g= +github.com/uselagoon/machinery v0.0.22/go.mod h1:NbgtEofjK2XY0iUpk9aMYazIo+W/NI56+UF72jv8zVY= github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s= @@ -1531,8 +1531,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1546,8 +1546,8 @@ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= -golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1676,16 +1676,16 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=