From 4e3086e71b04b93024ba1c137c7122bbcaee6b70 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 30 Dec 2022 12:24:50 +1100 Subject: [PATCH 1/2] Adding error msg for builds without a Lagoon type --- internal/generator/services.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/generator/services.go b/internal/generator/services.go index e7f57d19..a3481e20 100644 --- a/internal/generator/services.go +++ b/internal/generator/services.go @@ -89,6 +89,9 @@ func composeToServiceValues( if composeServiceValues.Labels != nil { lagoonType = lagoon.CheckServiceLagoonLabel(composeServiceValues.Labels, "lagoon.type") } + if lagoonType == "" { + return ServiceValues{}, fmt.Errorf("No Lagoon type has been set for service %s. If a Lagoon type is not required for this service, please set the Lagoon type to 'none'", composeService) + } if lagoonType != "" { // if the lagoontype is populated, even none is valid as there may be a servicetype override in an environment variable autogenEnabled := true From 9cd8afaae50845591b482156915ff6082ed96a73 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 30 Dec 2022 15:59:45 +1100 Subject: [PATCH 2/2] Updating wording and tests --- internal/generator/services.go | 5 ++--- internal/generator/services_test.go | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/generator/services.go b/internal/generator/services.go index a3481e20..67f4e4f4 100644 --- a/internal/generator/services.go +++ b/internal/generator/services.go @@ -90,9 +90,8 @@ func composeToServiceValues( lagoonType = lagoon.CheckServiceLagoonLabel(composeServiceValues.Labels, "lagoon.type") } if lagoonType == "" { - return ServiceValues{}, fmt.Errorf("No Lagoon type has been set for service %s. If a Lagoon type is not required for this service, please set the Lagoon type to 'none'", composeService) - } - if lagoonType != "" { + return ServiceValues{}, fmt.Errorf("No lagoon.type has been set for service %s. If a Lagoon service is not required, please set the lagoon.type to 'none' for this service in docker-compose.yaml. See the Lagoon documentation for supported service types.", composeService) + } else { // if the lagoontype is populated, even none is valid as there may be a servicetype override in an environment variable autogenEnabled := true autogenTLSAcmeEnabled := true diff --git a/internal/generator/services_test.go b/internal/generator/services_test.go index 87a0c2df..c4936b84 100644 --- a/internal/generator/services_test.go +++ b/internal/generator/services_test.go @@ -278,7 +278,8 @@ func Test_composeToServiceValues(t *testing.T) { composeService: "nginx", composeServiceValues: composetypes.ServiceConfig{}, }, - want: ServiceValues{}, + want: ServiceValues{}, + wantErr: true, }, { name: "test9 - type none, no service",