Merge pull request #5071 from aws/fix-cwlogstests

CHANGELOG_PENDING.md

@@ -3,3 +3,5 @@
 ### SDK Enhancements
 
 ### SDK Bugs
+* Don't generate cloudwatchlogs event streams tests for now.
+  * The test harness does not handle event stream APIs with a host prefix at this time.

private/model/cli/gen-api/main.go

@@ -4,20 +4,21 @@
 // Command aws-gen-gocli parses a JSON description of an AWS API and generates a
 // Go file containing a client for the API.
 //
-//     aws-gen-gocli apis/s3/2006-03-03/api-2.json
+//	aws-gen-gocli apis/s3/2006-03-03/api-2.json
 package main
 
 import (
 	"flag"
 	"fmt"
-	"github.com/aws/aws-sdk-go/private/model/api"
-	"github.com/aws/aws-sdk-go/private/util"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime/debug"
 	"strings"
 	"sync"
+
+	"github.com/aws/aws-sdk-go/private/model/api"
+	"github.com/aws/aws-sdk-go/private/util"
 )
 
 func usage() {
@@ -43,7 +44,8 @@ Flags:`)
 // -path alternative service path to write generated files to for each service.
 //
 // Env:
-//  SERVICES comma separated list of services to generate.
+//
+//	SERVICES comma separated list of services to generate.
 func main() {
 	var svcPath, svcImportPath string
 	flag.StringVar(&svcPath, "path", "service",
@@ -162,7 +164,7 @@ func writeServiceFiles(g *generateInfo, pkgDir string) {
 	defer func() {
 		if r := recover(); r != nil {
 			fmt.Fprintf(os.Stderr, "Error generating %s\n%s\n%s\n",
-				    pkgDir, r, string(debug.Stack()))
+				pkgDir, r, string(debug.Stack()))
 			os.Exit(1)
 		}
 	}()
@@ -180,7 +182,10 @@ func writeServiceFiles(g *generateInfo, pkgDir string) {
 	Must(writeExamplesFile(g))
 
 	if g.API.HasEventStream {
-		Must(writeAPIEventStreamTestFile(g))
+		// has stream APIs with host prefix, which our tests break on, skip codegen for now
+		if g.API.PackageName() != "cloudwatchlogs" {
+			Must(writeAPIEventStreamTestFile(g))
+		}
 	}
 
 	if g.API.PackageName() == "s3" {