Skip to content

Commit 95bd4aa

Browse files
authored
chore: kickoff release
2 parents 6e4345b + 4292bdc commit 95bd4aa

99 files changed

Lines changed: 3746 additions & 1457 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
persist-credentials: false
2121

2222
- name: Dependency Review
23-
uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
23+
uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0
2424
with:
2525
config-file: amazon-ospo/dependency-review-config/default/dependency-review-config.yml@main

.github/workflows/integ_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
uses: ./.github/workflows/integ_test_analytics.yml
1919
secrets: inherit
2020

21-
kinesis-test:
22-
name: Kinesis Integration Tests
23-
uses: ./.github/workflows/integ_test_kinesis.yml
21+
kinesis-firehose-test:
22+
name: Kinesis & Firehose Integration Tests
23+
uses: ./.github/workflows/integ_test_kinesis_firehose.yml
2424
secrets: inherit
2525

2626
push-notifications-test:

.github/workflows/integ_test_kinesis.yml renamed to .github/workflows/integ_test_kinesis_firehose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Integration Tests | Kinesis
1+
name: Integration Tests | Kinesis & Firehose
22
on:
33
workflow_dispatch:
44
inputs:
@@ -19,8 +19,8 @@ permissions:
1919
contents: read
2020

2121
jobs:
22-
kinesis-integration-tests:
23-
name: Kinesis Integration Tests
22+
kinesis-firehose-integration-tests:
23+
name: Kinesis & Firehose Integration Tests
2424
strategy:
2525
fail-fast: false
2626
matrix:
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
scheme: AmplifyKinesisClientIntegrationTests
3434
platform: ${{ matrix.platform }}
35-
project_path: ./AmplifyClients/AmplifyKinesisClient/Tests/IntegrationTests/KinesisHostApp
35+
project_path: ./AmplifyClients/Tests/IntegrationTests/KinesisFirehoseClientHostApp
3636
resource_subfolder: kinesis
3737
timeout-minutes: 30
3838
secrets: inherit

.github/workflows/swiftformat.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,24 @@ concurrency:
2424
jobs:
2525
run-swiftformat:
2626
runs-on: macos-latest
27+
env:
28+
SWIFTFORMAT_VERSION: '0.60.1'
29+
SWIFTFORMAT_SHA256: 'cb4738085cf39c08da00b79b4a3683e77458ca12909934d04e5087d8e73f5e43'
2730
steps:
2831
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
2932
with:
3033
persist-credentials: false
3134

35+
- name: Install SwiftFormat
36+
run: |
37+
curl -sL "https://github.com/nicklockwood/SwiftFormat/releases/download/$SWIFTFORMAT_VERSION/swiftformat.artifactbundle.zip" -o sf.zip
38+
echo "$SWIFTFORMAT_SHA256 sf.zip" | shasum -a 256 --check
39+
unzip -q sf.zip
40+
3241
- name: SwiftFormat
3342
run: |
34-
swiftformat --lint . --reporter github-actions-log --swiftversion 5.9
43+
./swiftformat.artifactbundle/swiftformat-$SWIFTFORMAT_VERSION-macos/bin/swiftformat --version
44+
./swiftformat.artifactbundle/swiftformat-$SWIFTFORMAT_VERSION-macos/bin/swiftformat --lint . --reporter github-actions-log --swiftversion 5.9
3545
3646
confirm-pass:
3747
runs-on: macos-latest

.github/workflows/unit_test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ jobs:
7272
AWSCloudWatchLoggingPlugin,
7373
AWSCognitoAuthPlugin,
7474
AWSDataStorePlugin,
75+
AmplifyRecordCache,
7576
AmplifyKinesisClient,
77+
AmplifyFirehoseClient,
7678
AWSLocationGeoPlugin,
7779
AWSPredictionsPlugin,
7880
AWSPinpointAnalyticsPlugin,
@@ -100,7 +102,9 @@ jobs:
100102
{ scheme: AWSCloudWatchLoggingPlugin, flags: 'Logging_plugin_unit_test,unit_tests' },
101103
{ scheme: AWSCognitoAuthPlugin, flags: 'Auth_plugin_unit_test,unit_tests' },
102104
{ scheme: AWSDataStorePlugin, flags: 'DataStore_plugin_unit_test,unit_tests' },
105+
{ scheme: AmplifyRecordCache, flags: 'RecordCache_unit_test,unit_tests' },
103106
{ scheme: AmplifyKinesisClient, flags: 'Kinesis_plugin_unit_test,unit_tests' },
107+
{ scheme: AmplifyFirehoseClient, flags: 'Firehose_plugin_unit_test,unit_tests' },
104108
{ scheme: AWSLocationGeoPlugin, flags: 'Geo_plugin_unit_test,unit_tests' },
105109
{ scheme: AWSPredictionsPlugin, flags: 'Predictions_plugin_unit_test,unit_tests' },
106110
{ scheme: AWSPinpointAnalyticsPlugin, flags: 'Analytics_plugin_unit_test,unit_tests' },

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ GraphQLWithIAMIntegrationTests-credentials.json
8282

8383
AWSDataStoreCategoryPluginIntegrationTests-amplifyconfiguration.json
8484
*.code-workspace
85+
AmplifyClients/Tests/IntegrationTests/KinesisFirehoseClientHostApp/infra/

.swiftformat

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
--enable void
6666
--empty void
6767

