fixup! feat: Add code generation and fix double-slash URL path bug(#804)

Signed-off-by: Sean Chittenden <sean.chittenden@crowdstrike.com>

Author: sean-

cmd/osgen/emit/format_test.go

@@ -7,6 +7,7 @@
 package emit_test
 
 import (
+	"net/http"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -85,7 +86,7 @@ func TestMethodComment(t *testing.T) {
 				MethodName:      "GetRole",
 				Group:           "security.get_role",
 				Description:     "Retrieves one role.",
-				HTTPMethods:     []string{"GET"},
+				HTTPMethods:     []string{http.MethodGet},
 				PrimaryPath:     "/_plugins/_security/api/roles/{role}",
 				VersionAdded:    "1.0.0",
 				ExcludedDistros: []string{"amazon-managed", "amazon-serverless"},
@@ -104,7 +105,7 @@ func TestMethodComment(t *testing.T) {
 			data: emit.MethodDocData{
 				MethodName:  "Health",
 				Group:       "security.health",
-				HTTPMethods: []string{"GET"},
+				HTTPMethods: []string{http.MethodGet},
 				PrimaryPath: "/_plugins/_security/health",
 			},
 			checks: []string{
@@ -118,7 +119,7 @@ func TestMethodComment(t *testing.T) {
 				MethodName:  "Search",
 				Group:       "search",
 				Description: "Returns results matching a query.",
-				HTTPMethods: []string{"GET", "POST"},
+				HTTPMethods: []string{http.MethodGet, http.MethodPost},
 				PrimaryPath: "/{index}/_search",
 			},
 			checks: []string{
@@ -133,7 +134,7 @@ func TestMethodComment(t *testing.T) {
 				MethodName:        "OldGet",
 				Group:             "old.get",
 				Description:       "Fetches a resource.",
-				HTTPMethods:       []string{"GET"},
+				HTTPMethods:       []string{http.MethodGet},
 				PrimaryPath:       "/old/{id}",
 				VersionAdded:      "1.0",
 				VersionDeprecated: "2.0",
@@ -162,7 +163,7 @@ func TestMethodComment(t *testing.T) {
 				Group:      "create",
 				Description: "Creates a new document in the index.\n\n" +
 					"Returns a 409 response when a document with a same ID already exists in the index.",
-				HTTPMethods:  []string{"PUT"},
+				HTTPMethods:  []string{http.MethodPut},
 				PrimaryPath:  "/{index}/_create/{id}",
 				VersionAdded: "1.0",
 			},

cmd/osgen/emit/frag_req_test.go

@@ -7,6 +7,7 @@
 package emit_test
 
 import (
+	"net/http"
 	"strings"
 	"testing"
 
@@ -23,7 +24,7 @@ func TestReqFragment_SimpleOp(t *testing.T) {
 		Group:       "cluster.health",
 		TypePrefix:  "ClusterHealth",
 		Description: "Returns cluster health.",
-		HTTPMethods: []string{"GET"},
+		HTTPMethods: []string{http.MethodGet},
 		PrimaryPath: "/_cluster/health",
 		PathBuilder: ir.PathBuilder{StructName: "ClusterHealthPath"},
 	}
@@ -47,7 +48,7 @@ func TestReqFragment_WithBodyAndPathFields(t *testing.T) {
 		Group:       "index",
 		TypePrefix:  "Index",
 		Description: "Indexes a document.",
-		HTTPMethods: []string{"PUT", "POST"},
+		HTTPMethods: []string{http.MethodPut, http.MethodPost},
 		PrimaryPath: "/{index}/_doc/{id}",
 		HasBody:     true,
 		PathFields: []ir.PathField{
@@ -79,7 +80,7 @@ func TestReqFragment_WithTypedBody(t *testing.T) {
 		Group:        "ml.register_model",
 		TypePrefix:   "MlRegisterModel",
 		Description:  "Registers a model.",
-		HTTPMethods:  []string{"POST"},
+		HTTPMethods:  []string{http.MethodPost},
 		PrimaryPath:  "/_plugins/_ml/models/_register",
 		HasBody:      true,
 		HasTypedBody: true,
@@ -200,7 +201,7 @@ func TestFileAssembly_ReqAndParams(t *testing.T) {
 		Group:       "cluster.health",
 		TypePrefix:  "ClusterHealth",
 		Description: "Returns cluster health.",
-		HTTPMethods: []string{"GET"},
+		HTTPMethods: []string{http.MethodGet},
 		PrimaryPath: "/_cluster/health",
 		PathBuilder: ir.PathBuilder{StructName: "ClusterHealthPath"},
 		QueryParams: []ir.QueryParam{

cmd/osgen/emit/frag_resp_test.go

@@ -7,6 +7,7 @@
 package emit_test
 
 import (
+	"net/http"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -120,7 +121,7 @@ func TestDispatchFragment(t *testing.T) {
 				IsPointerReq: true,
 				HasBody:      true,
 				HasTypedBody: true,
-				HTTPMethods:  []string{"GET", "POST"},
+				HTTPMethods:  []string{http.MethodGet, http.MethodPost},
 				DispatchRoutes: []ir.DispatchRoute{
 					{ReceiverType: "Client", MethodName: "Search", TopLevel: true},
 				},
@@ -144,7 +145,7 @@ func TestDispatchFragment(t *testing.T) {
 				IsPointerReq: false,
 				HasBody:      true,
 				HasTypedBody: true,
-				HTTPMethods:  []string{"POST"},
+				HTTPMethods:  []string{http.MethodPost},
 				DispatchRoutes: []ir.DispatchRoute{
 					{ReceiverType: "Client", MethodName: "Bulk", TopLevel: true},
 				},

cmd/osgen/emit/frag_tests_test.go

@@ -7,6 +7,7 @@
 package emit_test
 
 import (
+	"net/http"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -90,7 +91,7 @@ func TestReqTestFragment_Body(t *testing.T) {
 		ImportPath: ir.DefaultCoreImportPath,
 		TypePrefix: "ClusterHealth",
 		Cases: []emit.ReqTestCase{
-			{Name: "empty request", WantMethod: "GET", WantPath: "/_cluster/health", WantErr: "false"},
+			{Name: "empty request", WantMethod: http.MethodGet, WantPath: "/_cluster/health", WantErr: "false"},
 		},
 	}
 
@@ -183,7 +184,7 @@ func TestReqTestFile_BlackBox(t *testing.T) {
 		PkgName:    ir.DefaultCorePkgName,
 		ImportPath: ir.DefaultCoreImportPath,
 		TypePrefix: "ClusterHealth",
-		Cases:      []emit.ReqTestCase{{Name: "empty", WantMethod: "GET", WantPath: "/", WantErr: "false"}},
+		Cases:      []emit.ReqTestCase{{Name: "empty", WantMethod: http.MethodGet, WantPath: "/", WantErr: "false"}},
 	}
 
 	target := &emit.File{

cmd/osgen/paths_group_test.go

@@ -7,6 +7,7 @@
 package main
 
 import (
+	"net/http"
 	"testing"
 
 	"github.com/getkin/kin-openapi/openapi3"
@@ -298,7 +299,7 @@ func TestExpandUnionPaths(t *testing.T) {
 		return pathVariant{
 			path:        path,
 			pathParams:  append([]string(nil), params...),
-			methods:     map[string]struct{}{"GET": {}},
+			methods:     map[string]struct{}{http.MethodGet: {}},
 			arrayParams: map[string]bool{},
 		}
 	}
@@ -429,18 +430,18 @@ func TestExpandUnionPaths_DeepCopiesMaps(t *testing.T) {
 	original := pathVariant{
 		path:        "/_nodes/{node_id_or_metric}",
 		pathParams:  []string{"node_id_or_metric"},
-		methods:     map[string]struct{}{"GET": {}},
+		methods:     map[string]struct{}{http.MethodGet: {}},
 		arrayParams: map[string]bool{"node_id_or_metric": true},
 	}
 	g := opGroup{
 		name: "nodes.info",
 		pathSpecs: []pathVariant{
-			{path: "/_nodes", methods: map[string]struct{}{"GET": {}}},
+			{path: "/_nodes", methods: map[string]struct{}{http.MethodGet: {}}},
 			original,
 			{
 				path:        "/_nodes/{node_id}/{metric}",
 				pathParams:  []string{"node_id", "metric"},
-				methods:     map[string]struct{}{"GET": {}},
+				methods:     map[string]struct{}{http.MethodGet: {}},
 				arrayParams: map[string]bool{},
 			},
 		},
@@ -465,7 +466,7 @@ func TestExpandUnionPaths_DeepCopiesMaps(t *testing.T) {
 	require.NotNil(t, syn1, "expected /_nodes/{node_id} synthetic variant")
 	require.NotNil(t, syn2, "expected /_nodes/{metric} synthetic variant")
 
-	syn1.methods["POST"] = struct{}{}
-	require.NotContains(t, syn2.methods, "POST", "synthetic variants share no method map")
-	require.NotContains(t, original.methods, "POST", "synthetic mutation leaked into original")
+	syn1.methods[http.MethodPost] = struct{}{}
+	require.NotContains(t, syn2.methods, http.MethodPost, "synthetic variants share no method map")
+	require.NotContains(t, original.methods, http.MethodPost, "synthetic mutation leaked into original")
 }