diff --git a/.changelog/1b5d9c4a9d6240a7b8d5bf34b40d3f9a.json b/.changelog/1b5d9c4a9d6240a7b8d5bf34b40d3f9a.json
new file mode 100644
index 00000000000..32950f7cdb7
--- /dev/null
+++ b/.changelog/1b5d9c4a9d6240a7b8d5bf34b40d3f9a.json
@@ -0,0 +1,8 @@
+{
+    "id": "1b5d9c4a-9d62-40a7-b8d5-bf34b40d3f9a",
+    "type": "feature",
+    "description": "Increasing NextToken parameter length restriction for List APIs from 512 to 1024.",
+    "modules": [
+        "service/kinesisvideo"
+    ]
+}
\ No newline at end of file
diff --git a/.changelog/f67756ad45a3465eaaf44440cb47124e.json b/.changelog/f67756ad45a3465eaaf44440cb47124e.json
new file mode 100644
index 00000000000..a75621a890f
--- /dev/null
+++ b/.changelog/f67756ad45a3465eaaf44440cb47124e.json
@@ -0,0 +1,8 @@
+{
+    "id": "f67756ad-45a3-465e-aaf4-4440cb47124e",
+    "type": "feature",
+    "description": "This release adds IPv4 prefixes to health events",
+    "modules": [
+        "service/internetmonitor"
+    ]
+}
\ No newline at end of file
diff --git a/internal/protocoltest/awsrestjson/snapshot_test.go b/internal/protocoltest/awsrestjson/snapshot_test.go
index fe8a7846233..66f95dde3ac 100644
--- a/internal/protocoltest/awsrestjson/snapshot_test.go
+++ b/internal/protocoltest/awsrestjson/snapshot_test.go
@@ -7,7 +7,6 @@ package awsrestjson
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/internal/protocoltest/ec2query/snapshot_test.go b/internal/protocoltest/ec2query/snapshot_test.go
index 23578aae8b4..6929a846c3b 100644
--- a/internal/protocoltest/ec2query/snapshot_test.go
+++ b/internal/protocoltest/ec2query/snapshot_test.go
@@ -7,7 +7,6 @@ package ec2query
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/internal/protocoltest/jsonrpc/snapshot_test.go b/internal/protocoltest/jsonrpc/snapshot_test.go
index ff24cec9eca..77fd3068fc8 100644
--- a/internal/protocoltest/jsonrpc/snapshot_test.go
+++ b/internal/protocoltest/jsonrpc/snapshot_test.go
@@ -7,7 +7,6 @@ package jsonrpc
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/internal/protocoltest/jsonrpc10/snapshot_test.go b/internal/protocoltest/jsonrpc10/snapshot_test.go
index 0347188ac31..e3361ae3455 100644
--- a/internal/protocoltest/jsonrpc10/snapshot_test.go
+++ b/internal/protocoltest/jsonrpc10/snapshot_test.go
@@ -7,7 +7,6 @@ package jsonrpc10
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/internal/protocoltest/query/snapshot_test.go b/internal/protocoltest/query/snapshot_test.go
index 208dcb31ca5..7e7fb9f83c6 100644
--- a/internal/protocoltest/query/snapshot_test.go
+++ b/internal/protocoltest/query/snapshot_test.go
@@ -7,7 +7,6 @@ package query
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/internal/protocoltest/restxml/snapshot_test.go b/internal/protocoltest/restxml/snapshot_test.go
index 0d28b2b09e9..ecc312b99e0 100644
--- a/internal/protocoltest/restxml/snapshot_test.go
+++ b/internal/protocoltest/restxml/snapshot_test.go
@@ -7,7 +7,6 @@ package restxml
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/internal/protocoltest/restxmlwithnamespace/snapshot_test.go b/internal/protocoltest/restxmlwithnamespace/snapshot_test.go
index 6ec8ac6cf79..b0b56944a88 100644
--- a/internal/protocoltest/restxmlwithnamespace/snapshot_test.go
+++ b/internal/protocoltest/restxmlwithnamespace/snapshot_test.go
@@ -7,7 +7,6 @@ package restxmlwithnamespace
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/accessanalyzer/snapshot_test.go b/service/accessanalyzer/snapshot_test.go
index 05b31aa5341..c90364718a1 100644
--- a/service/accessanalyzer/snapshot_test.go
+++ b/service/accessanalyzer/snapshot_test.go
@@ -7,7 +7,6 @@ package accessanalyzer
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/account/snapshot_test.go b/service/account/snapshot_test.go
index 6489bd48df6..f1706f4667a 100644
--- a/service/account/snapshot_test.go
+++ b/service/account/snapshot_test.go
@@ -7,7 +7,6 @@ package account
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/acm/snapshot_test.go b/service/acm/snapshot_test.go
index a1003f3e695..0b6dbdce51c 100644
--- a/service/acm/snapshot_test.go
+++ b/service/acm/snapshot_test.go
@@ -7,7 +7,6 @@ package acm
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/acmpca/snapshot_test.go b/service/acmpca/snapshot_test.go
index 11d11fb2423..cac4d6b0803 100644
--- a/service/acmpca/snapshot_test.go
+++ b/service/acmpca/snapshot_test.go
@@ -7,7 +7,6 @@ package acmpca
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/alexaforbusiness/snapshot_test.go b/service/alexaforbusiness/snapshot_test.go
index 26f5a674de1..061574943d5 100644
--- a/service/alexaforbusiness/snapshot_test.go
+++ b/service/alexaforbusiness/snapshot_test.go
@@ -7,7 +7,6 @@ package alexaforbusiness
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/amp/snapshot_test.go b/service/amp/snapshot_test.go
index b582325ff77..5a9ce3afc4f 100644
--- a/service/amp/snapshot_test.go
+++ b/service/amp/snapshot_test.go
@@ -7,7 +7,6 @@ package amp
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/amplify/snapshot_test.go b/service/amplify/snapshot_test.go
index cd7ddb0363a..892d858120c 100644
--- a/service/amplify/snapshot_test.go
+++ b/service/amplify/snapshot_test.go
@@ -7,7 +7,6 @@ package amplify
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/amplifybackend/snapshot_test.go b/service/amplifybackend/snapshot_test.go
index a05b7a4c94e..39919df7106 100644
--- a/service/amplifybackend/snapshot_test.go
+++ b/service/amplifybackend/snapshot_test.go
@@ -7,7 +7,6 @@ package amplifybackend
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/amplifyuibuilder/snapshot_test.go b/service/amplifyuibuilder/snapshot_test.go
index d7af3c7b51c..390d80cc84d 100644
--- a/service/amplifyuibuilder/snapshot_test.go
+++ b/service/amplifyuibuilder/snapshot_test.go
@@ -7,7 +7,6 @@ package amplifyuibuilder
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/apigateway/snapshot_test.go b/service/apigateway/snapshot_test.go
index 5c78254894a..b556f2aff65 100644
--- a/service/apigateway/snapshot_test.go
+++ b/service/apigateway/snapshot_test.go
@@ -7,7 +7,6 @@ package apigateway
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/apigatewaymanagementapi/snapshot_test.go b/service/apigatewaymanagementapi/snapshot_test.go
index a2e2360acd0..c88c63b7a2b 100644
--- a/service/apigatewaymanagementapi/snapshot_test.go
+++ b/service/apigatewaymanagementapi/snapshot_test.go
@@ -7,7 +7,6 @@ package apigatewaymanagementapi
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/apigatewayv2/snapshot_test.go b/service/apigatewayv2/snapshot_test.go
index c55db37530f..1d694ef5e14 100644
--- a/service/apigatewayv2/snapshot_test.go
+++ b/service/apigatewayv2/snapshot_test.go
@@ -7,7 +7,6 @@ package apigatewayv2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/appconfig/snapshot_test.go b/service/appconfig/snapshot_test.go
index aec5bc5da07..dd5b619f00f 100644
--- a/service/appconfig/snapshot_test.go
+++ b/service/appconfig/snapshot_test.go
@@ -7,7 +7,6 @@ package appconfig
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/appconfigdata/snapshot_test.go b/service/appconfigdata/snapshot_test.go
index 1ceb8216f50..2ee32cfbc7e 100644
--- a/service/appconfigdata/snapshot_test.go
+++ b/service/appconfigdata/snapshot_test.go
@@ -7,7 +7,6 @@ package appconfigdata
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/appfabric/snapshot_test.go b/service/appfabric/snapshot_test.go
index 7b7c431b424..7bca3f91793 100644
--- a/service/appfabric/snapshot_test.go
+++ b/service/appfabric/snapshot_test.go
@@ -7,7 +7,6 @@ package appfabric
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/appflow/snapshot_test.go b/service/appflow/snapshot_test.go
index 3a8f4ad9b91..338bd1f5060 100644
--- a/service/appflow/snapshot_test.go
+++ b/service/appflow/snapshot_test.go
@@ -7,7 +7,6 @@ package appflow
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/appintegrations/snapshot_test.go b/service/appintegrations/snapshot_test.go
index 8146cfaad97..6ff82050e7a 100644
--- a/service/appintegrations/snapshot_test.go
+++ b/service/appintegrations/snapshot_test.go
@@ -7,7 +7,6 @@ package appintegrations
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/applicationautoscaling/snapshot_test.go b/service/applicationautoscaling/snapshot_test.go
index f089f61942b..5c3d24a1ef4 100644
--- a/service/applicationautoscaling/snapshot_test.go
+++ b/service/applicationautoscaling/snapshot_test.go
@@ -7,7 +7,6 @@ package applicationautoscaling
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/applicationcostprofiler/snapshot_test.go b/service/applicationcostprofiler/snapshot_test.go
index 8fd3236db12..ce98c541098 100644
--- a/service/applicationcostprofiler/snapshot_test.go
+++ b/service/applicationcostprofiler/snapshot_test.go
@@ -7,7 +7,6 @@ package applicationcostprofiler
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/applicationdiscoveryservice/snapshot_test.go b/service/applicationdiscoveryservice/snapshot_test.go
index c12ab76efe3..5b678cadfe0 100644
--- a/service/applicationdiscoveryservice/snapshot_test.go
+++ b/service/applicationdiscoveryservice/snapshot_test.go
@@ -7,7 +7,6 @@ package applicationdiscoveryservice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/applicationinsights/snapshot_test.go b/service/applicationinsights/snapshot_test.go
index 63a06565e41..9e80458725b 100644
--- a/service/applicationinsights/snapshot_test.go
+++ b/service/applicationinsights/snapshot_test.go
@@ -7,7 +7,6 @@ package applicationinsights
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/appmesh/snapshot_test.go b/service/appmesh/snapshot_test.go
index dec9cb58ef8..4ef4b58208f 100644
--- a/service/appmesh/snapshot_test.go
+++ b/service/appmesh/snapshot_test.go
@@ -7,7 +7,6 @@ package appmesh
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/apprunner/snapshot_test.go b/service/apprunner/snapshot_test.go
index e3c538b86b3..abad1d85c47 100644
--- a/service/apprunner/snapshot_test.go
+++ b/service/apprunner/snapshot_test.go
@@ -7,7 +7,6 @@ package apprunner
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/appstream/snapshot_test.go b/service/appstream/snapshot_test.go
index 46576b0d957..776962e59f7 100644
--- a/service/appstream/snapshot_test.go
+++ b/service/appstream/snapshot_test.go
@@ -7,7 +7,6 @@ package appstream
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/appsync/snapshot_test.go b/service/appsync/snapshot_test.go
index 1158bcec336..2297ad2bb52 100644
--- a/service/appsync/snapshot_test.go
+++ b/service/appsync/snapshot_test.go
@@ -7,7 +7,6 @@ package appsync
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/arczonalshift/snapshot_test.go b/service/arczonalshift/snapshot_test.go
index 92e10e432b8..5bfda427e14 100644
--- a/service/arczonalshift/snapshot_test.go
+++ b/service/arczonalshift/snapshot_test.go
@@ -7,7 +7,6 @@ package arczonalshift
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/artifact/snapshot_test.go b/service/artifact/snapshot_test.go
index 2a6ebc2644d..74f42fdf407 100644
--- a/service/artifact/snapshot_test.go
+++ b/service/artifact/snapshot_test.go
@@ -7,7 +7,6 @@ package artifact
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/athena/snapshot_test.go b/service/athena/snapshot_test.go
index fdb8a3fdb6a..64647a839b6 100644
--- a/service/athena/snapshot_test.go
+++ b/service/athena/snapshot_test.go
@@ -7,7 +7,6 @@ package athena
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/auditmanager/snapshot_test.go b/service/auditmanager/snapshot_test.go
index 303aa22908d..19f75b45bef 100644
--- a/service/auditmanager/snapshot_test.go
+++ b/service/auditmanager/snapshot_test.go
@@ -7,7 +7,6 @@ package auditmanager
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/autoscaling/snapshot_test.go b/service/autoscaling/snapshot_test.go
index 34bc49eb435..b7ba4e6d5c3 100644
--- a/service/autoscaling/snapshot_test.go
+++ b/service/autoscaling/snapshot_test.go
@@ -7,7 +7,6 @@ package autoscaling
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/autoscalingplans/snapshot_test.go b/service/autoscalingplans/snapshot_test.go
index 89e80c4cd8c..807a044c950 100644
--- a/service/autoscalingplans/snapshot_test.go
+++ b/service/autoscalingplans/snapshot_test.go
@@ -7,7 +7,6 @@ package autoscalingplans
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/b2bi/snapshot_test.go b/service/b2bi/snapshot_test.go
index 1e8ce61cb59..ba7d889223c 100644
--- a/service/b2bi/snapshot_test.go
+++ b/service/b2bi/snapshot_test.go
@@ -7,7 +7,6 @@ package b2bi
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/backup/snapshot_test.go b/service/backup/snapshot_test.go
index d3603c9cea4..d61bd7215aa 100644
--- a/service/backup/snapshot_test.go
+++ b/service/backup/snapshot_test.go
@@ -7,7 +7,6 @@ package backup
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/backupgateway/snapshot_test.go b/service/backupgateway/snapshot_test.go
index 73448cc3b95..1ee706ea014 100644
--- a/service/backupgateway/snapshot_test.go
+++ b/service/backupgateway/snapshot_test.go
@@ -7,7 +7,6 @@ package backupgateway
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/backupstorage/snapshot_test.go b/service/backupstorage/snapshot_test.go
index 57e94811e56..eae49f6e447 100644
--- a/service/backupstorage/snapshot_test.go
+++ b/service/backupstorage/snapshot_test.go
@@ -7,7 +7,6 @@ package backupstorage
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/batch/snapshot_test.go b/service/batch/snapshot_test.go
index 408b2f32a97..6d8dcf7481f 100644
--- a/service/batch/snapshot_test.go
+++ b/service/batch/snapshot_test.go
@@ -7,7 +7,6 @@ package batch
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/bcmdataexports/snapshot_test.go b/service/bcmdataexports/snapshot_test.go
index f5e70a7edcc..9c7a7993935 100644
--- a/service/bcmdataexports/snapshot_test.go
+++ b/service/bcmdataexports/snapshot_test.go
@@ -7,7 +7,6 @@ package bcmdataexports
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/bedrock/snapshot_test.go b/service/bedrock/snapshot_test.go
index 7373dbb6a3e..8c00696dc74 100644
--- a/service/bedrock/snapshot_test.go
+++ b/service/bedrock/snapshot_test.go
@@ -7,7 +7,6 @@ package bedrock
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/bedrockagent/snapshot_test.go b/service/bedrockagent/snapshot_test.go
index de6a7adf1ad..ae5b4c9fdba 100644
--- a/service/bedrockagent/snapshot_test.go
+++ b/service/bedrockagent/snapshot_test.go
@@ -7,7 +7,6 @@ package bedrockagent
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/bedrockagentruntime/snapshot_test.go b/service/bedrockagentruntime/snapshot_test.go
index 6c4f5f4032d..622b571e837 100644
--- a/service/bedrockagentruntime/snapshot_test.go
+++ b/service/bedrockagentruntime/snapshot_test.go
@@ -7,7 +7,6 @@ package bedrockagentruntime
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/bedrockruntime/snapshot_test.go b/service/bedrockruntime/snapshot_test.go
index 7c9a31bf7c0..7d8dbb44fbd 100644
--- a/service/bedrockruntime/snapshot_test.go
+++ b/service/bedrockruntime/snapshot_test.go
@@ -7,7 +7,6 @@ package bedrockruntime
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/billingconductor/snapshot_test.go b/service/billingconductor/snapshot_test.go
index e963deb5a7d..a72223c1ebc 100644
--- a/service/billingconductor/snapshot_test.go
+++ b/service/billingconductor/snapshot_test.go
@@ -7,7 +7,6 @@ package billingconductor
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/braket/snapshot_test.go b/service/braket/snapshot_test.go
index 4b129861451..e1cf96bf7f6 100644
--- a/service/braket/snapshot_test.go
+++ b/service/braket/snapshot_test.go
@@ -7,7 +7,6 @@ package braket
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/budgets/snapshot_test.go b/service/budgets/snapshot_test.go
index 8fa3c3aa2a6..30b034f9602 100644
--- a/service/budgets/snapshot_test.go
+++ b/service/budgets/snapshot_test.go
@@ -7,7 +7,6 @@ package budgets
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/chatbot/snapshot_test.go b/service/chatbot/snapshot_test.go
index d4a6b295805..7313429bfd2 100644
--- a/service/chatbot/snapshot_test.go
+++ b/service/chatbot/snapshot_test.go
@@ -7,7 +7,6 @@ package chatbot
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/chime/snapshot_test.go b/service/chime/snapshot_test.go
index eaf48316e03..153da55c535 100644
--- a/service/chime/snapshot_test.go
+++ b/service/chime/snapshot_test.go
@@ -7,7 +7,6 @@ package chime
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/chimesdkidentity/snapshot_test.go b/service/chimesdkidentity/snapshot_test.go
index defb93ac764..dc3838bc4a1 100644
--- a/service/chimesdkidentity/snapshot_test.go
+++ b/service/chimesdkidentity/snapshot_test.go
@@ -7,7 +7,6 @@ package chimesdkidentity
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/chimesdkmediapipelines/snapshot_test.go b/service/chimesdkmediapipelines/snapshot_test.go
index 75b199f6746..12fe5a633f6 100644
--- a/service/chimesdkmediapipelines/snapshot_test.go
+++ b/service/chimesdkmediapipelines/snapshot_test.go
@@ -7,7 +7,6 @@ package chimesdkmediapipelines
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/chimesdkmeetings/snapshot_test.go b/service/chimesdkmeetings/snapshot_test.go
index f1cae00217a..2277ed45581 100644
--- a/service/chimesdkmeetings/snapshot_test.go
+++ b/service/chimesdkmeetings/snapshot_test.go
@@ -7,7 +7,6 @@ package chimesdkmeetings
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/chimesdkmessaging/snapshot_test.go b/service/chimesdkmessaging/snapshot_test.go
index 1a9843d79c4..ba738d9d18c 100644
--- a/service/chimesdkmessaging/snapshot_test.go
+++ b/service/chimesdkmessaging/snapshot_test.go
@@ -7,7 +7,6 @@ package chimesdkmessaging
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/chimesdkvoice/snapshot_test.go b/service/chimesdkvoice/snapshot_test.go
index bb346d831ac..c9d6521ebbc 100644
--- a/service/chimesdkvoice/snapshot_test.go
+++ b/service/chimesdkvoice/snapshot_test.go
@@ -7,7 +7,6 @@ package chimesdkvoice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cleanrooms/snapshot_test.go b/service/cleanrooms/snapshot_test.go
index 9aeb07958c1..2f84071db21 100644
--- a/service/cleanrooms/snapshot_test.go
+++ b/service/cleanrooms/snapshot_test.go
@@ -7,7 +7,6 @@ package cleanrooms
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cleanroomsml/snapshot_test.go b/service/cleanroomsml/snapshot_test.go
index 1c61ad2f2d5..264bc1ee69f 100644
--- a/service/cleanroomsml/snapshot_test.go
+++ b/service/cleanroomsml/snapshot_test.go
@@ -7,7 +7,6 @@ package cleanroomsml
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloud9/snapshot_test.go b/service/cloud9/snapshot_test.go
index d423509bdc1..f91d772eca3 100644
--- a/service/cloud9/snapshot_test.go
+++ b/service/cloud9/snapshot_test.go
@@ -7,7 +7,6 @@ package cloud9
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudcontrol/snapshot_test.go b/service/cloudcontrol/snapshot_test.go
index a463fc9bc5e..40db6427ff2 100644
--- a/service/cloudcontrol/snapshot_test.go
+++ b/service/cloudcontrol/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudcontrol
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/clouddirectory/snapshot_test.go b/service/clouddirectory/snapshot_test.go
index 8469d74f04e..d050c3e0336 100644
--- a/service/clouddirectory/snapshot_test.go
+++ b/service/clouddirectory/snapshot_test.go
@@ -7,7 +7,6 @@ package clouddirectory
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudformation/snapshot_test.go b/service/cloudformation/snapshot_test.go
index b67333a91f7..3778b71af89 100644
--- a/service/cloudformation/snapshot_test.go
+++ b/service/cloudformation/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudformation
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudfront/snapshot_test.go b/service/cloudfront/snapshot_test.go
index 9c1804e59c3..8a64596f5a7 100644
--- a/service/cloudfront/snapshot_test.go
+++ b/service/cloudfront/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudfront
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudfrontkeyvaluestore/snapshot_test.go b/service/cloudfrontkeyvaluestore/snapshot_test.go
index 9b4a2537428..cede4a854e6 100644
--- a/service/cloudfrontkeyvaluestore/snapshot_test.go
+++ b/service/cloudfrontkeyvaluestore/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudfrontkeyvaluestore
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudhsm/snapshot_test.go b/service/cloudhsm/snapshot_test.go
index d48e09001e4..9b2cedc4ced 100644
--- a/service/cloudhsm/snapshot_test.go
+++ b/service/cloudhsm/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudhsm
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudhsmv2/snapshot_test.go b/service/cloudhsmv2/snapshot_test.go
index 6f9822e58d5..f8934e7d774 100644
--- a/service/cloudhsmv2/snapshot_test.go
+++ b/service/cloudhsmv2/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudhsmv2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudsearch/snapshot_test.go b/service/cloudsearch/snapshot_test.go
index ccb431c5c0a..cb0da436a34 100644
--- a/service/cloudsearch/snapshot_test.go
+++ b/service/cloudsearch/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudsearch
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudsearchdomain/snapshot_test.go b/service/cloudsearchdomain/snapshot_test.go
index a37e3ae91fc..09a63b80db4 100644
--- a/service/cloudsearchdomain/snapshot_test.go
+++ b/service/cloudsearchdomain/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudsearchdomain
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudtrail/snapshot_test.go b/service/cloudtrail/snapshot_test.go
index ac48cca7dec..689b690f417 100644
--- a/service/cloudtrail/snapshot_test.go
+++ b/service/cloudtrail/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudtrail
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudtraildata/snapshot_test.go b/service/cloudtraildata/snapshot_test.go
index b620f0f5c23..73c73ed0b1c 100644
--- a/service/cloudtraildata/snapshot_test.go
+++ b/service/cloudtraildata/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudtraildata
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudwatch/snapshot_test.go b/service/cloudwatch/snapshot_test.go
index 957c4e8d9e9..8a9fc367612 100644
--- a/service/cloudwatch/snapshot_test.go
+++ b/service/cloudwatch/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudwatch
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudwatchevents/snapshot_test.go b/service/cloudwatchevents/snapshot_test.go
index c17936ff528..125bd0f6760 100644
--- a/service/cloudwatchevents/snapshot_test.go
+++ b/service/cloudwatchevents/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudwatchevents
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cloudwatchlogs/snapshot_test.go b/service/cloudwatchlogs/snapshot_test.go
index 64e4a3fa757..15dd9d33e54 100644
--- a/service/cloudwatchlogs/snapshot_test.go
+++ b/service/cloudwatchlogs/snapshot_test.go
@@ -7,7 +7,6 @@ package cloudwatchlogs
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/codeartifact/snapshot_test.go b/service/codeartifact/snapshot_test.go
index 23b34062396..428ff3fc5f6 100644
--- a/service/codeartifact/snapshot_test.go
+++ b/service/codeartifact/snapshot_test.go
@@ -7,7 +7,6 @@ package codeartifact
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/codebuild/snapshot_test.go b/service/codebuild/snapshot_test.go
index f6fba8a64e0..b9ef50e777f 100644
--- a/service/codebuild/snapshot_test.go
+++ b/service/codebuild/snapshot_test.go
@@ -7,7 +7,6 @@ package codebuild
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/codecatalyst/snapshot_test.go b/service/codecatalyst/snapshot_test.go
index 7824f6bd075..3419d5272fd 100644
--- a/service/codecatalyst/snapshot_test.go
+++ b/service/codecatalyst/snapshot_test.go
@@ -7,7 +7,6 @@ package codecatalyst
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/codecommit/snapshot_test.go b/service/codecommit/snapshot_test.go
index 7349800f609..a1a0c46c27a 100644
--- a/service/codecommit/snapshot_test.go
+++ b/service/codecommit/snapshot_test.go
@@ -7,7 +7,6 @@ package codecommit
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/codedeploy/snapshot_test.go b/service/codedeploy/snapshot_test.go
index efe24f405df..75031b811c4 100644
--- a/service/codedeploy/snapshot_test.go
+++ b/service/codedeploy/snapshot_test.go
@@ -7,7 +7,6 @@ package codedeploy
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/codeguruprofiler/snapshot_test.go b/service/codeguruprofiler/snapshot_test.go
index ae4872b4c5d..4af4ff55376 100644
--- a/service/codeguruprofiler/snapshot_test.go
+++ b/service/codeguruprofiler/snapshot_test.go
@@ -7,7 +7,6 @@ package codeguruprofiler
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/codegurureviewer/snapshot_test.go b/service/codegurureviewer/snapshot_test.go
index 366333cafc7..ab3054cfc0e 100644
--- a/service/codegurureviewer/snapshot_test.go
+++ b/service/codegurureviewer/snapshot_test.go
@@ -7,7 +7,6 @@ package codegurureviewer
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/codegurusecurity/snapshot_test.go b/service/codegurusecurity/snapshot_test.go
index a1764870b59..ebc9b88088c 100644
--- a/service/codegurusecurity/snapshot_test.go
+++ b/service/codegurusecurity/snapshot_test.go
@@ -7,7 +7,6 @@ package codegurusecurity
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/codepipeline/snapshot_test.go b/service/codepipeline/snapshot_test.go
index 667b00eb203..57103f2823e 100644
--- a/service/codepipeline/snapshot_test.go
+++ b/service/codepipeline/snapshot_test.go
@@ -7,7 +7,6 @@ package codepipeline
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/codestar/snapshot_test.go b/service/codestar/snapshot_test.go
index d2512e0b538..da5683e22ed 100644
--- a/service/codestar/snapshot_test.go
+++ b/service/codestar/snapshot_test.go
@@ -7,7 +7,6 @@ package codestar
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/codestarconnections/snapshot_test.go b/service/codestarconnections/snapshot_test.go
index 8aa1c088957..14c4b9cbcb8 100644
--- a/service/codestarconnections/snapshot_test.go
+++ b/service/codestarconnections/snapshot_test.go
@@ -7,7 +7,6 @@ package codestarconnections
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/codestarnotifications/snapshot_test.go b/service/codestarnotifications/snapshot_test.go
index 5f834767b6e..3fd7429ca8e 100644
--- a/service/codestarnotifications/snapshot_test.go
+++ b/service/codestarnotifications/snapshot_test.go
@@ -7,7 +7,6 @@ package codestarnotifications
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cognitoidentity/snapshot_test.go b/service/cognitoidentity/snapshot_test.go
index a0e882faf56..5bddcc4a00f 100644
--- a/service/cognitoidentity/snapshot_test.go
+++ b/service/cognitoidentity/snapshot_test.go
@@ -7,7 +7,6 @@ package cognitoidentity
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cognitoidentityprovider/snapshot_test.go b/service/cognitoidentityprovider/snapshot_test.go
index 3c6a7fa7b18..297c65f7681 100644
--- a/service/cognitoidentityprovider/snapshot_test.go
+++ b/service/cognitoidentityprovider/snapshot_test.go
@@ -7,7 +7,6 @@ package cognitoidentityprovider
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/cognitosync/snapshot_test.go b/service/cognitosync/snapshot_test.go
index 389480774bf..f651213782b 100644
--- a/service/cognitosync/snapshot_test.go
+++ b/service/cognitosync/snapshot_test.go
@@ -7,7 +7,6 @@ package cognitosync
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/comprehend/snapshot_test.go b/service/comprehend/snapshot_test.go
index 709e848e9a7..4218a905f15 100644
--- a/service/comprehend/snapshot_test.go
+++ b/service/comprehend/snapshot_test.go
@@ -7,7 +7,6 @@ package comprehend
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/comprehendmedical/snapshot_test.go b/service/comprehendmedical/snapshot_test.go
index 3d1af533dcd..ab3188a265c 100644
--- a/service/comprehendmedical/snapshot_test.go
+++ b/service/comprehendmedical/snapshot_test.go
@@ -7,7 +7,6 @@ package comprehendmedical
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/computeoptimizer/snapshot_test.go b/service/computeoptimizer/snapshot_test.go
index 9089333198f..13d123364c8 100644
--- a/service/computeoptimizer/snapshot_test.go
+++ b/service/computeoptimizer/snapshot_test.go
@@ -7,7 +7,6 @@ package computeoptimizer
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/configservice/snapshot_test.go b/service/configservice/snapshot_test.go
index 3b88ec2dab9..7074c2fffac 100644
--- a/service/configservice/snapshot_test.go
+++ b/service/configservice/snapshot_test.go
@@ -7,7 +7,6 @@ package configservice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/connect/snapshot_test.go b/service/connect/snapshot_test.go
index 34e223aaf53..95600e41d36 100644
--- a/service/connect/snapshot_test.go
+++ b/service/connect/snapshot_test.go
@@ -7,7 +7,6 @@ package connect
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/connectcampaigns/snapshot_test.go b/service/connectcampaigns/snapshot_test.go
index 8c5a40ca362..f3a0bd62e54 100644
--- a/service/connectcampaigns/snapshot_test.go
+++ b/service/connectcampaigns/snapshot_test.go
@@ -7,7 +7,6 @@ package connectcampaigns
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/connectcases/snapshot_test.go b/service/connectcases/snapshot_test.go
index 64cd3362162..2a3529e70ba 100644
--- a/service/connectcases/snapshot_test.go
+++ b/service/connectcases/snapshot_test.go
@@ -7,7 +7,6 @@ package connectcases
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/connectcontactlens/snapshot_test.go b/service/connectcontactlens/snapshot_test.go
index 28e559018e0..766b46a969f 100644
--- a/service/connectcontactlens/snapshot_test.go
+++ b/service/connectcontactlens/snapshot_test.go
@@ -7,7 +7,6 @@ package connectcontactlens
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/connectparticipant/snapshot_test.go b/service/connectparticipant/snapshot_test.go
index 11dc7ed8037..43801bcd67e 100644
--- a/service/connectparticipant/snapshot_test.go
+++ b/service/connectparticipant/snapshot_test.go
@@ -7,7 +7,6 @@ package connectparticipant
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/controltower/snapshot_test.go b/service/controltower/snapshot_test.go
index bd9e079ef85..e14f85b158e 100644
--- a/service/controltower/snapshot_test.go
+++ b/service/controltower/snapshot_test.go
@@ -7,7 +7,6 @@ package controltower
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/costandusagereportservice/snapshot_test.go b/service/costandusagereportservice/snapshot_test.go
index 7f673ee6d79..9373c1dd09e 100644
--- a/service/costandusagereportservice/snapshot_test.go
+++ b/service/costandusagereportservice/snapshot_test.go
@@ -7,7 +7,6 @@ package costandusagereportservice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/costexplorer/snapshot_test.go b/service/costexplorer/snapshot_test.go
index 08d3faa4065..6d471e064d1 100644
--- a/service/costexplorer/snapshot_test.go
+++ b/service/costexplorer/snapshot_test.go
@@ -7,7 +7,6 @@ package costexplorer
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/costoptimizationhub/snapshot_test.go b/service/costoptimizationhub/snapshot_test.go
index d1ecaa3ae89..670c9497d73 100644
--- a/service/costoptimizationhub/snapshot_test.go
+++ b/service/costoptimizationhub/snapshot_test.go
@@ -7,7 +7,6 @@ package costoptimizationhub
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/customerprofiles/snapshot_test.go b/service/customerprofiles/snapshot_test.go
index d29b4afa200..c01d00e1b61 100644
--- a/service/customerprofiles/snapshot_test.go
+++ b/service/customerprofiles/snapshot_test.go
@@ -7,7 +7,6 @@ package customerprofiles
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/databasemigrationservice/snapshot_test.go b/service/databasemigrationservice/snapshot_test.go
index 55b82bf8d38..2c3fa72bae0 100644
--- a/service/databasemigrationservice/snapshot_test.go
+++ b/service/databasemigrationservice/snapshot_test.go
@@ -7,7 +7,6 @@ package databasemigrationservice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/databrew/snapshot_test.go b/service/databrew/snapshot_test.go
index 7c47164a26c..4722b0170dd 100644
--- a/service/databrew/snapshot_test.go
+++ b/service/databrew/snapshot_test.go
@@ -7,7 +7,6 @@ package databrew
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/dataexchange/snapshot_test.go b/service/dataexchange/snapshot_test.go
index 039fe1fc9fb..00f4d554589 100644
--- a/service/dataexchange/snapshot_test.go
+++ b/service/dataexchange/snapshot_test.go
@@ -7,7 +7,6 @@ package dataexchange
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/datapipeline/snapshot_test.go b/service/datapipeline/snapshot_test.go
index b3dc0236db7..1c5380f79a5 100644
--- a/service/datapipeline/snapshot_test.go
+++ b/service/datapipeline/snapshot_test.go
@@ -7,7 +7,6 @@ package datapipeline
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/datasync/snapshot_test.go b/service/datasync/snapshot_test.go
index fea6753b3e6..06e010cb17c 100644
--- a/service/datasync/snapshot_test.go
+++ b/service/datasync/snapshot_test.go
@@ -7,7 +7,6 @@ package datasync
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/datazone/snapshot_test.go b/service/datazone/snapshot_test.go
index 57a1ad52be8..abfed98a4d2 100644
--- a/service/datazone/snapshot_test.go
+++ b/service/datazone/snapshot_test.go
@@ -7,7 +7,6 @@ package datazone
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/dax/snapshot_test.go b/service/dax/snapshot_test.go
index 0dcff28fae4..bc515dd0595 100644
--- a/service/dax/snapshot_test.go
+++ b/service/dax/snapshot_test.go
@@ -7,7 +7,6 @@ package dax
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/detective/snapshot_test.go b/service/detective/snapshot_test.go
index b5e7488097c..6340f045e21 100644
--- a/service/detective/snapshot_test.go
+++ b/service/detective/snapshot_test.go
@@ -7,7 +7,6 @@ package detective
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/devicefarm/snapshot_test.go b/service/devicefarm/snapshot_test.go
index b29fa1e45db..f422bbb7f70 100644
--- a/service/devicefarm/snapshot_test.go
+++ b/service/devicefarm/snapshot_test.go
@@ -7,7 +7,6 @@ package devicefarm
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/devopsguru/snapshot_test.go b/service/devopsguru/snapshot_test.go
index 07a545aaaf2..a4f3d7efd86 100644
--- a/service/devopsguru/snapshot_test.go
+++ b/service/devopsguru/snapshot_test.go
@@ -7,7 +7,6 @@ package devopsguru
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/directconnect/snapshot_test.go b/service/directconnect/snapshot_test.go
index a74ef56a850..7ed7971cddb 100644
--- a/service/directconnect/snapshot_test.go
+++ b/service/directconnect/snapshot_test.go
@@ -7,7 +7,6 @@ package directconnect
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/directoryservice/snapshot_test.go b/service/directoryservice/snapshot_test.go
index 19904fe0357..6148d4ab45a 100644
--- a/service/directoryservice/snapshot_test.go
+++ b/service/directoryservice/snapshot_test.go
@@ -7,7 +7,6 @@ package directoryservice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/dlm/snapshot_test.go b/service/dlm/snapshot_test.go
index 94e1a86d1ef..6d0b47ed8cc 100644
--- a/service/dlm/snapshot_test.go
+++ b/service/dlm/snapshot_test.go
@@ -7,7 +7,6 @@ package dlm
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/docdb/snapshot_test.go b/service/docdb/snapshot_test.go
index 10e0f034ff7..1926bb0b644 100644
--- a/service/docdb/snapshot_test.go
+++ b/service/docdb/snapshot_test.go
@@ -7,7 +7,6 @@ package docdb
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/docdbelastic/snapshot_test.go b/service/docdbelastic/snapshot_test.go
index 1ddbf1128b0..36536095906 100644
--- a/service/docdbelastic/snapshot_test.go
+++ b/service/docdbelastic/snapshot_test.go
@@ -7,7 +7,6 @@ package docdbelastic
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/drs/snapshot_test.go b/service/drs/snapshot_test.go
index 47093f4f975..12bec035d28 100644
--- a/service/drs/snapshot_test.go
+++ b/service/drs/snapshot_test.go
@@ -7,7 +7,6 @@ package drs
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/dynamodb/snapshot_test.go b/service/dynamodb/snapshot_test.go
index efb747fa3f7..0e04b01480f 100644
--- a/service/dynamodb/snapshot_test.go
+++ b/service/dynamodb/snapshot_test.go
@@ -7,7 +7,6 @@ package dynamodb
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/dynamodbstreams/snapshot_test.go b/service/dynamodbstreams/snapshot_test.go
index a3baf7db8f4..a7c64c90b2e 100644
--- a/service/dynamodbstreams/snapshot_test.go
+++ b/service/dynamodbstreams/snapshot_test.go
@@ -7,7 +7,6 @@ package dynamodbstreams
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ebs/snapshot_test.go b/service/ebs/snapshot_test.go
index 8bfe2cbda56..d934e568666 100644
--- a/service/ebs/snapshot_test.go
+++ b/service/ebs/snapshot_test.go
@@ -7,7 +7,6 @@ package ebs
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ec2/snapshot_test.go b/service/ec2/snapshot_test.go
index 4f6d5c5dbd7..164019d7d7c 100644
--- a/service/ec2/snapshot_test.go
+++ b/service/ec2/snapshot_test.go
@@ -7,7 +7,6 @@ package ec2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ec2instanceconnect/snapshot_test.go b/service/ec2instanceconnect/snapshot_test.go
index 0bc32a806a8..fb80502fa63 100644
--- a/service/ec2instanceconnect/snapshot_test.go
+++ b/service/ec2instanceconnect/snapshot_test.go
@@ -7,7 +7,6 @@ package ec2instanceconnect
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ecr/snapshot_test.go b/service/ecr/snapshot_test.go
index 42e16d95d39..9506427f2ab 100644
--- a/service/ecr/snapshot_test.go
+++ b/service/ecr/snapshot_test.go
@@ -7,7 +7,6 @@ package ecr
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ecrpublic/snapshot_test.go b/service/ecrpublic/snapshot_test.go
index 474285c8dd7..dcadf857d80 100644
--- a/service/ecrpublic/snapshot_test.go
+++ b/service/ecrpublic/snapshot_test.go
@@ -7,7 +7,6 @@ package ecrpublic
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ecs/snapshot_test.go b/service/ecs/snapshot_test.go
index b6d9d2e2968..57681bab17c 100644
--- a/service/ecs/snapshot_test.go
+++ b/service/ecs/snapshot_test.go
@@ -7,7 +7,6 @@ package ecs
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/efs/snapshot_test.go b/service/efs/snapshot_test.go
index 29f4c9f11ff..19a2a1778e2 100644
--- a/service/efs/snapshot_test.go
+++ b/service/efs/snapshot_test.go
@@ -7,7 +7,6 @@ package efs
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/eks/snapshot_test.go b/service/eks/snapshot_test.go
index 88a0e070ac5..41734629bb5 100644
--- a/service/eks/snapshot_test.go
+++ b/service/eks/snapshot_test.go
@@ -7,7 +7,6 @@ package eks
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/eksauth/snapshot_test.go b/service/eksauth/snapshot_test.go
index fab552992d8..043f2bd7215 100644
--- a/service/eksauth/snapshot_test.go
+++ b/service/eksauth/snapshot_test.go
@@ -7,7 +7,6 @@ package eksauth
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/elasticache/snapshot_test.go b/service/elasticache/snapshot_test.go
index 51dc16efc36..1c31147683e 100644
--- a/service/elasticache/snapshot_test.go
+++ b/service/elasticache/snapshot_test.go
@@ -7,7 +7,6 @@ package elasticache
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/elasticbeanstalk/snapshot_test.go b/service/elasticbeanstalk/snapshot_test.go
index 71ffecb869b..e4eb550b7ae 100644
--- a/service/elasticbeanstalk/snapshot_test.go
+++ b/service/elasticbeanstalk/snapshot_test.go
@@ -7,7 +7,6 @@ package elasticbeanstalk
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/elasticinference/snapshot_test.go b/service/elasticinference/snapshot_test.go
index d8055c4b125..ae146319d6e 100644
--- a/service/elasticinference/snapshot_test.go
+++ b/service/elasticinference/snapshot_test.go
@@ -7,7 +7,6 @@ package elasticinference
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/elasticloadbalancing/snapshot_test.go b/service/elasticloadbalancing/snapshot_test.go
index 002b5d2c975..185534920d4 100644
--- a/service/elasticloadbalancing/snapshot_test.go
+++ b/service/elasticloadbalancing/snapshot_test.go
@@ -7,7 +7,6 @@ package elasticloadbalancing
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/elasticloadbalancingv2/snapshot_test.go b/service/elasticloadbalancingv2/snapshot_test.go
index 00ce5d08895..f7ef7b91bc9 100644
--- a/service/elasticloadbalancingv2/snapshot_test.go
+++ b/service/elasticloadbalancingv2/snapshot_test.go
@@ -7,7 +7,6 @@ package elasticloadbalancingv2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/elasticsearchservice/snapshot_test.go b/service/elasticsearchservice/snapshot_test.go
index c64071a530d..89e08e97de1 100644
--- a/service/elasticsearchservice/snapshot_test.go
+++ b/service/elasticsearchservice/snapshot_test.go
@@ -7,7 +7,6 @@ package elasticsearchservice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/elastictranscoder/snapshot_test.go b/service/elastictranscoder/snapshot_test.go
index 0c2f5dce672..2de68e797da 100644
--- a/service/elastictranscoder/snapshot_test.go
+++ b/service/elastictranscoder/snapshot_test.go
@@ -7,7 +7,6 @@ package elastictranscoder
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/emr/snapshot_test.go b/service/emr/snapshot_test.go
index 07790b276f6..38c32842417 100644
--- a/service/emr/snapshot_test.go
+++ b/service/emr/snapshot_test.go
@@ -7,7 +7,6 @@ package emr
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/emrcontainers/snapshot_test.go b/service/emrcontainers/snapshot_test.go
index f9d6489a26c..fdfa423fde1 100644
--- a/service/emrcontainers/snapshot_test.go
+++ b/service/emrcontainers/snapshot_test.go
@@ -7,7 +7,6 @@ package emrcontainers
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/emrserverless/snapshot_test.go b/service/emrserverless/snapshot_test.go
index eb1f86b60e4..acb0a01a2b5 100644
--- a/service/emrserverless/snapshot_test.go
+++ b/service/emrserverless/snapshot_test.go
@@ -7,7 +7,6 @@ package emrserverless
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/entityresolution/snapshot_test.go b/service/entityresolution/snapshot_test.go
index a6919fc896a..02bc33986e0 100644
--- a/service/entityresolution/snapshot_test.go
+++ b/service/entityresolution/snapshot_test.go
@@ -7,7 +7,6 @@ package entityresolution
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/eventbridge/snapshot_test.go b/service/eventbridge/snapshot_test.go
index 34ac2795af0..bf99797d1a4 100644
--- a/service/eventbridge/snapshot_test.go
+++ b/service/eventbridge/snapshot_test.go
@@ -7,7 +7,6 @@ package eventbridge
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/evidently/snapshot_test.go b/service/evidently/snapshot_test.go
index 33c1b9c8ea0..fd5ab1215fa 100644
--- a/service/evidently/snapshot_test.go
+++ b/service/evidently/snapshot_test.go
@@ -7,7 +7,6 @@ package evidently
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/finspace/snapshot_test.go b/service/finspace/snapshot_test.go
index e1659a21be9..ff643899efb 100644
--- a/service/finspace/snapshot_test.go
+++ b/service/finspace/snapshot_test.go
@@ -7,7 +7,6 @@ package finspace
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/finspacedata/snapshot_test.go b/service/finspacedata/snapshot_test.go
index 4b6ae2873a5..95bf22bc9dc 100644
--- a/service/finspacedata/snapshot_test.go
+++ b/service/finspacedata/snapshot_test.go
@@ -7,7 +7,6 @@ package finspacedata
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/firehose/snapshot_test.go b/service/firehose/snapshot_test.go
index 948ab191a1a..6cf0c89dc3b 100644
--- a/service/firehose/snapshot_test.go
+++ b/service/firehose/snapshot_test.go
@@ -7,7 +7,6 @@ package firehose
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/fis/snapshot_test.go b/service/fis/snapshot_test.go
index 297c59d7081..5584bea1ffc 100644
--- a/service/fis/snapshot_test.go
+++ b/service/fis/snapshot_test.go
@@ -7,7 +7,6 @@ package fis
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/fms/snapshot_test.go b/service/fms/snapshot_test.go
index 0cf991de94f..9553ed0a391 100644
--- a/service/fms/snapshot_test.go
+++ b/service/fms/snapshot_test.go
@@ -7,7 +7,6 @@ package fms
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/forecast/snapshot_test.go b/service/forecast/snapshot_test.go
index 2d9bb1d51cb..08df6e33a5f 100644
--- a/service/forecast/snapshot_test.go
+++ b/service/forecast/snapshot_test.go
@@ -7,7 +7,6 @@ package forecast
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/forecastquery/snapshot_test.go b/service/forecastquery/snapshot_test.go
index dc9a2be3620..e13ba186c33 100644
--- a/service/forecastquery/snapshot_test.go
+++ b/service/forecastquery/snapshot_test.go
@@ -7,7 +7,6 @@ package forecastquery
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/frauddetector/snapshot_test.go b/service/frauddetector/snapshot_test.go
index 373442168a4..081e047b902 100644
--- a/service/frauddetector/snapshot_test.go
+++ b/service/frauddetector/snapshot_test.go
@@ -7,7 +7,6 @@ package frauddetector
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/freetier/snapshot_test.go b/service/freetier/snapshot_test.go
index 06d540d90a6..31ffe4a4ae4 100644
--- a/service/freetier/snapshot_test.go
+++ b/service/freetier/snapshot_test.go
@@ -7,7 +7,6 @@ package freetier
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/fsx/snapshot_test.go b/service/fsx/snapshot_test.go
index a7112498531..99ff49a1fd2 100644
--- a/service/fsx/snapshot_test.go
+++ b/service/fsx/snapshot_test.go
@@ -7,7 +7,6 @@ package fsx
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/gamelift/snapshot_test.go b/service/gamelift/snapshot_test.go
index 9780f475066..e4600fcd53c 100644
--- a/service/gamelift/snapshot_test.go
+++ b/service/gamelift/snapshot_test.go
@@ -7,7 +7,6 @@ package gamelift
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/glacier/snapshot_test.go b/service/glacier/snapshot_test.go
index f6409ed99ad..1677dd09a33 100644
--- a/service/glacier/snapshot_test.go
+++ b/service/glacier/snapshot_test.go
@@ -7,7 +7,6 @@ package glacier
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/globalaccelerator/snapshot_test.go b/service/globalaccelerator/snapshot_test.go
index fe2bf3665ea..09a55f3b847 100644
--- a/service/globalaccelerator/snapshot_test.go
+++ b/service/globalaccelerator/snapshot_test.go
@@ -7,7 +7,6 @@ package globalaccelerator
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/glue/snapshot_test.go b/service/glue/snapshot_test.go
index 39e5444eeb6..dae7184aff3 100644
--- a/service/glue/snapshot_test.go
+++ b/service/glue/snapshot_test.go
@@ -7,7 +7,6 @@ package glue
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/grafana/snapshot_test.go b/service/grafana/snapshot_test.go
index 6fa509e60e6..997738897f1 100644
--- a/service/grafana/snapshot_test.go
+++ b/service/grafana/snapshot_test.go
@@ -7,7 +7,6 @@ package grafana
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/greengrass/snapshot_test.go b/service/greengrass/snapshot_test.go
index d81495db0d1..0e8eed3357f 100644
--- a/service/greengrass/snapshot_test.go
+++ b/service/greengrass/snapshot_test.go
@@ -7,7 +7,6 @@ package greengrass
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/greengrassv2/snapshot_test.go b/service/greengrassv2/snapshot_test.go
index a8ecc68a9f1..485dde37827 100644
--- a/service/greengrassv2/snapshot_test.go
+++ b/service/greengrassv2/snapshot_test.go
@@ -7,7 +7,6 @@ package greengrassv2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/groundstation/snapshot_test.go b/service/groundstation/snapshot_test.go
index 2806e7990c0..4b494ec41a2 100644
--- a/service/groundstation/snapshot_test.go
+++ b/service/groundstation/snapshot_test.go
@@ -7,7 +7,6 @@ package groundstation
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/guardduty/snapshot_test.go b/service/guardduty/snapshot_test.go
index 7b2c7936a94..5adc94e36b5 100644
--- a/service/guardduty/snapshot_test.go
+++ b/service/guardduty/snapshot_test.go
@@ -7,7 +7,6 @@ package guardduty
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/health/snapshot_test.go b/service/health/snapshot_test.go
index 776abc5e05b..3a763f354cd 100644
--- a/service/health/snapshot_test.go
+++ b/service/health/snapshot_test.go
@@ -7,7 +7,6 @@ package health
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/healthlake/snapshot_test.go b/service/healthlake/snapshot_test.go
index d2761717b65..dc2fe89d271 100644
--- a/service/healthlake/snapshot_test.go
+++ b/service/healthlake/snapshot_test.go
@@ -7,7 +7,6 @@ package healthlake
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/honeycode/snapshot_test.go b/service/honeycode/snapshot_test.go
index 849cbd98008..fea40d5ebd3 100644
--- a/service/honeycode/snapshot_test.go
+++ b/service/honeycode/snapshot_test.go
@@ -7,7 +7,6 @@ package honeycode
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iam/snapshot_test.go b/service/iam/snapshot_test.go
index ba42e383e1c..c97804f0d2e 100644
--- a/service/iam/snapshot_test.go
+++ b/service/iam/snapshot_test.go
@@ -7,7 +7,6 @@ package iam
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/identitystore/snapshot_test.go b/service/identitystore/snapshot_test.go
index bfcd6be49e8..12d2d4642e1 100644
--- a/service/identitystore/snapshot_test.go
+++ b/service/identitystore/snapshot_test.go
@@ -7,7 +7,6 @@ package identitystore
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/imagebuilder/snapshot_test.go b/service/imagebuilder/snapshot_test.go
index a943a709c74..eaf3dd104f3 100644
--- a/service/imagebuilder/snapshot_test.go
+++ b/service/imagebuilder/snapshot_test.go
@@ -7,7 +7,6 @@ package imagebuilder
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/inspector/snapshot_test.go b/service/inspector/snapshot_test.go
index 18af410b740..cb32547fcf1 100644
--- a/service/inspector/snapshot_test.go
+++ b/service/inspector/snapshot_test.go
@@ -7,7 +7,6 @@ package inspector
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/inspector2/snapshot_test.go b/service/inspector2/snapshot_test.go
index 409ea60e453..bf42802ec54 100644
--- a/service/inspector2/snapshot_test.go
+++ b/service/inspector2/snapshot_test.go
@@ -7,7 +7,6 @@ package inspector2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/inspectorscan/snapshot_test.go b/service/inspectorscan/snapshot_test.go
index 45851f7aa89..2b0c515dd42 100644
--- a/service/inspectorscan/snapshot_test.go
+++ b/service/inspectorscan/snapshot_test.go
@@ -7,7 +7,6 @@ package inspectorscan
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/internetmonitor/api_op_StartQuery.go b/service/internetmonitor/api_op_StartQuery.go
index 624f6f492ee..fba96597cdc 100644
--- a/service/internetmonitor/api_op_StartQuery.go
+++ b/service/internetmonitor/api_op_StartQuery.go
@@ -50,9 +50,13 @@ type StartQueryInput struct {
 
 	// The type of query to run. The following are the three types of queries that you
 	// can run using the Internet Monitor query interface:
-	//   - MEASUREMENTS : TBD definition
-	//   - TOP_LOCATIONS : TBD definition
-	//   - TOP_LOCATION_DETAILS : TBD definition
+	//   - MEASUREMENTS : Provides availability score, performance score, total
+	//   traffic, and round-trip times, at 5 minute intervals.
+	//   - TOP_LOCATIONS : Provides availability score, performance score, total
+	//   traffic, and time to first byte (TTFB) information, for the top location and ASN
+	//   combinations that you're monitoring, by traffic volume.
+	//   - TOP_LOCATION_DETAILS : Provides TTFB for Amazon CloudFront, your current
+	//   configuration, and the best performing EC2 configuration, at 1 hour intervals.
 	// For lists of the fields returned with each query type and more information
 	// about how each type of query is performed, see Using the Amazon CloudWatch
 	// Internet Monitor query interface (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-IM-view-cw-tools-cwim-query.html)
diff --git a/service/internetmonitor/deserializers.go b/service/internetmonitor/deserializers.go
index bcb362a5537..856b604ba2a 100644
--- a/service/internetmonitor/deserializers.go
+++ b/service/internetmonitor/deserializers.go
@@ -3380,6 +3380,11 @@ func awsRestjson1_deserializeDocumentImpactedLocation(v **types.ImpactedLocation
 				return err
 			}
 
+		case "Ipv4Prefixes":
+			if err := awsRestjson1_deserializeDocumentIpv4PrefixList(&sv.Ipv4Prefixes, value); err != nil {
+				return err
+			}
+
 		case "Latitude":
 			if value != nil {
 				switch jtv := value.(type) {
@@ -3693,6 +3698,42 @@ func awsRestjson1_deserializeDocumentInternetMeasurementsLogDelivery(v **types.I
 	return nil
 }
 
+func awsRestjson1_deserializeDocumentIpv4PrefixList(v *[]string, value interface{}) error {
+	if v == nil {
+		return fmt.Errorf("unexpected nil of type %T", v)
+	}
+	if value == nil {
+		return nil
+	}
+
+	shape, ok := value.([]interface{})
+	if !ok {
+		return fmt.Errorf("unexpected JSON type %v", value)
+	}
+
+	var cv []string
+	if *v == nil {
+		cv = []string{}
+	} else {
+		cv = *v
+	}
+
+	for _, value := range shape {
+		var col string
+		if value != nil {
+			jtv, ok := value.(string)
+			if !ok {
+				return fmt.Errorf("expected String to be of type string, got %T instead", value)
+			}
+			col = jtv
+		}
+		cv = append(cv, col)
+
+	}
+	*v = cv
+	return nil
+}
+
 func awsRestjson1_deserializeDocumentLimitExceededException(v **types.LimitExceededException, value interface{}) error {
 	if v == nil {
 		return fmt.Errorf("unexpected nil of type %T", v)
diff --git a/service/internetmonitor/snapshot_test.go b/service/internetmonitor/snapshot_test.go
index a21e77ceaf9..7ff9ba14626 100644
--- a/service/internetmonitor/snapshot_test.go
+++ b/service/internetmonitor/snapshot_test.go
@@ -7,7 +7,6 @@ package internetmonitor
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/internetmonitor/types/types.go b/service/internetmonitor/types/types.go
index 7e2ae0a95fd..ad7f2313ac0 100644
--- a/service/internetmonitor/types/types.go
+++ b/service/internetmonitor/types/types.go
@@ -227,6 +227,9 @@ type ImpactedLocation struct {
 	// The calculated health at a specific location.
 	InternetHealth *InternetHealth
 
+	// The IPv4 prefixes at the client location that was impacted by the health event.
+	Ipv4Prefixes []string
+
 	// The latitude where the health event is located.
 	Latitude *float64
 
@@ -321,7 +324,7 @@ type LocalHealthEventsConfig struct {
 	// The minimum percentage of overall traffic for an application that must be
 	// impacted by an issue before Internet Monitor creates an event when a threshold
 	// is crossed for a local health score. If you don't set a minimum traffic impact
-	// threshold, the default value is 0.01%.
+	// threshold, the default value is 0.1%.
 	MinTrafficImpact float64
 
 	// The status of whether Internet Monitor creates a health event based on a
diff --git a/service/iot/snapshot_test.go b/service/iot/snapshot_test.go
index 91e2f2691b6..c42ed0890a3 100644
--- a/service/iot/snapshot_test.go
+++ b/service/iot/snapshot_test.go
@@ -7,7 +7,6 @@ package iot
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iot1clickdevicesservice/snapshot_test.go b/service/iot1clickdevicesservice/snapshot_test.go
index 002cdbf040d..70395eb5197 100644
--- a/service/iot1clickdevicesservice/snapshot_test.go
+++ b/service/iot1clickdevicesservice/snapshot_test.go
@@ -7,7 +7,6 @@ package iot1clickdevicesservice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iot1clickprojects/snapshot_test.go b/service/iot1clickprojects/snapshot_test.go
index c4f39221235..bc22d804630 100644
--- a/service/iot1clickprojects/snapshot_test.go
+++ b/service/iot1clickprojects/snapshot_test.go
@@ -7,7 +7,6 @@ package iot1clickprojects
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iotanalytics/snapshot_test.go b/service/iotanalytics/snapshot_test.go
index 80cabf1e1a3..4ff6e2673db 100644
--- a/service/iotanalytics/snapshot_test.go
+++ b/service/iotanalytics/snapshot_test.go
@@ -7,7 +7,6 @@ package iotanalytics
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iotdataplane/snapshot_test.go b/service/iotdataplane/snapshot_test.go
index 23f821bdcc1..edf63e5a581 100644
--- a/service/iotdataplane/snapshot_test.go
+++ b/service/iotdataplane/snapshot_test.go
@@ -7,7 +7,6 @@ package iotdataplane
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iotdeviceadvisor/snapshot_test.go b/service/iotdeviceadvisor/snapshot_test.go
index e93f8c6884f..f77d695f855 100644
--- a/service/iotdeviceadvisor/snapshot_test.go
+++ b/service/iotdeviceadvisor/snapshot_test.go
@@ -7,7 +7,6 @@ package iotdeviceadvisor
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iotevents/snapshot_test.go b/service/iotevents/snapshot_test.go
index d7bbfbd0ec0..093055fe589 100644
--- a/service/iotevents/snapshot_test.go
+++ b/service/iotevents/snapshot_test.go
@@ -7,7 +7,6 @@ package iotevents
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ioteventsdata/snapshot_test.go b/service/ioteventsdata/snapshot_test.go
index ddd91b93df3..f0aef2e39b0 100644
--- a/service/ioteventsdata/snapshot_test.go
+++ b/service/ioteventsdata/snapshot_test.go
@@ -7,7 +7,6 @@ package ioteventsdata
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iotfleethub/snapshot_test.go b/service/iotfleethub/snapshot_test.go
index 9b5058b4e8d..01ad83d7dfd 100644
--- a/service/iotfleethub/snapshot_test.go
+++ b/service/iotfleethub/snapshot_test.go
@@ -7,7 +7,6 @@ package iotfleethub
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iotfleetwise/snapshot_test.go b/service/iotfleetwise/snapshot_test.go
index 4ad25f5ebf6..384debcee0d 100644
--- a/service/iotfleetwise/snapshot_test.go
+++ b/service/iotfleetwise/snapshot_test.go
@@ -7,7 +7,6 @@ package iotfleetwise
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iotjobsdataplane/snapshot_test.go b/service/iotjobsdataplane/snapshot_test.go
index 0ac30565e1b..244d538b528 100644
--- a/service/iotjobsdataplane/snapshot_test.go
+++ b/service/iotjobsdataplane/snapshot_test.go
@@ -7,7 +7,6 @@ package iotjobsdataplane
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iotroborunner/snapshot_test.go b/service/iotroborunner/snapshot_test.go
index 432e63bd42f..65c71b68f94 100644
--- a/service/iotroborunner/snapshot_test.go
+++ b/service/iotroborunner/snapshot_test.go
@@ -7,7 +7,6 @@ package iotroborunner
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iotsecuretunneling/snapshot_test.go b/service/iotsecuretunneling/snapshot_test.go
index 14efa550bf5..40cf7593ab1 100644
--- a/service/iotsecuretunneling/snapshot_test.go
+++ b/service/iotsecuretunneling/snapshot_test.go
@@ -7,7 +7,6 @@ package iotsecuretunneling
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iotsitewise/snapshot_test.go b/service/iotsitewise/snapshot_test.go
index 76da0daa02a..4235ca8773d 100644
--- a/service/iotsitewise/snapshot_test.go
+++ b/service/iotsitewise/snapshot_test.go
@@ -7,7 +7,6 @@ package iotsitewise
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iotthingsgraph/snapshot_test.go b/service/iotthingsgraph/snapshot_test.go
index b7d2f25a236..fc7eff40d27 100644
--- a/service/iotthingsgraph/snapshot_test.go
+++ b/service/iotthingsgraph/snapshot_test.go
@@ -7,7 +7,6 @@ package iotthingsgraph
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iottwinmaker/snapshot_test.go b/service/iottwinmaker/snapshot_test.go
index 9753d75434a..cbc1bc3aeb0 100644
--- a/service/iottwinmaker/snapshot_test.go
+++ b/service/iottwinmaker/snapshot_test.go
@@ -7,7 +7,6 @@ package iottwinmaker
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/iotwireless/snapshot_test.go b/service/iotwireless/snapshot_test.go
index 7405bba6f39..0543df7fa4f 100644
--- a/service/iotwireless/snapshot_test.go
+++ b/service/iotwireless/snapshot_test.go
@@ -7,7 +7,6 @@ package iotwireless
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ivs/snapshot_test.go b/service/ivs/snapshot_test.go
index f3266b44c2f..e69dd39c220 100644
--- a/service/ivs/snapshot_test.go
+++ b/service/ivs/snapshot_test.go
@@ -7,7 +7,6 @@ package ivs
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ivschat/snapshot_test.go b/service/ivschat/snapshot_test.go
index 6f71832c8c2..98849575ac6 100644
--- a/service/ivschat/snapshot_test.go
+++ b/service/ivschat/snapshot_test.go
@@ -7,7 +7,6 @@ package ivschat
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ivsrealtime/snapshot_test.go b/service/ivsrealtime/snapshot_test.go
index 67cfd549945..75b9391383a 100644
--- a/service/ivsrealtime/snapshot_test.go
+++ b/service/ivsrealtime/snapshot_test.go
@@ -7,7 +7,6 @@ package ivsrealtime
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kafka/snapshot_test.go b/service/kafka/snapshot_test.go
index bde090c73a8..d3787f3335d 100644
--- a/service/kafka/snapshot_test.go
+++ b/service/kafka/snapshot_test.go
@@ -7,7 +7,6 @@ package kafka
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kafkaconnect/snapshot_test.go b/service/kafkaconnect/snapshot_test.go
index 8d5f70fcc5e..b29990b91ef 100644
--- a/service/kafkaconnect/snapshot_test.go
+++ b/service/kafkaconnect/snapshot_test.go
@@ -7,7 +7,6 @@ package kafkaconnect
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kendra/snapshot_test.go b/service/kendra/snapshot_test.go
index a26d644a445..f895aa53dc8 100644
--- a/service/kendra/snapshot_test.go
+++ b/service/kendra/snapshot_test.go
@@ -7,7 +7,6 @@ package kendra
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kendraranking/snapshot_test.go b/service/kendraranking/snapshot_test.go
index 48f94223bf3..4c3b85cd2c8 100644
--- a/service/kendraranking/snapshot_test.go
+++ b/service/kendraranking/snapshot_test.go
@@ -7,7 +7,6 @@ package kendraranking
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/keyspaces/snapshot_test.go b/service/keyspaces/snapshot_test.go
index e2849f22cf6..a21e1f7f43c 100644
--- a/service/keyspaces/snapshot_test.go
+++ b/service/keyspaces/snapshot_test.go
@@ -7,7 +7,6 @@ package keyspaces
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kinesis/snapshot_test.go b/service/kinesis/snapshot_test.go
index 77a6f586770..90f520001eb 100644
--- a/service/kinesis/snapshot_test.go
+++ b/service/kinesis/snapshot_test.go
@@ -7,7 +7,6 @@ package kinesis
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kinesisanalytics/snapshot_test.go b/service/kinesisanalytics/snapshot_test.go
index 9937a6d7ef5..503be8b8702 100644
--- a/service/kinesisanalytics/snapshot_test.go
+++ b/service/kinesisanalytics/snapshot_test.go
@@ -7,7 +7,6 @@ package kinesisanalytics
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kinesisanalyticsv2/snapshot_test.go b/service/kinesisanalyticsv2/snapshot_test.go
index c41ef88e1ca..c2bd13bfff1 100644
--- a/service/kinesisanalyticsv2/snapshot_test.go
+++ b/service/kinesisanalyticsv2/snapshot_test.go
@@ -7,7 +7,6 @@ package kinesisanalyticsv2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kinesisvideo/snapshot_test.go b/service/kinesisvideo/snapshot_test.go
index bb03df714ee..07ff5e6a521 100644
--- a/service/kinesisvideo/snapshot_test.go
+++ b/service/kinesisvideo/snapshot_test.go
@@ -7,7 +7,6 @@ package kinesisvideo
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kinesisvideoarchivedmedia/snapshot_test.go b/service/kinesisvideoarchivedmedia/snapshot_test.go
index eae9a0b533f..30d60146917 100644
--- a/service/kinesisvideoarchivedmedia/snapshot_test.go
+++ b/service/kinesisvideoarchivedmedia/snapshot_test.go
@@ -7,7 +7,6 @@ package kinesisvideoarchivedmedia
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kinesisvideomedia/snapshot_test.go b/service/kinesisvideomedia/snapshot_test.go
index b8ae2065c42..acfa81273c4 100644
--- a/service/kinesisvideomedia/snapshot_test.go
+++ b/service/kinesisvideomedia/snapshot_test.go
@@ -7,7 +7,6 @@ package kinesisvideomedia
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kinesisvideosignaling/snapshot_test.go b/service/kinesisvideosignaling/snapshot_test.go
index ec6d9456cf0..dbfd92c08b8 100644
--- a/service/kinesisvideosignaling/snapshot_test.go
+++ b/service/kinesisvideosignaling/snapshot_test.go
@@ -7,7 +7,6 @@ package kinesisvideosignaling
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kinesisvideowebrtcstorage/snapshot_test.go b/service/kinesisvideowebrtcstorage/snapshot_test.go
index 808d417c462..642abec6f34 100644
--- a/service/kinesisvideowebrtcstorage/snapshot_test.go
+++ b/service/kinesisvideowebrtcstorage/snapshot_test.go
@@ -7,7 +7,6 @@ package kinesisvideowebrtcstorage
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/kms/snapshot_test.go b/service/kms/snapshot_test.go
index 11771ef8873..2e4e95127c4 100644
--- a/service/kms/snapshot_test.go
+++ b/service/kms/snapshot_test.go
@@ -7,7 +7,6 @@ package kms
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/lakeformation/snapshot_test.go b/service/lakeformation/snapshot_test.go
index 1cdb694d36a..dfe44968418 100644
--- a/service/lakeformation/snapshot_test.go
+++ b/service/lakeformation/snapshot_test.go
@@ -7,7 +7,6 @@ package lakeformation
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/lambda/snapshot_test.go b/service/lambda/snapshot_test.go
index 1008b19abac..3f9a86d58b4 100644
--- a/service/lambda/snapshot_test.go
+++ b/service/lambda/snapshot_test.go
@@ -7,7 +7,6 @@ package lambda
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/launchwizard/snapshot_test.go b/service/launchwizard/snapshot_test.go
index 012548b29a3..cafd4997bfb 100644
--- a/service/launchwizard/snapshot_test.go
+++ b/service/launchwizard/snapshot_test.go
@@ -7,7 +7,6 @@ package launchwizard
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/lexmodelbuildingservice/snapshot_test.go b/service/lexmodelbuildingservice/snapshot_test.go
index 3e9603fe7c6..639ad90086e 100644
--- a/service/lexmodelbuildingservice/snapshot_test.go
+++ b/service/lexmodelbuildingservice/snapshot_test.go
@@ -7,7 +7,6 @@ package lexmodelbuildingservice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/lexmodelsv2/snapshot_test.go b/service/lexmodelsv2/snapshot_test.go
index 93b5d949b34..6896dc39e44 100644
--- a/service/lexmodelsv2/snapshot_test.go
+++ b/service/lexmodelsv2/snapshot_test.go
@@ -7,7 +7,6 @@ package lexmodelsv2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/lexruntimeservice/snapshot_test.go b/service/lexruntimeservice/snapshot_test.go
index 98323848f4d..1754717a7cc 100644
--- a/service/lexruntimeservice/snapshot_test.go
+++ b/service/lexruntimeservice/snapshot_test.go
@@ -7,7 +7,6 @@ package lexruntimeservice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/lexruntimev2/snapshot_test.go b/service/lexruntimev2/snapshot_test.go
index 4283a09b8a7..054fe755abe 100644
--- a/service/lexruntimev2/snapshot_test.go
+++ b/service/lexruntimev2/snapshot_test.go
@@ -7,7 +7,6 @@ package lexruntimev2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/licensemanager/snapshot_test.go b/service/licensemanager/snapshot_test.go
index aa2db2ff248..22b06117dae 100644
--- a/service/licensemanager/snapshot_test.go
+++ b/service/licensemanager/snapshot_test.go
@@ -7,7 +7,6 @@ package licensemanager
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/licensemanagerlinuxsubscriptions/snapshot_test.go b/service/licensemanagerlinuxsubscriptions/snapshot_test.go
index 84d35ebb023..e7d46a4e845 100644
--- a/service/licensemanagerlinuxsubscriptions/snapshot_test.go
+++ b/service/licensemanagerlinuxsubscriptions/snapshot_test.go
@@ -7,7 +7,6 @@ package licensemanagerlinuxsubscriptions
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/licensemanagerusersubscriptions/snapshot_test.go b/service/licensemanagerusersubscriptions/snapshot_test.go
index 52c437caddb..7522e929552 100644
--- a/service/licensemanagerusersubscriptions/snapshot_test.go
+++ b/service/licensemanagerusersubscriptions/snapshot_test.go
@@ -7,7 +7,6 @@ package licensemanagerusersubscriptions
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/lightsail/snapshot_test.go b/service/lightsail/snapshot_test.go
index 34532704369..fdecece4ece 100644
--- a/service/lightsail/snapshot_test.go
+++ b/service/lightsail/snapshot_test.go
@@ -7,7 +7,6 @@ package lightsail
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/location/snapshot_test.go b/service/location/snapshot_test.go
index 918019dd306..a36e05b78ae 100644
--- a/service/location/snapshot_test.go
+++ b/service/location/snapshot_test.go
@@ -7,7 +7,6 @@ package location
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/lookoutequipment/snapshot_test.go b/service/lookoutequipment/snapshot_test.go
index f8a9dbfc7eb..e36a371049a 100644
--- a/service/lookoutequipment/snapshot_test.go
+++ b/service/lookoutequipment/snapshot_test.go
@@ -7,7 +7,6 @@ package lookoutequipment
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/lookoutmetrics/snapshot_test.go b/service/lookoutmetrics/snapshot_test.go
index 7cc7dccd170..5d51dca3e1f 100644
--- a/service/lookoutmetrics/snapshot_test.go
+++ b/service/lookoutmetrics/snapshot_test.go
@@ -7,7 +7,6 @@ package lookoutmetrics
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/lookoutvision/snapshot_test.go b/service/lookoutvision/snapshot_test.go
index 633cf9ac31d..9b62c8d2b25 100644
--- a/service/lookoutvision/snapshot_test.go
+++ b/service/lookoutvision/snapshot_test.go
@@ -7,7 +7,6 @@ package lookoutvision
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/m2/snapshot_test.go b/service/m2/snapshot_test.go
index 4681faf2a94..5051fafa38f 100644
--- a/service/m2/snapshot_test.go
+++ b/service/m2/snapshot_test.go
@@ -7,7 +7,6 @@ package m2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/machinelearning/snapshot_test.go b/service/machinelearning/snapshot_test.go
index 1d14b4561cb..75d81231bc7 100644
--- a/service/machinelearning/snapshot_test.go
+++ b/service/machinelearning/snapshot_test.go
@@ -7,7 +7,6 @@ package machinelearning
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/macie2/snapshot_test.go b/service/macie2/snapshot_test.go
index 5fc92dc6691..89b73fa63aa 100644
--- a/service/macie2/snapshot_test.go
+++ b/service/macie2/snapshot_test.go
@@ -7,7 +7,6 @@ package macie2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/managedblockchain/snapshot_test.go b/service/managedblockchain/snapshot_test.go
index d7ce5e19bfd..3b22af945e9 100644
--- a/service/managedblockchain/snapshot_test.go
+++ b/service/managedblockchain/snapshot_test.go
@@ -7,7 +7,6 @@ package managedblockchain
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/managedblockchainquery/snapshot_test.go b/service/managedblockchainquery/snapshot_test.go
index 3468ec5d068..67f9a7ea1fc 100644
--- a/service/managedblockchainquery/snapshot_test.go
+++ b/service/managedblockchainquery/snapshot_test.go
@@ -7,7 +7,6 @@ package managedblockchainquery
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/marketplaceagreement/snapshot_test.go b/service/marketplaceagreement/snapshot_test.go
index 3a8052fe588..e97d41e8273 100644
--- a/service/marketplaceagreement/snapshot_test.go
+++ b/service/marketplaceagreement/snapshot_test.go
@@ -7,7 +7,6 @@ package marketplaceagreement
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/marketplacecatalog/snapshot_test.go b/service/marketplacecatalog/snapshot_test.go
index 27debdb2dde..d9cd01c5314 100644
--- a/service/marketplacecatalog/snapshot_test.go
+++ b/service/marketplacecatalog/snapshot_test.go
@@ -7,7 +7,6 @@ package marketplacecatalog
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/marketplacecommerceanalytics/snapshot_test.go b/service/marketplacecommerceanalytics/snapshot_test.go
index 724f931e1b7..507ecb52ea5 100644
--- a/service/marketplacecommerceanalytics/snapshot_test.go
+++ b/service/marketplacecommerceanalytics/snapshot_test.go
@@ -7,7 +7,6 @@ package marketplacecommerceanalytics
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/marketplacedeployment/snapshot_test.go b/service/marketplacedeployment/snapshot_test.go
index 1ae59368013..05bfd0abf20 100644
--- a/service/marketplacedeployment/snapshot_test.go
+++ b/service/marketplacedeployment/snapshot_test.go
@@ -7,7 +7,6 @@ package marketplacedeployment
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/marketplaceentitlementservice/snapshot_test.go b/service/marketplaceentitlementservice/snapshot_test.go
index de9188c290e..dca4fd9accd 100644
--- a/service/marketplaceentitlementservice/snapshot_test.go
+++ b/service/marketplaceentitlementservice/snapshot_test.go
@@ -7,7 +7,6 @@ package marketplaceentitlementservice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/marketplacemetering/snapshot_test.go b/service/marketplacemetering/snapshot_test.go
index 4401d34ef5a..ea676403f47 100644
--- a/service/marketplacemetering/snapshot_test.go
+++ b/service/marketplacemetering/snapshot_test.go
@@ -7,7 +7,6 @@ package marketplacemetering
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mediaconnect/snapshot_test.go b/service/mediaconnect/snapshot_test.go
index 485c9209bb4..ad3eb868b0b 100644
--- a/service/mediaconnect/snapshot_test.go
+++ b/service/mediaconnect/snapshot_test.go
@@ -7,7 +7,6 @@ package mediaconnect
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mediaconvert/snapshot_test.go b/service/mediaconvert/snapshot_test.go
index 4ab5c7e7f81..2214f3e372c 100644
--- a/service/mediaconvert/snapshot_test.go
+++ b/service/mediaconvert/snapshot_test.go
@@ -7,7 +7,6 @@ package mediaconvert
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/medialive/snapshot_test.go b/service/medialive/snapshot_test.go
index 2541c49bfd4..2fd8112b6a6 100644
--- a/service/medialive/snapshot_test.go
+++ b/service/medialive/snapshot_test.go
@@ -7,7 +7,6 @@ package medialive
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mediapackage/snapshot_test.go b/service/mediapackage/snapshot_test.go
index 1ca4ca2a2a7..2baa2f2bea7 100644
--- a/service/mediapackage/snapshot_test.go
+++ b/service/mediapackage/snapshot_test.go
@@ -7,7 +7,6 @@ package mediapackage
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mediapackagev2/snapshot_test.go b/service/mediapackagev2/snapshot_test.go
index b8a3d271949..fd0ec4d2232 100644
--- a/service/mediapackagev2/snapshot_test.go
+++ b/service/mediapackagev2/snapshot_test.go
@@ -7,7 +7,6 @@ package mediapackagev2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mediapackagevod/snapshot_test.go b/service/mediapackagevod/snapshot_test.go
index 66097d798b1..184aa1093b5 100644
--- a/service/mediapackagevod/snapshot_test.go
+++ b/service/mediapackagevod/snapshot_test.go
@@ -7,7 +7,6 @@ package mediapackagevod
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mediastore/snapshot_test.go b/service/mediastore/snapshot_test.go
index e88991981a7..0b5c07024f4 100644
--- a/service/mediastore/snapshot_test.go
+++ b/service/mediastore/snapshot_test.go
@@ -7,7 +7,6 @@ package mediastore
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mediastoredata/snapshot_test.go b/service/mediastoredata/snapshot_test.go
index 40d781159ad..7963b7775e1 100644
--- a/service/mediastoredata/snapshot_test.go
+++ b/service/mediastoredata/snapshot_test.go
@@ -7,7 +7,6 @@ package mediastoredata
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mediatailor/snapshot_test.go b/service/mediatailor/snapshot_test.go
index f3ae6dea2b1..d538306c29f 100644
--- a/service/mediatailor/snapshot_test.go
+++ b/service/mediatailor/snapshot_test.go
@@ -7,7 +7,6 @@ package mediatailor
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/medicalimaging/snapshot_test.go b/service/medicalimaging/snapshot_test.go
index b2e92dea956..e778d7f2e86 100644
--- a/service/medicalimaging/snapshot_test.go
+++ b/service/medicalimaging/snapshot_test.go
@@ -7,7 +7,6 @@ package medicalimaging
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/memorydb/snapshot_test.go b/service/memorydb/snapshot_test.go
index c753abf43b1..d504cd27a7e 100644
--- a/service/memorydb/snapshot_test.go
+++ b/service/memorydb/snapshot_test.go
@@ -7,7 +7,6 @@ package memorydb
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mgn/snapshot_test.go b/service/mgn/snapshot_test.go
index fa661ba37d1..11f0f522ce8 100644
--- a/service/mgn/snapshot_test.go
+++ b/service/mgn/snapshot_test.go
@@ -7,7 +7,6 @@ package mgn
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/migrationhub/snapshot_test.go b/service/migrationhub/snapshot_test.go
index ff6e8bd5e3e..c4c809b9161 100644
--- a/service/migrationhub/snapshot_test.go
+++ b/service/migrationhub/snapshot_test.go
@@ -7,7 +7,6 @@ package migrationhub
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/migrationhubconfig/snapshot_test.go b/service/migrationhubconfig/snapshot_test.go
index a22890a020b..a72ee22f587 100644
--- a/service/migrationhubconfig/snapshot_test.go
+++ b/service/migrationhubconfig/snapshot_test.go
@@ -7,7 +7,6 @@ package migrationhubconfig
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/migrationhuborchestrator/snapshot_test.go b/service/migrationhuborchestrator/snapshot_test.go
index b09efdac4ce..947df7170e5 100644
--- a/service/migrationhuborchestrator/snapshot_test.go
+++ b/service/migrationhuborchestrator/snapshot_test.go
@@ -7,7 +7,6 @@ package migrationhuborchestrator
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/migrationhubrefactorspaces/snapshot_test.go b/service/migrationhubrefactorspaces/snapshot_test.go
index c14e5e9ae2e..ed7988f3ff3 100644
--- a/service/migrationhubrefactorspaces/snapshot_test.go
+++ b/service/migrationhubrefactorspaces/snapshot_test.go
@@ -7,7 +7,6 @@ package migrationhubrefactorspaces
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/migrationhubstrategy/snapshot_test.go b/service/migrationhubstrategy/snapshot_test.go
index bc71a851ea4..ee6c3c07bd0 100644
--- a/service/migrationhubstrategy/snapshot_test.go
+++ b/service/migrationhubstrategy/snapshot_test.go
@@ -7,7 +7,6 @@ package migrationhubstrategy
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mobile/snapshot_test.go b/service/mobile/snapshot_test.go
index 9a2ea8a5f76..47fa28152a6 100644
--- a/service/mobile/snapshot_test.go
+++ b/service/mobile/snapshot_test.go
@@ -7,7 +7,6 @@ package mobile
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mq/snapshot_test.go b/service/mq/snapshot_test.go
index 92b75794502..6ff647f7bdb 100644
--- a/service/mq/snapshot_test.go
+++ b/service/mq/snapshot_test.go
@@ -7,7 +7,6 @@ package mq
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mturk/snapshot_test.go b/service/mturk/snapshot_test.go
index 4ad567b9e68..9e902c76585 100644
--- a/service/mturk/snapshot_test.go
+++ b/service/mturk/snapshot_test.go
@@ -7,7 +7,6 @@ package mturk
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/mwaa/snapshot_test.go b/service/mwaa/snapshot_test.go
index 62e56ab593b..e880092e075 100644
--- a/service/mwaa/snapshot_test.go
+++ b/service/mwaa/snapshot_test.go
@@ -7,7 +7,6 @@ package mwaa
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/neptune/snapshot_test.go b/service/neptune/snapshot_test.go
index 531175a532c..5ef4c8e02d2 100644
--- a/service/neptune/snapshot_test.go
+++ b/service/neptune/snapshot_test.go
@@ -7,7 +7,6 @@ package neptune
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/neptunedata/snapshot_test.go b/service/neptunedata/snapshot_test.go
index 585505cac5d..a2aadd2e929 100644
--- a/service/neptunedata/snapshot_test.go
+++ b/service/neptunedata/snapshot_test.go
@@ -7,7 +7,6 @@ package neptunedata
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/neptunegraph/snapshot_test.go b/service/neptunegraph/snapshot_test.go
index 9b8e04f4d61..74e41665ca5 100644
--- a/service/neptunegraph/snapshot_test.go
+++ b/service/neptunegraph/snapshot_test.go
@@ -7,7 +7,6 @@ package neptunegraph
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/networkfirewall/snapshot_test.go b/service/networkfirewall/snapshot_test.go
index a184cf3e763..e96aa9237d6 100644
--- a/service/networkfirewall/snapshot_test.go
+++ b/service/networkfirewall/snapshot_test.go
@@ -7,7 +7,6 @@ package networkfirewall
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/networkmanager/snapshot_test.go b/service/networkmanager/snapshot_test.go
index 5c97467cffe..e8bed0f08a2 100644
--- a/service/networkmanager/snapshot_test.go
+++ b/service/networkmanager/snapshot_test.go
@@ -7,7 +7,6 @@ package networkmanager
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/networkmonitor/snapshot_test.go b/service/networkmonitor/snapshot_test.go
index e3dc5e6924b..5bec6af5eb4 100644
--- a/service/networkmonitor/snapshot_test.go
+++ b/service/networkmonitor/snapshot_test.go
@@ -7,7 +7,6 @@ package networkmonitor
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/nimble/snapshot_test.go b/service/nimble/snapshot_test.go
index 37f8d7a4ec5..1d840211c71 100644
--- a/service/nimble/snapshot_test.go
+++ b/service/nimble/snapshot_test.go
@@ -7,7 +7,6 @@ package nimble
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/oam/snapshot_test.go b/service/oam/snapshot_test.go
index 039f37b300c..9f069a680b1 100644
--- a/service/oam/snapshot_test.go
+++ b/service/oam/snapshot_test.go
@@ -7,7 +7,6 @@ package oam
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/omics/snapshot_test.go b/service/omics/snapshot_test.go
index 4a2431e5eca..f18d01da5f7 100644
--- a/service/omics/snapshot_test.go
+++ b/service/omics/snapshot_test.go
@@ -7,7 +7,6 @@ package omics
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/opensearch/snapshot_test.go b/service/opensearch/snapshot_test.go
index 86530258806..e750dc1fef3 100644
--- a/service/opensearch/snapshot_test.go
+++ b/service/opensearch/snapshot_test.go
@@ -7,7 +7,6 @@ package opensearch
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/opensearchserverless/snapshot_test.go b/service/opensearchserverless/snapshot_test.go
index c9f00fce45c..8d49798b064 100644
--- a/service/opensearchserverless/snapshot_test.go
+++ b/service/opensearchserverless/snapshot_test.go
@@ -7,7 +7,6 @@ package opensearchserverless
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/opsworks/snapshot_test.go b/service/opsworks/snapshot_test.go
index 5c5fe06b8f1..85876c884ae 100644
--- a/service/opsworks/snapshot_test.go
+++ b/service/opsworks/snapshot_test.go
@@ -7,7 +7,6 @@ package opsworks
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/opsworkscm/snapshot_test.go b/service/opsworkscm/snapshot_test.go
index 4eddb50d550..a539b736fd7 100644
--- a/service/opsworkscm/snapshot_test.go
+++ b/service/opsworkscm/snapshot_test.go
@@ -7,7 +7,6 @@ package opsworkscm
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/organizations/snapshot_test.go b/service/organizations/snapshot_test.go
index 9a4e1cd5ce4..1e79bec32c5 100644
--- a/service/organizations/snapshot_test.go
+++ b/service/organizations/snapshot_test.go
@@ -7,7 +7,6 @@ package organizations
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/osis/snapshot_test.go b/service/osis/snapshot_test.go
index 17e33f0ce8b..e5d0c1fd317 100644
--- a/service/osis/snapshot_test.go
+++ b/service/osis/snapshot_test.go
@@ -7,7 +7,6 @@ package osis
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/outposts/snapshot_test.go b/service/outposts/snapshot_test.go
index 99feefdbd3b..0e88c8130d0 100644
--- a/service/outposts/snapshot_test.go
+++ b/service/outposts/snapshot_test.go
@@ -7,7 +7,6 @@ package outposts
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/panorama/snapshot_test.go b/service/panorama/snapshot_test.go
index 8a5e554d14a..d26a16dfb14 100644
--- a/service/panorama/snapshot_test.go
+++ b/service/panorama/snapshot_test.go
@@ -7,7 +7,6 @@ package panorama
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/paymentcryptography/snapshot_test.go b/service/paymentcryptography/snapshot_test.go
index b0e68231fd3..f77db43fad1 100644
--- a/service/paymentcryptography/snapshot_test.go
+++ b/service/paymentcryptography/snapshot_test.go
@@ -7,7 +7,6 @@ package paymentcryptography
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/paymentcryptographydata/snapshot_test.go b/service/paymentcryptographydata/snapshot_test.go
index eee85f6d45b..79bf6b9e03b 100644
--- a/service/paymentcryptographydata/snapshot_test.go
+++ b/service/paymentcryptographydata/snapshot_test.go
@@ -7,7 +7,6 @@ package paymentcryptographydata
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/pcaconnectorad/snapshot_test.go b/service/pcaconnectorad/snapshot_test.go
index 22cba2b0b2b..3a2e65b54ca 100644
--- a/service/pcaconnectorad/snapshot_test.go
+++ b/service/pcaconnectorad/snapshot_test.go
@@ -7,7 +7,6 @@ package pcaconnectorad
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/personalize/snapshot_test.go b/service/personalize/snapshot_test.go
index 5ff7f0961e9..cd7ab5013de 100644
--- a/service/personalize/snapshot_test.go
+++ b/service/personalize/snapshot_test.go
@@ -7,7 +7,6 @@ package personalize
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/personalizeevents/snapshot_test.go b/service/personalizeevents/snapshot_test.go
index 9a840f9b135..ad1ad6e907a 100644
--- a/service/personalizeevents/snapshot_test.go
+++ b/service/personalizeevents/snapshot_test.go
@@ -7,7 +7,6 @@ package personalizeevents
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/personalizeruntime/snapshot_test.go b/service/personalizeruntime/snapshot_test.go
index 8f0f065e5c3..2f476e446a1 100644
--- a/service/personalizeruntime/snapshot_test.go
+++ b/service/personalizeruntime/snapshot_test.go
@@ -7,7 +7,6 @@ package personalizeruntime
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/pi/snapshot_test.go b/service/pi/snapshot_test.go
index 1486ad7d191..2ee922fd386 100644
--- a/service/pi/snapshot_test.go
+++ b/service/pi/snapshot_test.go
@@ -7,7 +7,6 @@ package pi
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/pinpoint/snapshot_test.go b/service/pinpoint/snapshot_test.go
index 529aade118f..4a0c81e68ae 100644
--- a/service/pinpoint/snapshot_test.go
+++ b/service/pinpoint/snapshot_test.go
@@ -7,7 +7,6 @@ package pinpoint
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/pinpointemail/snapshot_test.go b/service/pinpointemail/snapshot_test.go
index ec6129bd409..a86098cfb4a 100644
--- a/service/pinpointemail/snapshot_test.go
+++ b/service/pinpointemail/snapshot_test.go
@@ -7,7 +7,6 @@ package pinpointemail
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/pinpointsmsvoice/snapshot_test.go b/service/pinpointsmsvoice/snapshot_test.go
index 73f3f108f81..d6486615bac 100644
--- a/service/pinpointsmsvoice/snapshot_test.go
+++ b/service/pinpointsmsvoice/snapshot_test.go
@@ -7,7 +7,6 @@ package pinpointsmsvoice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/pinpointsmsvoicev2/snapshot_test.go b/service/pinpointsmsvoicev2/snapshot_test.go
index 8b01b2f6fd8..a669a1237b0 100644
--- a/service/pinpointsmsvoicev2/snapshot_test.go
+++ b/service/pinpointsmsvoicev2/snapshot_test.go
@@ -7,7 +7,6 @@ package pinpointsmsvoicev2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/pipes/snapshot_test.go b/service/pipes/snapshot_test.go
index 772a65d9ea4..f4f92509f8c 100644
--- a/service/pipes/snapshot_test.go
+++ b/service/pipes/snapshot_test.go
@@ -7,7 +7,6 @@ package pipes
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/polly/snapshot_test.go b/service/polly/snapshot_test.go
index e8e50931399..df8348028f6 100644
--- a/service/polly/snapshot_test.go
+++ b/service/polly/snapshot_test.go
@@ -7,7 +7,6 @@ package polly
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/pricing/snapshot_test.go b/service/pricing/snapshot_test.go
index 3499c0cb886..9e3a6bda3f5 100644
--- a/service/pricing/snapshot_test.go
+++ b/service/pricing/snapshot_test.go
@@ -7,7 +7,6 @@ package pricing
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/privatenetworks/snapshot_test.go b/service/privatenetworks/snapshot_test.go
index c1f82329884..55f6cfa376a 100644
--- a/service/privatenetworks/snapshot_test.go
+++ b/service/privatenetworks/snapshot_test.go
@@ -7,7 +7,6 @@ package privatenetworks
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/proton/snapshot_test.go b/service/proton/snapshot_test.go
index 47db5029526..d89b3b26a0c 100644
--- a/service/proton/snapshot_test.go
+++ b/service/proton/snapshot_test.go
@@ -7,7 +7,6 @@ package proton
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/qbusiness/snapshot_test.go b/service/qbusiness/snapshot_test.go
index 4b30304b000..c16c540908c 100644
--- a/service/qbusiness/snapshot_test.go
+++ b/service/qbusiness/snapshot_test.go
@@ -7,7 +7,6 @@ package qbusiness
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/qconnect/snapshot_test.go b/service/qconnect/snapshot_test.go
index 9819e149c49..c0198a4273a 100644
--- a/service/qconnect/snapshot_test.go
+++ b/service/qconnect/snapshot_test.go
@@ -7,7 +7,6 @@ package qconnect
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/qldb/snapshot_test.go b/service/qldb/snapshot_test.go
index 456c6a450df..fd9d54b2e9d 100644
--- a/service/qldb/snapshot_test.go
+++ b/service/qldb/snapshot_test.go
@@ -7,7 +7,6 @@ package qldb
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/qldbsession/snapshot_test.go b/service/qldbsession/snapshot_test.go
index 0e2a686d421..00b8a27735c 100644
--- a/service/qldbsession/snapshot_test.go
+++ b/service/qldbsession/snapshot_test.go
@@ -7,7 +7,6 @@ package qldbsession
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/quicksight/snapshot_test.go b/service/quicksight/snapshot_test.go
index c8cab73ac08..a527574be6f 100644
--- a/service/quicksight/snapshot_test.go
+++ b/service/quicksight/snapshot_test.go
@@ -7,7 +7,6 @@ package quicksight
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ram/snapshot_test.go b/service/ram/snapshot_test.go
index 1de7ec705f1..f8f07411661 100644
--- a/service/ram/snapshot_test.go
+++ b/service/ram/snapshot_test.go
@@ -7,7 +7,6 @@ package ram
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/rbin/snapshot_test.go b/service/rbin/snapshot_test.go
index bda1a8ac8b1..29205e9777d 100644
--- a/service/rbin/snapshot_test.go
+++ b/service/rbin/snapshot_test.go
@@ -7,7 +7,6 @@ package rbin
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/rds/snapshot_test.go b/service/rds/snapshot_test.go
index 0ebdacc6eb6..4deed97a7de 100644
--- a/service/rds/snapshot_test.go
+++ b/service/rds/snapshot_test.go
@@ -7,7 +7,6 @@ package rds
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/rdsdata/snapshot_test.go b/service/rdsdata/snapshot_test.go
index 26770eca5aa..56999497d7e 100644
--- a/service/rdsdata/snapshot_test.go
+++ b/service/rdsdata/snapshot_test.go
@@ -7,7 +7,6 @@ package rdsdata
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/redshift/snapshot_test.go b/service/redshift/snapshot_test.go
index 0a71c43f545..627204ca27d 100644
--- a/service/redshift/snapshot_test.go
+++ b/service/redshift/snapshot_test.go
@@ -7,7 +7,6 @@ package redshift
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/redshiftdata/snapshot_test.go b/service/redshiftdata/snapshot_test.go
index a09b026276d..d5e64157592 100644
--- a/service/redshiftdata/snapshot_test.go
+++ b/service/redshiftdata/snapshot_test.go
@@ -7,7 +7,6 @@ package redshiftdata
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/redshiftserverless/snapshot_test.go b/service/redshiftserverless/snapshot_test.go
index c0d7f86cdb8..39cc4cbf9c6 100644
--- a/service/redshiftserverless/snapshot_test.go
+++ b/service/redshiftserverless/snapshot_test.go
@@ -7,7 +7,6 @@ package redshiftserverless
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/rekognition/snapshot_test.go b/service/rekognition/snapshot_test.go
index 0d1243d8864..0181145a941 100644
--- a/service/rekognition/snapshot_test.go
+++ b/service/rekognition/snapshot_test.go
@@ -7,7 +7,6 @@ package rekognition
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/repostspace/snapshot_test.go b/service/repostspace/snapshot_test.go
index 4347eb96ad4..442b95c4821 100644
--- a/service/repostspace/snapshot_test.go
+++ b/service/repostspace/snapshot_test.go
@@ -7,7 +7,6 @@ package repostspace
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/resiliencehub/snapshot_test.go b/service/resiliencehub/snapshot_test.go
index b6379b74c20..ad6ca467ad3 100644
--- a/service/resiliencehub/snapshot_test.go
+++ b/service/resiliencehub/snapshot_test.go
@@ -7,7 +7,6 @@ package resiliencehub
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/resourceexplorer2/snapshot_test.go b/service/resourceexplorer2/snapshot_test.go
index 8ed8bd7e685..72e34a01dd4 100644
--- a/service/resourceexplorer2/snapshot_test.go
+++ b/service/resourceexplorer2/snapshot_test.go
@@ -7,7 +7,6 @@ package resourceexplorer2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/resourcegroups/snapshot_test.go b/service/resourcegroups/snapshot_test.go
index 64b10a04e21..01c78037c3f 100644
--- a/service/resourcegroups/snapshot_test.go
+++ b/service/resourcegroups/snapshot_test.go
@@ -7,7 +7,6 @@ package resourcegroups
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/resourcegroupstaggingapi/snapshot_test.go b/service/resourcegroupstaggingapi/snapshot_test.go
index 68694f14faf..76cb2443f7d 100644
--- a/service/resourcegroupstaggingapi/snapshot_test.go
+++ b/service/resourcegroupstaggingapi/snapshot_test.go
@@ -7,7 +7,6 @@ package resourcegroupstaggingapi
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/robomaker/snapshot_test.go b/service/robomaker/snapshot_test.go
index cc8472b6a4b..b40d836102b 100644
--- a/service/robomaker/snapshot_test.go
+++ b/service/robomaker/snapshot_test.go
@@ -7,7 +7,6 @@ package robomaker
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/rolesanywhere/snapshot_test.go b/service/rolesanywhere/snapshot_test.go
index 01043f87c54..4187dc94502 100644
--- a/service/rolesanywhere/snapshot_test.go
+++ b/service/rolesanywhere/snapshot_test.go
@@ -7,7 +7,6 @@ package rolesanywhere
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/route53/snapshot_test.go b/service/route53/snapshot_test.go
index 70628907442..4d2f097e309 100644
--- a/service/route53/snapshot_test.go
+++ b/service/route53/snapshot_test.go
@@ -7,7 +7,6 @@ package route53
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/route53domains/snapshot_test.go b/service/route53domains/snapshot_test.go
index 47ee0350663..05350ff2630 100644
--- a/service/route53domains/snapshot_test.go
+++ b/service/route53domains/snapshot_test.go
@@ -7,7 +7,6 @@ package route53domains
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/route53recoverycluster/snapshot_test.go b/service/route53recoverycluster/snapshot_test.go
index 624b18c09a4..e99e53d00e2 100644
--- a/service/route53recoverycluster/snapshot_test.go
+++ b/service/route53recoverycluster/snapshot_test.go
@@ -7,7 +7,6 @@ package route53recoverycluster
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/route53recoverycontrolconfig/snapshot_test.go b/service/route53recoverycontrolconfig/snapshot_test.go
index f572fad445c..e2fea1e95a9 100644
--- a/service/route53recoverycontrolconfig/snapshot_test.go
+++ b/service/route53recoverycontrolconfig/snapshot_test.go
@@ -7,7 +7,6 @@ package route53recoverycontrolconfig
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/route53recoveryreadiness/snapshot_test.go b/service/route53recoveryreadiness/snapshot_test.go
index 9ac8355d1b1..c9bfda144b5 100644
--- a/service/route53recoveryreadiness/snapshot_test.go
+++ b/service/route53recoveryreadiness/snapshot_test.go
@@ -7,7 +7,6 @@ package route53recoveryreadiness
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/route53resolver/snapshot_test.go b/service/route53resolver/snapshot_test.go
index 08899d4cb67..d51aa9f0beb 100644
--- a/service/route53resolver/snapshot_test.go
+++ b/service/route53resolver/snapshot_test.go
@@ -7,7 +7,6 @@ package route53resolver
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/rum/snapshot_test.go b/service/rum/snapshot_test.go
index d90ee45ca93..1e83e0446ab 100644
--- a/service/rum/snapshot_test.go
+++ b/service/rum/snapshot_test.go
@@ -7,7 +7,6 @@ package rum
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/s3/snapshot_test.go b/service/s3/snapshot_test.go
index cc8aa7963ce..6fc5e296fbd 100644
--- a/service/s3/snapshot_test.go
+++ b/service/s3/snapshot_test.go
@@ -7,7 +7,6 @@ package s3
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/s3control/snapshot_test.go b/service/s3control/snapshot_test.go
index 7728087d051..0688e84eefa 100644
--- a/service/s3control/snapshot_test.go
+++ b/service/s3control/snapshot_test.go
@@ -7,7 +7,6 @@ package s3control
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/s3outposts/snapshot_test.go b/service/s3outposts/snapshot_test.go
index 3ac63bbd855..a47bbf7e0ca 100644
--- a/service/s3outposts/snapshot_test.go
+++ b/service/s3outposts/snapshot_test.go
@@ -7,7 +7,6 @@ package s3outposts
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sagemaker/snapshot_test.go b/service/sagemaker/snapshot_test.go
index d45af7d9552..0efd374a9f4 100644
--- a/service/sagemaker/snapshot_test.go
+++ b/service/sagemaker/snapshot_test.go
@@ -7,7 +7,6 @@ package sagemaker
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sagemakera2iruntime/snapshot_test.go b/service/sagemakera2iruntime/snapshot_test.go
index fa419f11c12..d0e5baf7ab8 100644
--- a/service/sagemakera2iruntime/snapshot_test.go
+++ b/service/sagemakera2iruntime/snapshot_test.go
@@ -7,7 +7,6 @@ package sagemakera2iruntime
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sagemakeredge/snapshot_test.go b/service/sagemakeredge/snapshot_test.go
index 31074caaf83..f0da5b19e23 100644
--- a/service/sagemakeredge/snapshot_test.go
+++ b/service/sagemakeredge/snapshot_test.go
@@ -7,7 +7,6 @@ package sagemakeredge
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sagemakerfeaturestoreruntime/snapshot_test.go b/service/sagemakerfeaturestoreruntime/snapshot_test.go
index 7d0fc6dfdd3..472f5df9e85 100644
--- a/service/sagemakerfeaturestoreruntime/snapshot_test.go
+++ b/service/sagemakerfeaturestoreruntime/snapshot_test.go
@@ -7,7 +7,6 @@ package sagemakerfeaturestoreruntime
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sagemakergeospatial/snapshot_test.go b/service/sagemakergeospatial/snapshot_test.go
index 7574e6af6bd..5a7b50530b6 100644
--- a/service/sagemakergeospatial/snapshot_test.go
+++ b/service/sagemakergeospatial/snapshot_test.go
@@ -7,7 +7,6 @@ package sagemakergeospatial
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sagemakermetrics/snapshot_test.go b/service/sagemakermetrics/snapshot_test.go
index 15e932e87f4..e13ef4e9e8a 100644
--- a/service/sagemakermetrics/snapshot_test.go
+++ b/service/sagemakermetrics/snapshot_test.go
@@ -7,7 +7,6 @@ package sagemakermetrics
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sagemakerruntime/snapshot_test.go b/service/sagemakerruntime/snapshot_test.go
index 299d669bca3..e547ff9a965 100644
--- a/service/sagemakerruntime/snapshot_test.go
+++ b/service/sagemakerruntime/snapshot_test.go
@@ -7,7 +7,6 @@ package sagemakerruntime
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/savingsplans/snapshot_test.go b/service/savingsplans/snapshot_test.go
index 112cd1f0666..d0e0455f94c 100644
--- a/service/savingsplans/snapshot_test.go
+++ b/service/savingsplans/snapshot_test.go
@@ -7,7 +7,6 @@ package savingsplans
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/scheduler/snapshot_test.go b/service/scheduler/snapshot_test.go
index 2b658e47cbf..bf5fedc7c28 100644
--- a/service/scheduler/snapshot_test.go
+++ b/service/scheduler/snapshot_test.go
@@ -7,7 +7,6 @@ package scheduler
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/schemas/snapshot_test.go b/service/schemas/snapshot_test.go
index 722eed9f937..20c6fb563e8 100644
--- a/service/schemas/snapshot_test.go
+++ b/service/schemas/snapshot_test.go
@@ -7,7 +7,6 @@ package schemas
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/secretsmanager/snapshot_test.go b/service/secretsmanager/snapshot_test.go
index 42caa4d2eb3..e6e05b94820 100644
--- a/service/secretsmanager/snapshot_test.go
+++ b/service/secretsmanager/snapshot_test.go
@@ -7,7 +7,6 @@ package secretsmanager
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/securityhub/snapshot_test.go b/service/securityhub/snapshot_test.go
index 671bd44e695..c52aec41e0a 100644
--- a/service/securityhub/snapshot_test.go
+++ b/service/securityhub/snapshot_test.go
@@ -7,7 +7,6 @@ package securityhub
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/securitylake/snapshot_test.go b/service/securitylake/snapshot_test.go
index b621e9d01b1..5c0a423d313 100644
--- a/service/securitylake/snapshot_test.go
+++ b/service/securitylake/snapshot_test.go
@@ -7,7 +7,6 @@ package securitylake
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/serverlessapplicationrepository/snapshot_test.go b/service/serverlessapplicationrepository/snapshot_test.go
index 15361600703..5e5304adabb 100644
--- a/service/serverlessapplicationrepository/snapshot_test.go
+++ b/service/serverlessapplicationrepository/snapshot_test.go
@@ -7,7 +7,6 @@ package serverlessapplicationrepository
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/servicecatalog/snapshot_test.go b/service/servicecatalog/snapshot_test.go
index bbe6ad34208..2b57f1b9634 100644
--- a/service/servicecatalog/snapshot_test.go
+++ b/service/servicecatalog/snapshot_test.go
@@ -7,7 +7,6 @@ package servicecatalog
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/servicecatalogappregistry/snapshot_test.go b/service/servicecatalogappregistry/snapshot_test.go
index 46bd2b1700d..efbd4b8b419 100644
--- a/service/servicecatalogappregistry/snapshot_test.go
+++ b/service/servicecatalogappregistry/snapshot_test.go
@@ -7,7 +7,6 @@ package servicecatalogappregistry
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/servicediscovery/snapshot_test.go b/service/servicediscovery/snapshot_test.go
index 9421dbc5356..155a3a30e87 100644
--- a/service/servicediscovery/snapshot_test.go
+++ b/service/servicediscovery/snapshot_test.go
@@ -7,7 +7,6 @@ package servicediscovery
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/servicequotas/snapshot_test.go b/service/servicequotas/snapshot_test.go
index 63653efc352..1f26912ff49 100644
--- a/service/servicequotas/snapshot_test.go
+++ b/service/servicequotas/snapshot_test.go
@@ -7,7 +7,6 @@ package servicequotas
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ses/snapshot_test.go b/service/ses/snapshot_test.go
index 9838f4a9aff..04ef6105454 100644
--- a/service/ses/snapshot_test.go
+++ b/service/ses/snapshot_test.go
@@ -7,7 +7,6 @@ package ses
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sesv2/snapshot_test.go b/service/sesv2/snapshot_test.go
index 369796c66e6..a17e423fefc 100644
--- a/service/sesv2/snapshot_test.go
+++ b/service/sesv2/snapshot_test.go
@@ -7,7 +7,6 @@ package sesv2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sfn/snapshot_test.go b/service/sfn/snapshot_test.go
index 24594d0ba2e..ed16f36954a 100644
--- a/service/sfn/snapshot_test.go
+++ b/service/sfn/snapshot_test.go
@@ -7,7 +7,6 @@ package sfn
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/shield/snapshot_test.go b/service/shield/snapshot_test.go
index c89a1cc9a6d..5fc87e153d5 100644
--- a/service/shield/snapshot_test.go
+++ b/service/shield/snapshot_test.go
@@ -7,7 +7,6 @@ package shield
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/signer/snapshot_test.go b/service/signer/snapshot_test.go
index 3622d744351..87effa352b5 100644
--- a/service/signer/snapshot_test.go
+++ b/service/signer/snapshot_test.go
@@ -7,7 +7,6 @@ package signer
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/simspaceweaver/snapshot_test.go b/service/simspaceweaver/snapshot_test.go
index 1b951d319fc..fc1353a8e5c 100644
--- a/service/simspaceweaver/snapshot_test.go
+++ b/service/simspaceweaver/snapshot_test.go
@@ -7,7 +7,6 @@ package simspaceweaver
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sms/snapshot_test.go b/service/sms/snapshot_test.go
index 2ced1b94ecf..fdfc3e9d51e 100644
--- a/service/sms/snapshot_test.go
+++ b/service/sms/snapshot_test.go
@@ -7,7 +7,6 @@ package sms
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/snowball/snapshot_test.go b/service/snowball/snapshot_test.go
index b47d93ad9ee..ff9363a0ea4 100644
--- a/service/snowball/snapshot_test.go
+++ b/service/snowball/snapshot_test.go
@@ -7,7 +7,6 @@ package snowball
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/snowdevicemanagement/snapshot_test.go b/service/snowdevicemanagement/snapshot_test.go
index 45f0b1feec9..3dc7261bb26 100644
--- a/service/snowdevicemanagement/snapshot_test.go
+++ b/service/snowdevicemanagement/snapshot_test.go
@@ -7,7 +7,6 @@ package snowdevicemanagement
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sns/snapshot_test.go b/service/sns/snapshot_test.go
index 3e74d74ca8c..58a1f38adf1 100644
--- a/service/sns/snapshot_test.go
+++ b/service/sns/snapshot_test.go
@@ -7,7 +7,6 @@ package sns
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sqs/snapshot_test.go b/service/sqs/snapshot_test.go
index 84913091cde..12fc42b81ad 100644
--- a/service/sqs/snapshot_test.go
+++ b/service/sqs/snapshot_test.go
@@ -7,7 +7,6 @@ package sqs
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ssm/snapshot_test.go b/service/ssm/snapshot_test.go
index 10893dc91ca..3cb78e320a7 100644
--- a/service/ssm/snapshot_test.go
+++ b/service/ssm/snapshot_test.go
@@ -7,7 +7,6 @@ package ssm
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ssmcontacts/snapshot_test.go b/service/ssmcontacts/snapshot_test.go
index 802e10370e6..b44f1df1654 100644
--- a/service/ssmcontacts/snapshot_test.go
+++ b/service/ssmcontacts/snapshot_test.go
@@ -7,7 +7,6 @@ package ssmcontacts
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ssmincidents/snapshot_test.go b/service/ssmincidents/snapshot_test.go
index 7acada834d9..6eba77e8af7 100644
--- a/service/ssmincidents/snapshot_test.go
+++ b/service/ssmincidents/snapshot_test.go
@@ -7,7 +7,6 @@ package ssmincidents
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ssmsap/snapshot_test.go b/service/ssmsap/snapshot_test.go
index 51740d9a537..af68f02fb8c 100644
--- a/service/ssmsap/snapshot_test.go
+++ b/service/ssmsap/snapshot_test.go
@@ -7,7 +7,6 @@ package ssmsap
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sso/snapshot_test.go b/service/sso/snapshot_test.go
index 6e4bccf3343..e407e345287 100644
--- a/service/sso/snapshot_test.go
+++ b/service/sso/snapshot_test.go
@@ -7,7 +7,6 @@ package sso
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ssoadmin/snapshot_test.go b/service/ssoadmin/snapshot_test.go
index 5ed5db915b1..5eb0884d8c6 100644
--- a/service/ssoadmin/snapshot_test.go
+++ b/service/ssoadmin/snapshot_test.go
@@ -7,7 +7,6 @@ package ssoadmin
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/ssooidc/snapshot_test.go b/service/ssooidc/snapshot_test.go
index e235c5395b1..1345be7a0db 100644
--- a/service/ssooidc/snapshot_test.go
+++ b/service/ssooidc/snapshot_test.go
@@ -7,7 +7,6 @@ package ssooidc
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/storagegateway/snapshot_test.go b/service/storagegateway/snapshot_test.go
index 32dc50c62e6..6dd2a73c0e3 100644
--- a/service/storagegateway/snapshot_test.go
+++ b/service/storagegateway/snapshot_test.go
@@ -7,7 +7,6 @@ package storagegateway
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/sts/snapshot_test.go b/service/sts/snapshot_test.go
index df0b1444603..d224b596fd0 100644
--- a/service/sts/snapshot_test.go
+++ b/service/sts/snapshot_test.go
@@ -7,7 +7,6 @@ package sts
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/supplychain/snapshot_test.go b/service/supplychain/snapshot_test.go
index 3107e8309d6..4e9b1c071a4 100644
--- a/service/supplychain/snapshot_test.go
+++ b/service/supplychain/snapshot_test.go
@@ -7,7 +7,6 @@ package supplychain
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/support/snapshot_test.go b/service/support/snapshot_test.go
index 8997e767305..ec44b5c36fa 100644
--- a/service/support/snapshot_test.go
+++ b/service/support/snapshot_test.go
@@ -7,7 +7,6 @@ package support
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/supportapp/snapshot_test.go b/service/supportapp/snapshot_test.go
index ad75386b1d0..1f51cef3e5b 100644
--- a/service/supportapp/snapshot_test.go
+++ b/service/supportapp/snapshot_test.go
@@ -7,7 +7,6 @@ package supportapp
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/swf/snapshot_test.go b/service/swf/snapshot_test.go
index 8f0d93f913a..a94640ab91f 100644
--- a/service/swf/snapshot_test.go
+++ b/service/swf/snapshot_test.go
@@ -7,7 +7,6 @@ package swf
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/synthetics/snapshot_test.go b/service/synthetics/snapshot_test.go
index 96c57abed0b..5293a9be2e5 100644
--- a/service/synthetics/snapshot_test.go
+++ b/service/synthetics/snapshot_test.go
@@ -7,7 +7,6 @@ package synthetics
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/textract/snapshot_test.go b/service/textract/snapshot_test.go
index ce535d199fc..913d41087be 100644
--- a/service/textract/snapshot_test.go
+++ b/service/textract/snapshot_test.go
@@ -7,7 +7,6 @@ package textract
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/timestreamquery/snapshot_test.go b/service/timestreamquery/snapshot_test.go
index eb42920dfe1..d7a112feaa8 100644
--- a/service/timestreamquery/snapshot_test.go
+++ b/service/timestreamquery/snapshot_test.go
@@ -7,7 +7,6 @@ package timestreamquery
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/timestreamwrite/snapshot_test.go b/service/timestreamwrite/snapshot_test.go
index b516118f92f..c756a25d8a9 100644
--- a/service/timestreamwrite/snapshot_test.go
+++ b/service/timestreamwrite/snapshot_test.go
@@ -7,7 +7,6 @@ package timestreamwrite
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/tnb/snapshot_test.go b/service/tnb/snapshot_test.go
index 7ae35b0e2a5..0e165ec4be7 100644
--- a/service/tnb/snapshot_test.go
+++ b/service/tnb/snapshot_test.go
@@ -7,7 +7,6 @@ package tnb
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/transcribe/snapshot_test.go b/service/transcribe/snapshot_test.go
index e7dd9919ff3..04754916f5e 100644
--- a/service/transcribe/snapshot_test.go
+++ b/service/transcribe/snapshot_test.go
@@ -7,7 +7,6 @@ package transcribe
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/transcribestreaming/snapshot_test.go b/service/transcribestreaming/snapshot_test.go
index 620bdc5e538..16e926bea65 100644
--- a/service/transcribestreaming/snapshot_test.go
+++ b/service/transcribestreaming/snapshot_test.go
@@ -7,7 +7,6 @@ package transcribestreaming
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/transfer/snapshot_test.go b/service/transfer/snapshot_test.go
index d0199d92a58..a23dd225685 100644
--- a/service/transfer/snapshot_test.go
+++ b/service/transfer/snapshot_test.go
@@ -7,7 +7,6 @@ package transfer
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/translate/snapshot_test.go b/service/translate/snapshot_test.go
index ee1d14e47ad..6197efc1706 100644
--- a/service/translate/snapshot_test.go
+++ b/service/translate/snapshot_test.go
@@ -7,7 +7,6 @@ package translate
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/trustedadvisor/snapshot_test.go b/service/trustedadvisor/snapshot_test.go
index 6aaf7b23656..db4f642c289 100644
--- a/service/trustedadvisor/snapshot_test.go
+++ b/service/trustedadvisor/snapshot_test.go
@@ -7,7 +7,6 @@ package trustedadvisor
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/verifiedpermissions/snapshot_test.go b/service/verifiedpermissions/snapshot_test.go
index 674859c5941..554d9130bee 100644
--- a/service/verifiedpermissions/snapshot_test.go
+++ b/service/verifiedpermissions/snapshot_test.go
@@ -7,7 +7,6 @@ package verifiedpermissions
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/voiceid/snapshot_test.go b/service/voiceid/snapshot_test.go
index 027ee0007ed..1d2588feedc 100644
--- a/service/voiceid/snapshot_test.go
+++ b/service/voiceid/snapshot_test.go
@@ -7,7 +7,6 @@ package voiceid
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/vpclattice/snapshot_test.go b/service/vpclattice/snapshot_test.go
index 5c08836cefb..a51b89bd9c9 100644
--- a/service/vpclattice/snapshot_test.go
+++ b/service/vpclattice/snapshot_test.go
@@ -7,7 +7,6 @@ package vpclattice
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/waf/snapshot_test.go b/service/waf/snapshot_test.go
index d30654b10b2..29540ad4085 100644
--- a/service/waf/snapshot_test.go
+++ b/service/waf/snapshot_test.go
@@ -7,7 +7,6 @@ package waf
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/wafregional/snapshot_test.go b/service/wafregional/snapshot_test.go
index 294704c6ed3..a6e9b97d3b7 100644
--- a/service/wafregional/snapshot_test.go
+++ b/service/wafregional/snapshot_test.go
@@ -7,7 +7,6 @@ package wafregional
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/wafv2/snapshot_test.go b/service/wafv2/snapshot_test.go
index 5bb12a79216..9330463dc85 100644
--- a/service/wafv2/snapshot_test.go
+++ b/service/wafv2/snapshot_test.go
@@ -7,7 +7,6 @@ package wafv2
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/wellarchitected/snapshot_test.go b/service/wellarchitected/snapshot_test.go
index ce75bfd4507..6f622756a16 100644
--- a/service/wellarchitected/snapshot_test.go
+++ b/service/wellarchitected/snapshot_test.go
@@ -7,7 +7,6 @@ package wellarchitected
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/wisdom/snapshot_test.go b/service/wisdom/snapshot_test.go
index 622443d7b7c..9a3cb950377 100644
--- a/service/wisdom/snapshot_test.go
+++ b/service/wisdom/snapshot_test.go
@@ -7,7 +7,6 @@ package wisdom
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/workdocs/snapshot_test.go b/service/workdocs/snapshot_test.go
index 04f89e91ec4..0508ec7a420 100644
--- a/service/workdocs/snapshot_test.go
+++ b/service/workdocs/snapshot_test.go
@@ -7,7 +7,6 @@ package workdocs
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/worklink/snapshot_test.go b/service/worklink/snapshot_test.go
index 454adc79f38..304ebed5582 100644
--- a/service/worklink/snapshot_test.go
+++ b/service/worklink/snapshot_test.go
@@ -7,7 +7,6 @@ package worklink
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/workmail/snapshot_test.go b/service/workmail/snapshot_test.go
index 9081a6c4e9f..68e095833fd 100644
--- a/service/workmail/snapshot_test.go
+++ b/service/workmail/snapshot_test.go
@@ -7,7 +7,6 @@ package workmail
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/workmailmessageflow/snapshot_test.go b/service/workmailmessageflow/snapshot_test.go
index 4324d6d5071..04fe96538cb 100644
--- a/service/workmailmessageflow/snapshot_test.go
+++ b/service/workmailmessageflow/snapshot_test.go
@@ -7,7 +7,6 @@ package workmailmessageflow
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/workspaces/snapshot_test.go b/service/workspaces/snapshot_test.go
index afbd9a4583c..6a4889a514f 100644
--- a/service/workspaces/snapshot_test.go
+++ b/service/workspaces/snapshot_test.go
@@ -7,7 +7,6 @@ package workspaces
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/workspacesthinclient/snapshot_test.go b/service/workspacesthinclient/snapshot_test.go
index 21548f6337e..dc23f1a939c 100644
--- a/service/workspacesthinclient/snapshot_test.go
+++ b/service/workspacesthinclient/snapshot_test.go
@@ -7,7 +7,6 @@ package workspacesthinclient
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/workspacesweb/snapshot_test.go b/service/workspacesweb/snapshot_test.go
index 11a0d4bd170..6b04ab117f4 100644
--- a/service/workspacesweb/snapshot_test.go
+++ b/service/workspacesweb/snapshot_test.go
@@ -7,7 +7,6 @@ package workspacesweb
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}
diff --git a/service/xray/snapshot_test.go b/service/xray/snapshot_test.go
index e9206e1ab15..161eb662158 100644
--- a/service/xray/snapshot_test.go
+++ b/service/xray/snapshot_test.go
@@ -7,7 +7,6 @@ package xray
 import (
 	"context"
 	"errors"
-	"flag"
 	"fmt"
 	"github.com/aws/smithy-go/middleware"
 	"io"
@@ -16,12 +15,6 @@ import (
 	"testing"
 )
 
-var quiet bool
-
-func init() {
-	flag.BoolVar(&quiet, "quiet", false, "suppress full snapshot diffs")
-}
-
 const ssprefix = "snapshot"
 
 type snapshotOK struct{}
@@ -65,9 +58,6 @@ func testSnapshot(stack *middleware.Stack, operation string) error {
 		return err
 	}
 	if actual := stack.String(); actual != string(expected) {
-		if quiet {
-			return fmt.Errorf("snapshot mismatch: %s", operation)
-		}
 		return fmt.Errorf("%s != %s", expected, actual)
 	}
 	return snapshotOK{}