68-
--enable wrapArguments
68+
--disable wrapArguments
6969
--closingparen balanced
7070
--wraparguments before-first
7171
--wrapcollections before-first
@@ -119,4 +119,30 @@
119119
--enable strongifiedSelf
120120
--disable todos
121121
--enable typeSugar
122-
--enable yodaConditions
122+
--enable yodaConditions
123+
--disable blankLinesBetweenImports
124+
--disable docComments
125+
--disable redundantVariable
126+
--disable sortImports
127+
--disable wrapPropertyBodies
128+
--disable wrapFunctionBodies
129+
--disable simplifyGenericConstraints
130+
--disable redundantThrows
131+
--disable noForceUnwrapInTests
132+
--disable noForceTryInTests
133+
--disable hoistTry
134+
--disable hoistAwait
135+
--disable redundantAsync
136+
--enable redundantOptionalBinding
137+
--enable redundantPublic
138+
--enable redundantInternal
139+
--enable redundantStaticSelf
140+
--enable redundantType
141+
--disable redundantEquatable
142+
--disable redundantSendable
143+
--disable redundantMemberwiseInit
144+
--disable opaqueGenericParameters
145+
--enable extensionAccessControl
146+
--disable preferForLoop
147+
--enable emptyExtensions
148+
--disable environmentEntry
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1640"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "AmplifyFirehoseClient"
18+
BuildableName = "AmplifyFirehoseClient"
19+
BlueprintName = "AmplifyFirehoseClient"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES"
31+
onlyGenerateCoverageForSpecifiedTargets = "YES">
32+
<CodeCoverageTargets>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "AmplifyFirehoseClient"
36+
BuildableName = "AmplifyFirehoseClient"
37+
BlueprintName = "AmplifyFirehoseClient"
38+
ReferencedContainer = "container:">
39+
</BuildableReference>
40+
</CodeCoverageTargets>
41+
<Testables>
42+
<TestableReference
43+
skipped = "NO">
44+
<BuildableReference
45+
BuildableIdentifier = "primary"
46+
BlueprintIdentifier = "AmplifyFirehoseClientTests"
47+
BuildableName = "AmplifyFirehoseClientTests"
48+
BlueprintName = "AmplifyFirehoseClientTests"
49+
ReferencedContainer = "container:">
50+
</BuildableReference>
51+
</TestableReference>
52+
</Testables>
53+
</TestAction>
54+
<LaunchAction
55+
buildConfiguration = "Debug"
56+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
57+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
launchStyle = "0"
59+
useCustomWorkingDirectory = "NO"
60+
ignoresPersistentStateOnLaunch = "NO"
61+
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
63+
allowLocationSimulation = "YES">
64+
</LaunchAction>
65+
<ProfileAction
66+
buildConfiguration = "Release"
67+
shouldUseLaunchSchemeArgsEnv = "YES"
68+
savedToolIdentifier = ""
69+
useCustomWorkingDirectory = "NO"
70+
debugDocumentVersioning = "YES">
71+
<MacroExpansion>
72+
<BuildableReference
73+
BuildableIdentifier = "primary"
74+
BlueprintIdentifier = "AmplifyFirehoseClient"
75+
BuildableName = "AmplifyFirehoseClient"
76+
BlueprintName = "AmplifyFirehoseClient"
77+
ReferencedContainer = "container:">
78+
</BuildableReference>
79+
</MacroExpansion>
80+
</ProfileAction>
81+
<AnalyzeAction
82+
buildConfiguration = "Debug">
83+
</AnalyzeAction>
84+
<ArchiveAction
85+
buildConfiguration = "Release"
86+
revealArchiveInOrganizer = "YES">
87+
</ArchiveAction>
88+
</Scheme>
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1640"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "AmplifyRecordCache"
18+
BuildableName = "AmplifyRecordCache"
19+
BlueprintName = "AmplifyRecordCache"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES"
31+
onlyGenerateCoverageForSpecifiedTargets = "YES">
32+
<CodeCoverageTargets>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "AmplifyRecordCache"
36+
BuildableName = "AmplifyRecordCache"
37+
BlueprintName = "AmplifyRecordCache"
38+
ReferencedContainer = "container:">
39+
</BuildableReference>
40+
</CodeCoverageTargets>
41+
<Testables>
42+
<TestableReference
43+
skipped = "NO">
44+
<BuildableReference
45+
BuildableIdentifier = "primary"
46+
BlueprintIdentifier = "AmplifyRecordCacheTests"
47+
BuildableName = "AmplifyRecordCacheTests"
48+
BlueprintName = "AmplifyRecordCacheTests"
49+
ReferencedContainer = "container:">
50+
</BuildableReference>
51+
</TestableReference>
52+
</Testables>
53+
</TestAction>
54+
<LaunchAction
55+
buildConfiguration = "Debug"
56+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
57+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
launchStyle = "0"
59+
useCustomWorkingDirectory = "NO"
60+
ignoresPersistentStateOnLaunch = "NO"
61+
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
63+
allowLocationSimulation = "YES">
64+
</LaunchAction>
65+
<ProfileAction
66+
buildConfiguration = "Release"
67+
shouldUseLaunchSchemeArgsEnv = "YES"
68+
savedToolIdentifier = ""
69+
useCustomWorkingDirectory = "NO"
70+
debugDocumentVersioning = "YES">
71+
<MacroExpansion>
72+
<BuildableReference
73+
BuildableIdentifier = "primary"
74+
BlueprintIdentifier = "AmplifyRecordCache"
75+
BuildableName = "AmplifyRecordCache"
76+
BlueprintName = "AmplifyRecordCache"
77+
ReferencedContainer = "container:">
78+
</BuildableReference>
79+
</MacroExpansion>
80+
</ProfileAction>
81+
<AnalyzeAction
82+
buildConfiguration = "Debug">
83+
</AnalyzeAction>
84+
<ArchiveAction
85+
buildConfiguration = "Release"
86+
revealArchiveInOrganizer = "YES">
87+
</ArchiveAction>
88+
</Scheme>

0 commit comments

Comments
 (0)