Merge pull request #165 from uselagoon/lagoon_type_check

uselagoon · Jan 3, 2023 · 6a2f975 · 6a2f975
2 parents 6c3f447 + 2fe73a4
commit 6a2f975
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/internal/generator/services.go b/internal/generator/services.go
@@ -89,7 +89,9 @@ func composeToServiceValues(
 	if composeServiceValues.Labels != nil {
 		lagoonType = lagoon.CheckServiceLagoonLabel(composeServiceValues.Labels, "lagoon.type")
 	}
-	if lagoonType != "" {
+	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
@@ -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",