Check for nil interceptors before wrapping (#3727)

Author: nitinmohan87

codegen/service/templates/client_wrappers.go.tpl

@@ -1,8 +1,10 @@
 
 {{ comment (printf "Wrap%sClientEndpoint wraps the %s endpoint with the client interceptors defined in the design." .MethodVarName .Method) }}
 func Wrap{{ .MethodVarName }}ClientEndpoint(endpoint goa.Endpoint, i ClientInterceptors) goa.Endpoint {
-	{{- range .Interceptors }}
-	endpoint = wrapClient{{ $.MethodVarName }}{{ . }}(endpoint, i)
-	{{- end }}
+	if i != nil {
+		{{- range .Interceptors }}
+		endpoint = wrapClient{{ $.MethodVarName }}{{ . }}(endpoint, i)
+		{{- end }}
+	}
 	return endpoint
 }

codegen/service/templates/endpoint_wrappers.go.tpl

@@ -1,7 +1,9 @@
 {{ comment (printf "Wrap%sEndpoint wraps the %s endpoint with the server-side interceptors defined in the design." .MethodVarName .Method) }}
 func Wrap{{ .MethodVarName }}Endpoint(endpoint goa.Endpoint, i ServerInterceptors) goa.Endpoint {
-	{{- range .Interceptors }}
-	endpoint = wrap{{ $.MethodVarName }}{{ . }}(endpoint, i)
-	{{- end }}
+	if i != nil {
+		{{- range .Interceptors }}
+		endpoint = wrap{{ $.MethodVarName }}{{ . }}(endpoint, i)
+		{{- end }}
+	}
 	return endpoint
 }

codegen/service/testdata/interceptors/interceptor-with-read-payload_client_interceptors.go.golden

@@ -9,6 +9,8 @@ type ClientInterceptors interface {
 // WrapMethodClientEndpoint wraps the Method endpoint with the client
 // interceptors defined in the design.
 func WrapMethodClientEndpoint(endpoint goa.Endpoint, i ClientInterceptors) goa.Endpoint {
-	endpoint = wrapClientMethodvalidation(endpoint, i)
+	if i != nil {
+		endpoint = wrapClientMethodvalidation(endpoint, i)
+	}
 	return endpoint
 }

codegen/service/testdata/interceptors/interceptor-with-read-payload_service_interceptors.go.golden

@@ -35,7 +35,9 @@ type (
 // WrapMethodEndpoint wraps the Method endpoint with the server-side
 // interceptors defined in the design.
 func WrapMethodEndpoint(endpoint goa.Endpoint, i ServerInterceptors) goa.Endpoint {
-	endpoint = wrapMethodvalidation(endpoint, i)
+	if i != nil {
+		endpoint = wrapMethodvalidation(endpoint, i)
+	}
 	return endpoint
 }
 

codegen/service/testdata/interceptors/interceptor-with-read-result_client_interceptors.go.golden

@@ -9,6 +9,8 @@ type ClientInterceptors interface {
 // WrapMethodClientEndpoint wraps the Method endpoint with the client
 // interceptors defined in the design.
 func WrapMethodClientEndpoint(endpoint goa.Endpoint, i ClientInterceptors) goa.Endpoint {
-	endpoint = wrapClientMethodcaching(endpoint, i)
+	if i != nil {
+		endpoint = wrapClientMethodcaching(endpoint, i)
+	}
 	return endpoint
 }

codegen/service/testdata/interceptors/interceptor-with-read-result_service_interceptors.go.golden

@@ -35,7 +35,9 @@ type (
 // WrapMethodEndpoint wraps the Method endpoint with the server-side
 // interceptors defined in the design.
 func WrapMethodEndpoint(endpoint goa.Endpoint, i ServerInterceptors) goa.Endpoint {
-	endpoint = wrapMethodcaching(endpoint, i)
+	if i != nil {
+		endpoint = wrapMethodcaching(endpoint, i)
+	}
 	return endpoint
 }
 

codegen/service/testdata/interceptors/interceptor-with-read-write-payload_client_interceptors.go.golden

@@ -9,6 +9,8 @@ type ClientInterceptors interface {
 // WrapMethodClientEndpoint wraps the Method endpoint with the client
 // interceptors defined in the design.
 func WrapMethodClientEndpoint(endpoint goa.Endpoint, i ClientInterceptors) goa.Endpoint {
-	endpoint = wrapClientMethodvalidation(endpoint, i)
+	if i != nil {
+		endpoint = wrapClientMethodvalidation(endpoint, i)
+	}
 	return endpoint
 }

codegen/service/testdata/interceptors/interceptor-with-read-write-payload_service_interceptors.go.golden

@@ -36,7 +36,9 @@ type (
 // WrapMethodEndpoint wraps the Method endpoint with the server-side
 // interceptors defined in the design.
 func WrapMethodEndpoint(endpoint goa.Endpoint, i ServerInterceptors) goa.Endpoint {
-	endpoint = wrapMethodvalidation(endpoint, i)
+	if i != nil {
+		endpoint = wrapMethodvalidation(endpoint, i)
+	}
 	return endpoint
 }
 

codegen/service/testdata/interceptors/interceptor-with-read-write-result_client_interceptors.go.golden

@@ -9,6 +9,8 @@ type ClientInterceptors interface {
 // WrapMethodClientEndpoint wraps the Method endpoint with the client
 // interceptors defined in the design.
 func WrapMethodClientEndpoint(endpoint goa.Endpoint, i ClientInterceptors) goa.Endpoint {
-	endpoint = wrapClientMethodcaching(endpoint, i)
+	if i != nil {
+		endpoint = wrapClientMethodcaching(endpoint, i)
+	}
 	return endpoint
 }

codegen/service/testdata/interceptors/interceptor-with-read-write-result_service_interceptors.go.golden

@@ -36,7 +36,9 @@ type (
 // WrapMethodEndpoint wraps the Method endpoint with the server-side
 // interceptors defined in the design.
 func WrapMethodEndpoint(endpoint goa.Endpoint, i ServerInterceptors) goa.Endpoint {
-	endpoint = wrapMethodcaching(endpoint, i)
+	if i != nil {
+		endpoint = wrapMethodcaching(endpoint, i)
+	}
 	return endpoint
 }