Add clientless endpoint - fix references and update license to 2020 (#…

…679) * Refactor, cleanup serverless endpoint * Fix license template for 2020
uber · Jan 4, 2020 · e668e50 · e668e50
1 parent ede49fa
commit e668e50
Show file tree

Hide file tree

Showing 128 changed files with 167 additions and 171 deletions.
diff --git a/benchmarks/benchserver/main.go b/benchmarks/benchserver/main.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/benchmarks/runner/main.go b/benchmarks/runner/main.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/casing.go b/codegen/casing.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/casing_test.go b/codegen/casing_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/client.go b/codegen/client.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/client_test.go b/codegen/client_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/gateway.go b/codegen/gateway.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -279,8 +279,8 @@ type EndpointSpec struct {
 	ClientMethod string `yaml:"clientMethod,omitempty"`
 	// The client for this endpoint if httpClient or tchannelClient
 	ClientSpec *ClientSpec `yaml:"-"`
-	// DummyEndpoint checks if the endpoint is clientless
-	IsDummyEndpoint bool `yaml:"-"`
+	// IsClientlessEndpoint checks if the endpoint is clientless
+	IsClientlessEndpoint bool `yaml:"-"`
 }
 
 func ensureFields(config map[string]interface{}, mandatoryFields []string, yamlFile string) error {
@@ -352,7 +352,7 @@ func NewEndpointSpec(
 	var workflowImportPath string
 	var clientID string
 	var clientMethod string
-	var isDummyEndpoint bool
+	var isClientlessEndpoint bool
 
 	workflowType := endpointConfigObj["workflowType"].(string)
 	if workflowType == "httpClient" || workflowType == "tchannelClient" {
@@ -384,7 +384,7 @@ func NewEndpointSpec(
 		}
 		workflowImportPath = iworkflowImportPath.(string)
 	} else if workflowType == clientlessWorkflow {
-		isDummyEndpoint = true
+		isClientlessEndpoint = true
 	} else {
 		return nil, errors.Errorf(
 			"Invalid workflowType %q for endpoint %q",
@@ -417,22 +417,22 @@ func NewEndpointSpec(
 	}
 
 	espec := &EndpointSpec{
-		ModuleSpec:         mspec,
-		YAMLFile:           yamlFile,
-		GoStructsFileName:  goStructsFileName,
-		GoFolderName:       goFolderName,
-		GoPackageName:      goPackageName,
-		EndpointType:       endpointConfigObj["endpointType"].(string),
-		EndpointID:         endpointConfigObj["endpointId"].(string),
-		HandleID:           endpointConfigObj["handleId"].(string),
-		ThriftFile:         thriftFile,
-		ThriftServiceName:  parts[0],
-		ThriftMethodName:   parts[1],
-		WorkflowType:       workflowType,
-		WorkflowImportPath: workflowImportPath,
-		IsDummyEndpoint:    isDummyEndpoint,
-		ClientID:           clientID,
-		ClientMethod:       clientMethod,
+		ModuleSpec:           mspec,
+		YAMLFile:             yamlFile,
+		GoStructsFileName:    goStructsFileName,
+		GoFolderName:         goFolderName,
+		GoPackageName:        goPackageName,
+		EndpointType:         endpointConfigObj["endpointType"].(string),
+		EndpointID:           endpointConfigObj["endpointId"].(string),
+		HandleID:             endpointConfigObj["handleId"].(string),
+		ThriftFile:           thriftFile,
+		ThriftServiceName:    parts[0],
+		ThriftMethodName:     parts[1],
+		WorkflowType:         workflowType,
+		WorkflowImportPath:   workflowImportPath,
+		IsClientlessEndpoint: isClientlessEndpoint,
+		ClientID:             clientID,
+		ClientMethod:         clientMethod,
 	}
 
 	defaultMidSpecs, err := getOrderedDefaultMiddlewareSpecs(

diff --git a/codegen/gateway_test.go b/codegen/gateway_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/header_propagate.go b/codegen/header_propagate.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/header_propagate_test.go b/codegen/header_propagate_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/method.go b/codegen/method.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -137,8 +137,8 @@ type MethodSpec struct {
 	// Statements for converting response types
 	ConvertResponseGoStatements []string
 
-	// Statements for converting Dummy request types
-	ConvertDummyRequestGoStatements []string
+	// Statements for converting Clientless request types
+	ConvertClientlessRequestGoStatements []string
 
 	// Statements for propagating headers to client requests
 	PropagateHeadersGoStatements []string
@@ -1003,7 +1003,7 @@ func (ms *MethodSpec) setTypeConverters(
 	return nil
 }
 
-func (ms *MethodSpec) setDummyTypeConverters(
+func (ms *MethodSpec) setClientlessTypeConverters(
 	funcSpec *compile.FunctionSpec,
 	reqTransforms map[string]FieldMapperEntry,
 	headersPropagate map[string]FieldMapperEntry,
@@ -1012,11 +1012,11 @@ func (ms *MethodSpec) setDummyTypeConverters(
 	h *PackageHelper,
 ) error {
 
-	dummyConverter := NewTypeConverter(h, nil)
+	clientlessConverter := NewTypeConverter(h, nil)
 
 	respType := funcSpec.ResultSpec.ReturnType
 
-	dummyConverter.append(
+	clientlessConverter.append(
 		"func convert",
 		PascalCase(ms.Name),
 		"DummyResponse(in ", ms.RequestType, ") ", ms.ResponseType, "{")
@@ -1044,16 +1044,16 @@ func (ms *MethodSpec) setDummyTypeConverters(
 	default:
 		// default as struct
 		respFields := respType.(*compile.StructSpec).Fields
-		dummyConverter.append("out", " := ", "&", ms.ShortResponseType, "{}\t\n")
-		err := dummyConverter.GenStructConverter(structType, respFields, dummyReqTransforms)
+		clientlessConverter.append("out", " := ", "&", ms.ShortResponseType, "{}\t\n")
+		err := clientlessConverter.GenStructConverter(structType, respFields, dummyReqTransforms)
 		if err != nil {
 			return err
 		}
 
 	}
 
-	dummyConverter.append("\nreturn out \t}")
-	ms.ConvertDummyRequestGoStatements = dummyConverter.GetLines()
+	clientlessConverter.append("\nreturn out \t}")
+	ms.ConvertClientlessRequestGoStatements = clientlessConverter.GetLines()
 
 	return nil
 }

diff --git a/codegen/mockgen.go b/codegen/mockgen.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/module.go b/codegen/module.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/module_system.go b/codegen/module_system.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -44,7 +44,7 @@ type EndpointMeta struct {
 	ClientMethodName       string
 	WorkflowPkg            string
 	ReqHeaders             map[string]*TypedHeader
-	IsDummyEndpoint        bool
+	IsClientlessEndpoint   bool
 	ReqHeadersKeys         []string
 	ReqRequiredHeadersKeys []string
 	ResHeaders             map[string]*TypedHeader
@@ -1154,7 +1154,7 @@ func (g *EndpointGenerator) generateEndpointFile(
 		IncludedPackages:       includedPackages,
 		Method:                 method,
 		ReqHeaders:             reqHeaders,
-		IsDummyEndpoint:        e.IsDummyEndpoint,
+		IsClientlessEndpoint:   e.IsClientlessEndpoint,
 		ReqHeadersKeys:         sortedHeaders(reqHeaders, false),
 		ReqRequiredHeadersKeys: sortedHeaders(reqHeaders, true),
 		ResHeadersKeys:         sortedHeaders(e.ResHeaders, false),
@@ -1193,7 +1193,7 @@ func (g *EndpointGenerator) generateEndpointFile(
 	out[endpointFilePath] = endpoint
 
 	tmpl := ""
-	if e.IsDummyEndpoint {
+	if e.IsClientlessEndpoint {
 		tmpl = "clientless-workflow.tmpl"
 	} else {
 		tmpl = "workflow.tmpl"

diff --git a/codegen/module_test.go b/codegen/module_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/package.go b/codegen/package.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/package_test.go b/codegen/package_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/post_gen_hooks.go b/codegen/post_gen_hooks.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/proto.go b/codegen/proto.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/proto_test.go b/codegen/proto_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/reflect_interface.go b/codegen/reflect_interface.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/runner/runner.go b/codegen/runner/runner.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/service.go b/codegen/service.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -249,9 +249,9 @@ func (ms *ModuleSpec) SetDownstream(
 		)
 	}
 
-	if e.IsDummyEndpoint {
+	if e.IsClientlessEndpoint {
 		funcSpec := method.CompiledThriftSpec
-		err := method.setDummyTypeConverters(funcSpec, reqTransforms, headersPropagate, respTransforms, dummyReqTransforms, h)
+		err := method.setClientlessTypeConverters(funcSpec, reqTransforms, headersPropagate, respTransforms, dummyReqTransforms, h)
 		if err != nil {
 			return errors.Errorf(
 				"unable to set dummy type convertors for dummy endpoint")

diff --git a/codegen/service_test.go b/codegen/service_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/template.go b/codegen/template.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/template_test.go b/codegen/template_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
+// Copyright (c) 2020 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/codegen/templates/clientless-workflow.tmpl b/codegen/templates/clientless-workflow.tmpl
@@ -8,7 +8,7 @@ package clientlessworkflow
 {{- $reqHeaderRequiredKeys := .ReqRequiredHeadersKeys }}
 {{- $resHeaderMap := .ResHeaders }}
 {{- $resHeaderMapKeys := .ResHeadersKeys }}
-{{- $dummyEndpoint := .IsDummyEndpoint }}
+{{- $clientlessEndpoint := .IsClientlessEndpoint }}
 {{- $clientID := .ClientID }}
 {{- $clientName := title .ClientName }}
 {{- $clientMethodName := title .ClientMethodName }}
@@ -146,8 +146,8 @@ func (w {{$workflowStruct}}) Handle(
 	{{- end -}}
 }
 
-{{if eq $dummyEndpoint true -}}
-{{ range $key, $line := $method.ConvertDummyRequestGoStatements -}}
+{{if eq $clientlessEndpoint true -}}
+{{ range $key, $line := $method.ConvertClientlessRequestGoStatements -}}
 {{$line}}
 {{ end }}
 {{end -}}