Skip to content

Commit 0c9d9bb

Browse files
sai-raysai-ray
committed
chore: fix merge artifacts in store-locator and mood-board snapshots
1 parent 12eef38 commit 0c9d9bb

2 files changed

Lines changed: 0 additions & 154 deletions

File tree

‎amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.outputs.json‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
[
22
{
33
"OutputKey": "webClientId",
4-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-e3e983762f.outputs.json
5-
"OutputValue": "vppk4cllu9eci0le4q6lako9l"
6-
========
74
"OutputValue": "6dkse6kuhg779dhl6glmefrmrq"
8-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.outputs.json
95
},
106
{
117
"OutputKey": "socialProviders",
@@ -17,23 +13,15 @@
1713
},
1814
{
1915
"OutputKey": "bucketName",
20-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-e3e983762f.outputs.json
21-
"OutputValue": "amplify-discussions-ge-discusavatars223a2gen2ma-8njufkvldxtj"
22-
========
2316
"OutputValue": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
24-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.outputs.json
2517
},
2618
{
2719
"OutputKey": "signupAttributes",
2820
"OutputValue": "[\"email\"]"
2921
},
3022
{
3123
"OutputKey": "oauthClientId",
32-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-e3e983762f.outputs.json
33-
"OutputValue": "vppk4cllu9eci0le4q6lako9l"
34-
========
3524
"OutputValue": "6dkse6kuhg779dhl6glmefrmrq"
36-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.outputs.json
3725
},
3826
{
3927
"OutputKey": "allowUnauthenticatedIdentities",
@@ -89,51 +77,31 @@
8977
},
9078
{
9179
"OutputKey": "awsAppsyncApiEndpoint",
92-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-e3e983762f.outputs.json
93-
"OutputValue": "https://lp7bz3rbqfbdhnsnxy374lor6y.appsync-api.us-east-1.amazonaws.com/graphql"
94-
},
95-
{
96-
"OutputKey": "awsAppsyncApiId",
97-
"OutputValue": "gtx5hixzhrfdpblkbo7dtrwo4m"
98-
========
9980
"OutputValue": "https://mpfp3754i5h4livlltnjpjrfla.appsync-api.us-east-1.amazonaws.com/graphql"
10081
},
10182
{
10283
"OutputKey": "awsAppsyncApiId",
10384
"OutputValue": "lni7x3hwoncrhp3t6pnlk4wxtm"
104-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.outputs.json
10585
},
10686
{
10787
"OutputKey": "authRegion",
10888
"OutputValue": "us-east-1"
10989
},
11090
{
11191
"OutputKey": "buckets",
112-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-e3e983762f.outputs.json
113-
"OutputValue": "[\"{\\\"name\\\":\\\"discus-avatars223a2-gen2-main\\\",\\\"bucketName\\\":\\\"amplify-discussions-ge-discusavatars223a2gen2ma-8njufkvldxtj\\\",\\\"storageRegion\\\":\\\"us-east-1\\\",\\\"paths\\\":{\\\"public/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"protected/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"private/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]}}}\"]"
114-
},
115-
{
116-
"OutputKey": "amplifyApiModelSchemaS3Uri",
117-
"OutputValue": "s3://amplify-discussions-ge-amplifydataamplifycodege-h4p61o5ozzbf/model-schema.graphql"
118-
========
11992
"OutputValue": "[\"{\\\"name\\\":\\\"moodboard20e29595008142e3ad16f01c4066e1c4x-gen2-x\\\",\\\"bucketName\\\":\\\"amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z\\\",\\\"storageRegion\\\":\\\"us-east-1\\\",\\\"paths\\\":{\\\"public/*\\\":{\\\"guest\\\":[\\\"get\\\",\\\"list\\\"],\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"protected/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"private/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]}}}\"]"
12093
},
12194
{
12295
"OutputKey": "amplifyApiModelSchemaS3Uri",
12396
"OutputValue": "s3://amplify-moodboard26041519-amplifydataamplifycodege-ytkavmopvf6i/model-schema.graphql"
124-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.outputs.json
12597
},
12698
{
12799
"OutputKey": "groups",
128100
"OutputValue": "[]"
129101
},
130102
{
131103
"OutputKey": "definedFunctions",
132-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-e3e983762f.outputs.json
133-
"OutputValue": "[\"activityTrigger79c26ead-gen2-main\",\"fetchuseractivity-gen2-main\",\"recorduseractivity-gen2-main\"]"
134-
========
135104
"OutputValue": "[\"moodboardGetRandomEmoji-gen2-x\",\"moodboardKinesisReader-gen2-x\",\"moodboardKinesisTrigger-gen2-x\"]"
136-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.outputs.json
137105
},
138106
{
139107
"OutputKey": "passwordlessOptions",
@@ -157,19 +125,11 @@
157125
},
158126
{
159127
"OutputKey": "userPoolId",
160-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-e3e983762f.outputs.json
161-
"OutputValue": "us-east-1_C52AD7Zfd"
162-
},
163-
{
164-
"OutputKey": "identityPoolId",
165-
"OutputValue": "us-east-1:fb5a1900-4eb6-4c32-940d-e03ebcd22130"
166-
========
167128
"OutputValue": "us-east-1_5iU0nP22B"
168129
},
169130
{
170131
"OutputKey": "identityPoolId",
171132
"OutputValue": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
172-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.outputs.json
173133
},
174134
{
175135
"OutputKey": "verificationMechanisms",

‎amplify-migration-apps/store-locator/_snapshot.pre.refactor/amplify-storelocator-x-x-authstorelocator41a9495f41a9495f-x.template.json‎

Lines changed: 0 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -151,82 +151,6 @@
151151
}
152152
},
153153
"Resources": {
154-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussions3e730a8c3e730a8c/build/discussions3e730a8c3e730a8c-cloudformation-template.json
155-
"SNSRole": {
156-
"Type": "AWS::IAM::Role",
157-
"Properties": {
158-
"AssumeRolePolicyDocument": {
159-
"Version": "2012-10-17",
160-
"Statement": [
161-
{
162-
"Sid": "",
163-
"Effect": "Allow",
164-
"Principal": {
165-
"Service": "cognito-idp.amazonaws.com"
166-
},
167-
"Action": [
168-
"sts:AssumeRole"
169-
],
170-
"Condition": {
171-
"StringEquals": {
172-
"sts:ExternalId": "discus3e730a8c_role_external_id"
173-
}
174-
}
175-
}
176-
]
177-
},
178-
"Policies": [
179-
{
180-
"PolicyDocument": {
181-
"Version": "2012-10-17",
182-
"Statement": [
183-
{
184-
"Effect": "Allow",
185-
"Action": [
186-
"sns:Publish"
187-
],
188-
"Resource": "*"
189-
}
190-
]
191-
},
192-
"PolicyName": "discus3e730a8c-sns-policy"
193-
}
194-
],
195-
"RoleName": {
196-
"Fn::If": [
197-
"ShouldNotCreateEnvResources",
198-
"discus3e730a8c_sns-role",
199-
{
200-
"Fn::Join": [
201-
"",
202-
[
203-
"sns3e730a8c",
204-
{
205-
"Fn::Select": [
206-
3,
207-
{
208-
"Fn::Split": [
209-
"-",
210-
{
211-
"Ref": "AWS::StackName"
212-
}
213-
]
214-
}
215-
]
216-
},
217-
"-",
218-
{
219-
"Ref": "env"
220-
}
221-
]
222-
]
223-
}
224-
]
225-
}
226-
}
227-
},
228-
========
229-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/store-locator/_snapshot.pre.refactor/amplify-storelocator-x-x-authstorelocator41a9495f41a9495f-x.template.json
230154
"UserPool": {
231155
"Type": "AWS::Cognito::UserPool",
232156
"Properties": {
@@ -260,24 +184,6 @@
260184
"Required": true
261185
}
262186
],
263-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussions3e730a8c3e730a8c/build/discussions3e730a8c3e730a8c-cloudformation-template.json
264-
"SmsAuthenticationMessage": {
265-
"Ref": "smsAuthenticationMessage"
266-
},
267-
"SmsConfiguration": {
268-
"ExternalId": "discus3e730a8c_role_external_id",
269-
"SnsCallerArn": {
270-
"Fn::GetAtt": [
271-
"SNSRole",
272-
"Arn"
273-
]
274-
}
275-
},
276-
"SmsVerificationMessage": {
277-
"Ref": "smsVerificationMessage"
278-
},
279-
========
280-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/store-locator/_snapshot.pre.refactor/amplify-storelocator-x-x-authstorelocator41a9495f41a9495f-x.template.json
281187
"UserAttributeUpdateSettings": {
282188
"AttributesRequireVerificationBeforeUpdate": [
283189
"email"
@@ -316,11 +222,7 @@
316222
"UserPoolClientWeb": {
317223
"Type": "AWS::Cognito::UserPoolClient",
318224
"Properties": {
319-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussions3e730a8c3e730a8c/build/discussions3e730a8c3e730a8c-cloudformation-template.json
320-
"ClientName": "discus3e730a8c_app_clientWeb",
321-
========
322225
"ClientName": "storel41a9495f_app_clientWeb",
323-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/store-locator/_snapshot.pre.refactor/amplify-storelocator-x-x-authstorelocator41a9495f41a9495f-x.template.json
324226
"RefreshTokenValidity": {
325227
"Ref": "userpoolClientRefreshTokenValidity"
326228
},
@@ -338,11 +240,7 @@
338240
"UserPoolClient": {
339241
"Type": "AWS::Cognito::UserPoolClient",
340242
"Properties": {
341-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussions3e730a8c3e730a8c/build/discussions3e730a8c3e730a8c-cloudformation-template.json
342-
"ClientName": "discus3e730a8c_app_client",
343-
========
344243
"ClientName": "storel41a9495f_app_client",
345-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/store-locator/_snapshot.pre.refactor/amplify-storelocator-x-x-authstorelocator41a9495f41a9495f-x.template.json
346244
"GenerateSecret": {
347245
"Ref": "userpoolClientGenerateSecret"
348246
},
@@ -385,11 +283,7 @@
385283
"Fn::Join": [
386284
"",
387285
[
388-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussions3e730a8c3e730a8c/build/discussions3e730a8c3e730a8c-cloudformation-template.json
389-
"upClientLambdaRole3e730a8c",
390-
========
391286
"upClientLambdaRole41a9495f",
392-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/store-locator/_snapshot.pre.refactor/amplify-storelocator-x-x-authstorelocator41a9495f41a9495f-x.template.json
393287
{
394288
"Fn::Select": [
395289
3,
@@ -461,20 +355,12 @@
461355
"IdentityPoolName": {
462356
"Fn::If": [
463357
"ShouldNotCreateEnvResources",
464-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussions3e730a8c3e730a8c/build/discussions3e730a8c3e730a8c-cloudformation-template.json
465-
"discussions3e730a8c_identitypool_3e730a8c",
466-
========
467358
"storelocator41a9495f_identitypool_41a9495f",
468-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/store-locator/_snapshot.pre.refactor/amplify-storelocator-x-x-authstorelocator41a9495f41a9495f-x.template.json
469359
{
470360
"Fn::Join": [
471361
"",
472362
[
473-
<<<<<<<< HEAD:amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussions3e730a8c3e730a8c/build/discussions3e730a8c3e730a8c-cloudformation-template.json
474-
"discussions3e730a8c_identitypool_3e730a8c__",
475-
========
476363
"storelocator41a9495f_identitypool_41a9495f__",
477-
>>>>>>>> origin/gen2-migration:amplify-migration-apps/store-locator/_snapshot.pre.refactor/amplify-storelocator-x-x-authstorelocator41a9495f41a9495f-x.template.json
478364
{
479365
"Ref": "env"
480366
}

0 commit comments

Comments
 (0)