From fc0e5532a3e5d2392a46a4c45c0e4fc98e09fbfb Mon Sep 17 00:00:00 2001 From: Matt Muller Date: Mon, 5 Aug 2024 17:56:42 -0400 Subject: [PATCH] Add http trait to white label tests to fix warnings --- .../model/component-test/auth.smithy | 8 ++++++++ .../model/component-test/compression.smithy | 2 ++ .../model/component-test/defaults.smithy | 1 + .../model/component-test/endpoints.smithy | 4 ++++ .../model/component-test/eventstreams.smithy | 1 + .../model/component-test/main.smithy | 1 + .../model/component-test/mixins.smithy | 1 + .../model/component-test/paginators.smithy | 3 +++ .../model/component-test/relative-middleware.smithy | 1 + .../model/component-test/streaming.smithy | 2 ++ 10 files changed, 24 insertions(+) diff --git a/codegen/smithy-ruby-codegen-test/model/component-test/auth.smithy b/codegen/smithy-ruby-codegen-test/model/component-test/auth.smithy index 4fe6bf657..3d39f6cc8 100644 --- a/codegen/smithy-ruby-codegen-test/model/component-test/auth.smithy +++ b/codegen/smithy-ruby-codegen-test/model/component-test/auth.smithy @@ -18,25 +18,33 @@ apply WhiteLabel @httpCustomAuth(signerProperty: "signer", identityProperty: "id apply WhiteLabel @auth([httpApiKeyAuth, httpBasicAuth, httpBearerAuth, httpDigestAuth, httpCustomAuth]) @auth([httpBasicAuth]) +@http(method: "POST", uri: "/http_basic_auth") operation HttpBasicAuth {} @auth([httpDigestAuth]) +@http(method: "POST", uri: "/http_digest_auth") operation HttpDigestAuth {} @auth([httpBearerAuth]) +@http(method: "POST", uri: "/http_bearer_auth") operation HttpBearerAuth {} @auth([httpApiKeyAuth]) +@http(method: "POST", uri: "/http_api_key_auth") operation HttpApiKeyAuth {} @optionalAuth +@http(method: "POST", uri: "/optional_auth") operation OptionalAuth {} @auth([]) +@http(method: "POST", uri: "/no_auth") operation NoAuth {} @auth([httpBasicAuth, httpDigestAuth, httpBearerAuth, httpApiKeyAuth]) +@http(method: "POST", uri: "/ordered_auth") operation OrderedAuth {} @auth([httpCustomAuth]) +@http(method: "POST", uri: "/custom_auth") operation CustomAuth {} diff --git a/codegen/smithy-ruby-codegen-test/model/component-test/compression.smithy b/codegen/smithy-ruby-codegen-test/model/component-test/compression.smithy index e3764fde2..aa36bcf8b 100644 --- a/codegen/smithy-ruby-codegen-test/model/component-test/compression.smithy +++ b/codegen/smithy-ruby-codegen-test/model/component-test/compression.smithy @@ -6,6 +6,7 @@ namespace smithy.ruby.tests @requestCompression( encodings: ["gzip"] ) +@http(method: "POST", uri: "/request_compression") operation RequestCompression { input: RequestCompressionInput } @@ -14,6 +15,7 @@ operation RequestCompression { @requestCompression( encodings: ["gzip"] ) +@http(method: "POST", uri: "/request_compression_streaming") operation RequestCompressionStreaming { input: RequestCompressionStreamingInput } diff --git a/codegen/smithy-ruby-codegen-test/model/component-test/defaults.smithy b/codegen/smithy-ruby-codegen-test/model/component-test/defaults.smithy index 5165e53de..5019c5f30 100644 --- a/codegen/smithy-ruby-codegen-test/model/component-test/defaults.smithy +++ b/codegen/smithy-ruby-codegen-test/model/component-test/defaults.smithy @@ -1,6 +1,7 @@ $version: "2.0" namespace smithy.ruby.tests +@http(method: "POST", uri: "/defaults_test") operation DefaultsTest { input:= { defaults: Defaults diff --git a/codegen/smithy-ruby-codegen-test/model/component-test/endpoints.smithy b/codegen/smithy-ruby-codegen-test/model/component-test/endpoints.smithy index b4e90cdff..3cf15a45b 100644 --- a/codegen/smithy-ruby-codegen-test/model/component-test/endpoints.smithy +++ b/codegen/smithy-ruby-codegen-test/model/component-test/endpoints.smithy @@ -9,11 +9,13 @@ use smithy.rules#contextParam use smithy.rules#staticContextParams @endpoint(hostPrefix: "foo.") +@http(method: "POST", uri: "/endpoint_operation") operation EndpointOperation {} @suppress(["UnstableTrait"]) @endpoint(hostPrefix: "foo.{labelMember}.") @staticContextParams(Dataplane: {value: true}) +@http(method: "POST", uri: "/endpoint_with_host_label_operation") operation EndpointWithHostLabelOperation { input: EndpointWithHostLabelOperationInput, } @@ -26,8 +28,10 @@ structure EndpointWithHostLabelOperationInput { @suppress(["UnstableTrait"]) @staticContextParams(Dataplane: {value: true}) +@http(method: "POST", uri: "/dataplane_endpoint") operation DataplaneEndpoint {} +@http(method: "POST", uri: "/resource_endpoint") operation ResourceEndpoint { input: ResourceEndpointInput } diff --git a/codegen/smithy-ruby-codegen-test/model/component-test/eventstreams.smithy b/codegen/smithy-ruby-codegen-test/model/component-test/eventstreams.smithy index 70afbfd72..33c23862f 100644 --- a/codegen/smithy-ruby-codegen-test/model/component-test/eventstreams.smithy +++ b/codegen/smithy-ruby-codegen-test/model/component-test/eventstreams.smithy @@ -3,6 +3,7 @@ $version: "2.0" namespace smithy.ruby.tests @optionalAuth +@http(method: "POST", uri: "/start_event_stream") operation StartEventStream { input: StartEventStreamInputOutput output: StartEventStreamInputOutput diff --git a/codegen/smithy-ruby-codegen-test/model/component-test/main.smithy b/codegen/smithy-ruby-codegen-test/model/component-test/main.smithy index a73c4de8f..e48ca547e 100644 --- a/codegen/smithy-ruby-codegen-test/model/component-test/main.smithy +++ b/codegen/smithy-ruby-codegen-test/model/component-test/main.smithy @@ -298,6 +298,7 @@ service WhiteLabel { ] } +@http(method: "POST", uri: "/kitchen_sink") operation KitchenSink { input: KitchenSinkInputOutput, output: KitchenSinkInputOutput, diff --git a/codegen/smithy-ruby-codegen-test/model/component-test/mixins.smithy b/codegen/smithy-ruby-codegen-test/model/component-test/mixins.smithy index 0ecf6cf7b..49ea0ebd9 100644 --- a/codegen/smithy-ruby-codegen-test/model/component-test/mixins.smithy +++ b/codegen/smithy-ruby-codegen-test/model/component-test/mixins.smithy @@ -2,6 +2,7 @@ $version: "2.0" namespace smithy.ruby.tests +@http(method: "POST", uri: "/mixin_test") operation MixinTest { // The generated shape name is GetUserInput input := { diff --git a/codegen/smithy-ruby-codegen-test/model/component-test/paginators.smithy b/codegen/smithy-ruby-codegen-test/model/component-test/paginators.smithy index 2cad416ea..d23bd861d 100644 --- a/codegen/smithy-ruby-codegen-test/model/component-test/paginators.smithy +++ b/codegen/smithy-ruby-codegen-test/model/component-test/paginators.smithy @@ -2,12 +2,14 @@ $version: "2.0" namespace smithy.ruby.tests @paginated(inputToken: "nextToken", outputToken: "nextToken") +@http(method: "POST", uri: "/paginators_test") operation PaginatorsTest { input: PaginatorsTestInput, output: PaginatorsTestOutput } @paginated(inputToken: "nextToken", outputToken: "nextToken", items: "items") +@http(method: "POST", uri: "/paginators_test_with_items") operation PaginatorsTestWithItems { input: PaginatorsTestInput, output: PaginatorsTestOutput @@ -23,6 +25,7 @@ structure PaginatorsTestOutput { } @paginated(inputToken: "__nextToken", outputToken: "__wrapper.__123nextToken", items: "__items") +@http(method: "POST", uri: "/paginators_test_with_bad_names") operation __PaginatorsTestWithBadNames { input: __PaginatorsTestWithBadNamesInput, output: __PaginatorsTestWithBadNamesOutput diff --git a/codegen/smithy-ruby-codegen-test/model/component-test/relative-middleware.smithy b/codegen/smithy-ruby-codegen-test/model/component-test/relative-middleware.smithy index 000266129..2bc5a875c 100644 --- a/codegen/smithy-ruby-codegen-test/model/component-test/relative-middleware.smithy +++ b/codegen/smithy-ruby-codegen-test/model/component-test/relative-middleware.smithy @@ -2,4 +2,5 @@ $version: "2.0" namespace smithy.ruby.tests +@http(method: "POST", uri: "/relative_middleware") operation RelativeMiddleware {} diff --git a/codegen/smithy-ruby-codegen-test/model/component-test/streaming.smithy b/codegen/smithy-ruby-codegen-test/model/component-test/streaming.smithy index 1c2bfc15e..a94300fad 100644 --- a/codegen/smithy-ruby-codegen-test/model/component-test/streaming.smithy +++ b/codegen/smithy-ruby-codegen-test/model/component-test/streaming.smithy @@ -1,6 +1,7 @@ $version: "2.0" namespace smithy.ruby.tests +@http(method: "POST", uri: "/streaming") operation Streaming { input: StreamingInput, output: StreamingOutput, @@ -23,6 +24,7 @@ structure StreamingOutput { @streaming blob StreamingBlob +@http(method: "POST", uri: "/streaming_with_length") operation StreamingWithLength { input: StreamingWithLengthInput, }