Skip to content

Commit 04ab13e

Browse files
sirknightjsirknightj
committed
Clang-format
1 parent db4a3d0 commit 04ab13e

File tree

3 files changed

+57
-57
lines changed

3 files changed

+57
-57
lines changed

‎src/source/CurlApiCallbacks.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ STATUS createCurlApiCallbacks(PCallbacksProvider pCallbacksProvider, PCHAR regio
8181
// Construct Control Plane URL
8282
if (IS_NULL_OR_EMPTY_STRING(controlPlaneUrl)) {
8383
CHK_STATUS(determineKvsControlPlaneEndpointType(&controlPlaneEndpointType));
84-
CHK_STATUS(constructControlPlaneUrl(pCurlApiCallbacks->controlPlaneUrl, MAX_URI_CHAR_LEN, pCurlApiCallbacks->region, controlPlaneEndpointType));
84+
CHK_STATUS(
85+
constructControlPlaneUrl(pCurlApiCallbacks->controlPlaneUrl, MAX_URI_CHAR_LEN, pCurlApiCallbacks->region, controlPlaneEndpointType));
8586
} else {
8687
STRNCPY(pCurlApiCallbacks->controlPlaneUrl, controlPlaneUrl, MAX_URI_CHAR_LEN);
8788
}
@@ -212,7 +213,8 @@ STATUS determineKvsControlPlaneEndpointType(PKvsControlPlaneEndpointType pEndpoi
212213
return retStatus;
213214
}
214215

215-
const char* endpointTypeToString(const KvsControlPlaneEndpointType type) {
216+
const char* endpointTypeToString(const KvsControlPlaneEndpointType type)
217+
{
216218
switch (type) {
217219
case ENDPOINT_TYPE_LEGACY:
218220
return "LEGACY";

‎src/source/CurlApiCallbacks.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ extern "C" {
2222

2323
#define CONTROL_PLANE_USE_DUAL_STACK_ENDPOINT_ENV_VAR "AWS_USE_DUALSTACK_ENDPOINT"
2424

25-
typedef enum {
26-
ENDPOINT_TYPE_LEGACY,
27-
ENDPOINT_TYPE_DUAL_STACK
28-
} KvsControlPlaneEndpointType;
25+
typedef enum { ENDPOINT_TYPE_LEGACY, ENDPOINT_TYPE_DUAL_STACK } KvsControlPlaneEndpointType;
2926
typedef KvsControlPlaneEndpointType* PKvsControlPlaneEndpointType;
3027

3128
#if defined(AWS_KVS_USE_LEGACY_ENDPOINT_ONLY) && defined(AWS_KVS_USE_DUAL_STACK_ENDPOINT_ONLY)

‎tst/ProducerCallbackProviderApiTest.cpp‎

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -79,57 +79,58 @@ std::string ControlPlaneUrlTestName(const testing::TestParamInfo<ControlPlaneUrl
7979
}
8080

8181
// Instantiate the test suite with multiple test cases
82-
INSTANTIATE_TEST_SUITE_P(ControlPlaneUrlTests, ControlPlaneUrlTest,
83-
::testing::Values(
84-
// Legacy endpoints
85-
ControlPlaneUrlTestParam{"us-east-1", "https://kinesisvideo.us-east-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
86-
ControlPlaneUrlTestParam{"us-west-2", "https://kinesisvideo.us-west-2.amazonaws.com", ENDPOINT_TYPE_LEGACY},
87-
ControlPlaneUrlTestParam{"ap-northeast-1", "https://kinesisvideo.ap-northeast-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
88-
ControlPlaneUrlTestParam{"ap-southeast-2", "https://kinesisvideo.ap-southeast-2.amazonaws.com", ENDPOINT_TYPE_LEGACY},
89-
ControlPlaneUrlTestParam{"eu-central-1", "https://kinesisvideo.eu-central-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
90-
ControlPlaneUrlTestParam{"eu-west-1", "https://kinesisvideo.eu-west-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
91-
ControlPlaneUrlTestParam{"ap-northeast-2", "https://kinesisvideo.ap-northeast-2.amazonaws.com", ENDPOINT_TYPE_LEGACY},
92-
ControlPlaneUrlTestParam{"ap-south-1", "https://kinesisvideo.ap-south-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
93-
ControlPlaneUrlTestParam{"ap-southeast-1", "https://kinesisvideo.ap-southeast-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
94-
ControlPlaneUrlTestParam{"ca-central-1", "https://kinesisvideo.ca-central-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
95-
ControlPlaneUrlTestParam{"eu-north-1", "https://kinesisvideo.eu-north-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
96-
ControlPlaneUrlTestParam{"eu-west-2", "https://kinesisvideo.eu-west-2.amazonaws.com", ENDPOINT_TYPE_LEGACY},
97-
ControlPlaneUrlTestParam{"sa-east-1", "https://kinesisvideo.sa-east-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
98-
ControlPlaneUrlTestParam{"us-east-2", "https://kinesisvideo.us-east-2.amazonaws.com", ENDPOINT_TYPE_LEGACY},
99-
ControlPlaneUrlTestParam{"ap-east-1", "https://kinesisvideo.ap-east-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
100-
ControlPlaneUrlTestParam{"af-south-1", "https://kinesisvideo.af-south-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
101-
ControlPlaneUrlTestParam{"us-iso-east-1", "https://kinesisvideo-fips.us-iso-east-1.c2s.ic.gov", ENDPOINT_TYPE_LEGACY},
102-
ControlPlaneUrlTestParam{"us-iso-west-1", "https://kinesisvideo-fips.us-iso-west-1.c2s.ic.gov", ENDPOINT_TYPE_LEGACY},
103-
ControlPlaneUrlTestParam{"us-isob-east-1", "https://kinesisvideo-fips.us-isob-east-1.sc2s.sgov.gov", ENDPOINT_TYPE_LEGACY},
104-
ControlPlaneUrlTestParam{"us-gov-west-1", "https://kinesisvideo-fips.us-gov-west-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
105-
ControlPlaneUrlTestParam{"us-gov-east-1", "https://kinesisvideo-fips.us-gov-east-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
106-
ControlPlaneUrlTestParam{"cn-north-1", "https://kinesisvideo.cn-north-1.amazonaws.com.cn", ENDPOINT_TYPE_LEGACY},
107-
ControlPlaneUrlTestParam{"cn-northwest-1", "https://kinesisvideo.cn-northwest-1.amazonaws.com.cn", ENDPOINT_TYPE_LEGACY},
108-
109-
// Dual-Stack endpoints
110-
ControlPlaneUrlTestParam{"us-west-2", "https://kinesisvideo.us-west-2.api.aws", ENDPOINT_TYPE_DUAL_STACK},
111-
ControlPlaneUrlTestParam{"ap-northeast-1", "https://kinesisvideo.ap-northeast-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
112-
ControlPlaneUrlTestParam{"ap-southeast-2", "https://kinesisvideo.ap-southeast-2.api.aws", ENDPOINT_TYPE_DUAL_STACK},
113-
ControlPlaneUrlTestParam{"eu-central-1", "https://kinesisvideo.eu-central-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
114-
ControlPlaneUrlTestParam{"eu-west-1", "https://kinesisvideo.eu-west-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
115-
ControlPlaneUrlTestParam{"ap-northeast-2", "https://kinesisvideo.ap-northeast-2.api.aws", ENDPOINT_TYPE_DUAL_STACK},
116-
ControlPlaneUrlTestParam{"ap-south-1", "https://kinesisvideo.ap-south-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
117-
ControlPlaneUrlTestParam{"ap-southeast-1", "https://kinesisvideo.ap-southeast-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
118-
ControlPlaneUrlTestParam{"ca-central-1", "https://kinesisvideo.ca-central-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
119-
ControlPlaneUrlTestParam{"eu-north-1", "https://kinesisvideo.eu-north-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
120-
ControlPlaneUrlTestParam{"eu-west-2", "https://kinesisvideo.eu-west-2.api.aws", ENDPOINT_TYPE_DUAL_STACK},
121-
ControlPlaneUrlTestParam{"sa-east-1", "https://kinesisvideo.sa-east-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
122-
ControlPlaneUrlTestParam{"us-east-2", "https://kinesisvideo.us-east-2.api.aws", ENDPOINT_TYPE_DUAL_STACK},
123-
ControlPlaneUrlTestParam{"ap-east-1", "https://kinesisvideo.ap-east-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
124-
ControlPlaneUrlTestParam{"af-south-1", "https://kinesisvideo.af-south-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
125-
ControlPlaneUrlTestParam{"us-iso-east-1", "https://kinesisvideo-fips.us-iso-east-1.api.aws.ic.gov", ENDPOINT_TYPE_DUAL_STACK},
126-
ControlPlaneUrlTestParam{"us-iso-west-1", "https://kinesisvideo-fips.us-iso-west-1.api.aws.ic.gov", ENDPOINT_TYPE_DUAL_STACK},
127-
ControlPlaneUrlTestParam{"us-isob-east-1", "https://kinesisvideo-fips.us-isob-east-1.api.aws.scloud", ENDPOINT_TYPE_DUAL_STACK},
128-
ControlPlaneUrlTestParam{"us-gov-west-1", "https://kinesisvideo-fips.us-gov-west-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
129-
ControlPlaneUrlTestParam{"us-gov-east-1", "https://kinesisvideo-fips.us-gov-east-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
130-
ControlPlaneUrlTestParam{"cn-north-1", "https://kinesisvideo.cn-north-1.api.amazonwebservices.com.cn", ENDPOINT_TYPE_DUAL_STACK},
131-
ControlPlaneUrlTestParam{"cn-northwest-1", "https://kinesisvideo.cn-northwest-1.api.amazonwebservices.com.cn", ENDPOINT_TYPE_DUAL_STACK}),
132-
ControlPlaneUrlTestName);
82+
INSTANTIATE_TEST_SUITE_P(
83+
ControlPlaneUrlTests, ControlPlaneUrlTest,
84+
::testing::Values(
85+
// Legacy endpoints
86+
ControlPlaneUrlTestParam{"us-east-1", "https://kinesisvideo.us-east-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
87+
ControlPlaneUrlTestParam{"us-west-2", "https://kinesisvideo.us-west-2.amazonaws.com", ENDPOINT_TYPE_LEGACY},
88+
ControlPlaneUrlTestParam{"ap-northeast-1", "https://kinesisvideo.ap-northeast-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
89+
ControlPlaneUrlTestParam{"ap-southeast-2", "https://kinesisvideo.ap-southeast-2.amazonaws.com", ENDPOINT_TYPE_LEGACY},
90+
ControlPlaneUrlTestParam{"eu-central-1", "https://kinesisvideo.eu-central-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
91+
ControlPlaneUrlTestParam{"eu-west-1", "https://kinesisvideo.eu-west-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
92+
ControlPlaneUrlTestParam{"ap-northeast-2", "https://kinesisvideo.ap-northeast-2.amazonaws.com", ENDPOINT_TYPE_LEGACY},
93+
ControlPlaneUrlTestParam{"ap-south-1", "https://kinesisvideo.ap-south-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
94+
ControlPlaneUrlTestParam{"ap-southeast-1", "https://kinesisvideo.ap-southeast-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
95+
ControlPlaneUrlTestParam{"ca-central-1", "https://kinesisvideo.ca-central-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
96+
ControlPlaneUrlTestParam{"eu-north-1", "https://kinesisvideo.eu-north-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
97+
ControlPlaneUrlTestParam{"eu-west-2", "https://kinesisvideo.eu-west-2.amazonaws.com", ENDPOINT_TYPE_LEGACY},
98+
ControlPlaneUrlTestParam{"sa-east-1", "https://kinesisvideo.sa-east-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
99+
ControlPlaneUrlTestParam{"us-east-2", "https://kinesisvideo.us-east-2.amazonaws.com", ENDPOINT_TYPE_LEGACY},
100+
ControlPlaneUrlTestParam{"ap-east-1", "https://kinesisvideo.ap-east-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
101+
ControlPlaneUrlTestParam{"af-south-1", "https://kinesisvideo.af-south-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
102+
ControlPlaneUrlTestParam{"us-iso-east-1", "https://kinesisvideo-fips.us-iso-east-1.c2s.ic.gov", ENDPOINT_TYPE_LEGACY},
103+
ControlPlaneUrlTestParam{"us-iso-west-1", "https://kinesisvideo-fips.us-iso-west-1.c2s.ic.gov", ENDPOINT_TYPE_LEGACY},
104+
ControlPlaneUrlTestParam{"us-isob-east-1", "https://kinesisvideo-fips.us-isob-east-1.sc2s.sgov.gov", ENDPOINT_TYPE_LEGACY},
105+
ControlPlaneUrlTestParam{"us-gov-west-1", "https://kinesisvideo-fips.us-gov-west-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
106+
ControlPlaneUrlTestParam{"us-gov-east-1", "https://kinesisvideo-fips.us-gov-east-1.amazonaws.com", ENDPOINT_TYPE_LEGACY},
107+
ControlPlaneUrlTestParam{"cn-north-1", "https://kinesisvideo.cn-north-1.amazonaws.com.cn", ENDPOINT_TYPE_LEGACY},
108+
ControlPlaneUrlTestParam{"cn-northwest-1", "https://kinesisvideo.cn-northwest-1.amazonaws.com.cn", ENDPOINT_TYPE_LEGACY},
109+
110+
// Dual-Stack endpoints
111+
ControlPlaneUrlTestParam{"us-west-2", "https://kinesisvideo.us-west-2.api.aws", ENDPOINT_TYPE_DUAL_STACK},
112+
ControlPlaneUrlTestParam{"ap-northeast-1", "https://kinesisvideo.ap-northeast-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
113+
ControlPlaneUrlTestParam{"ap-southeast-2", "https://kinesisvideo.ap-southeast-2.api.aws", ENDPOINT_TYPE_DUAL_STACK},
114+
ControlPlaneUrlTestParam{"eu-central-1", "https://kinesisvideo.eu-central-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
115+
ControlPlaneUrlTestParam{"eu-west-1", "https://kinesisvideo.eu-west-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
116+
ControlPlaneUrlTestParam{"ap-northeast-2", "https://kinesisvideo.ap-northeast-2.api.aws", ENDPOINT_TYPE_DUAL_STACK},
117+
ControlPlaneUrlTestParam{"ap-south-1", "https://kinesisvideo.ap-south-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
118+
ControlPlaneUrlTestParam{"ap-southeast-1", "https://kinesisvideo.ap-southeast-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
119+
ControlPlaneUrlTestParam{"ca-central-1", "https://kinesisvideo.ca-central-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
120+
ControlPlaneUrlTestParam{"eu-north-1", "https://kinesisvideo.eu-north-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
121+
ControlPlaneUrlTestParam{"eu-west-2", "https://kinesisvideo.eu-west-2.api.aws", ENDPOINT_TYPE_DUAL_STACK},
122+
ControlPlaneUrlTestParam{"sa-east-1", "https://kinesisvideo.sa-east-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
123+
ControlPlaneUrlTestParam{"us-east-2", "https://kinesisvideo.us-east-2.api.aws", ENDPOINT_TYPE_DUAL_STACK},
124+
ControlPlaneUrlTestParam{"ap-east-1", "https://kinesisvideo.ap-east-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
125+
ControlPlaneUrlTestParam{"af-south-1", "https://kinesisvideo.af-south-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
126+
ControlPlaneUrlTestParam{"us-iso-east-1", "https://kinesisvideo-fips.us-iso-east-1.api.aws.ic.gov", ENDPOINT_TYPE_DUAL_STACK},
127+
ControlPlaneUrlTestParam{"us-iso-west-1", "https://kinesisvideo-fips.us-iso-west-1.api.aws.ic.gov", ENDPOINT_TYPE_DUAL_STACK},
128+
ControlPlaneUrlTestParam{"us-isob-east-1", "https://kinesisvideo-fips.us-isob-east-1.api.aws.scloud", ENDPOINT_TYPE_DUAL_STACK},
129+
ControlPlaneUrlTestParam{"us-gov-west-1", "https://kinesisvideo-fips.us-gov-west-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
130+
ControlPlaneUrlTestParam{"us-gov-east-1", "https://kinesisvideo-fips.us-gov-east-1.api.aws", ENDPOINT_TYPE_DUAL_STACK},
131+
ControlPlaneUrlTestParam{"cn-north-1", "https://kinesisvideo.cn-north-1.api.amazonwebservices.com.cn", ENDPOINT_TYPE_DUAL_STACK},
132+
ControlPlaneUrlTestParam{"cn-northwest-1", "https://kinesisvideo.cn-northwest-1.api.amazonwebservices.com.cn", ENDPOINT_TYPE_DUAL_STACK}),
133+
ControlPlaneUrlTestName);
133134
} // namespace video
134135
} // namespace kinesis
135136
} // namespace amazonaws

0 commit comments

Comments
 (0)