8000 Update beta from dev by davisengeler · Pull Request #98 · Vibe-House-LLC/memeSRC · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Update beta from dev #98

8000 New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 27, 2023
Merged

Update beta from dev #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cc0427d
Add analytics metrics type to graphql for caching
davisengeler Feb 27, 2023
4edfb1e
Modify analytics metrics schema
davisengeler Feb 27, 2023
f909df5
Remove graphql from analytics reporting function
davisengeler Feb 27, 2023
fb1db1f
Add dynamo access to analytics reporting function
davisengeler Feb 27, 2023
d574d84
Fix issues with poc analytics caching
davisengeler Feb 27, 2023
bc30e8e
Change to update all metrics per run
davisengeler Feb 27, 2023
e0b129f
Update analytics cache function to every 5 min
davisengeler Feb 27, 2023
2d27eee
Fix variable scoping
davisengeler Feb 27, 2023
2398261
Switch to analytics cache from graphql api
davisengeler Feb 27, 2023
f6807e0
Merge pull request #97 from Vibe-House-LLC/analytics-cache
davisengeler Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions amplify/backend/api/memesrc/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
# all models in this schema. Learn more about authorization rules here: https://docs.amplify.aws/cli/graphql/authorization-rules
# input AMPLIFY { globalAuthRule: AuthRule = { allow: public } } # FOR TESTING ONLY!

type AnalyticsMetrics @model @auth(
rules: [
{ allow: groups, groups: ["admins", "mods"] }
]
) {
id: ID!,
value: String
}

type ContentMetadata @model @auth(
rules: [
{ allow: groups, groups: ["admins", "mods"] },
Expand Down
7 changes: 7 additions & 0 deletions amplify/backend/backend-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,13 @@
],
"category": "storage",
"resourceName": "memesrcGeneratedImages"
},
{
"attributes": [
"GraphQLAPIIdOutput"
],
"category": "api",
"resourceName": "memesrc"
}
],
"providerPlugin": "awscloudformation",
Expand Down
5 changes: 5 additions & 0 deletions amplify/backend/function/memesrcAnalyticsReporting/function-parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
"memesrcGeneratedImages": [
"create",
"read"
],
"AnalyticsMetrics:@model(appsync)": [
"create",
"read",
"update"
]
}
},
Expand Down
138 changes: 138 additions & 0 deletions ...function/memesrcAnalyticsReporting/memesrcAnalyticsReporting-cloudformation-template.json
View file
Open in desktop
DDB0
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
"storagememesrcGeneratedImagesBucketName": {
"Type": "String",
"Default": "storagememesrcGeneratedImagesBucketName"
},
"apimemesrcGraphQLAPIIdOutput": {
"Type": "String",
"Default": "apimemesrcGraphQLAPIIdOutput"
}
},
"Conditions": {
Expand Down Expand Up @@ -76,6 +80,35 @@
},
"STORAGE_MEMESRCGENERATEDIMAGES_BUCKETNAME": {
"Ref": "storagememesrcGeneratedImagesBucketName"
},
"API_MEMESRC_ANALYTICSMETRICSTABLE_NAME": {
"Fn::ImportValue": {
"Fn::Sub": "${apimemesrcGraphQLAPIIdOutput}:GetAtt:AnalyticsMetricsTable:Name"
}
},
"API_MEMESRC_ANALYTICSMETRICSTABLE_ARN": {
"Fn::Join": [
"",
[
"arn:aws:dynamodb:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":table/",
{
"Fn::ImportValue": {
"Fn::Sub": "${apimemesrcGraphQLAPIIdOutput}:GetAtt:AnalyticsMetricsTable:Name"
}
}
]
]
},
"API_MEMESRC_GRAPHQLAPIIDOUTPUT": {
"Ref": "apimemesrcGraphQLAPIIdOutput"
}
}
},
Expand Down Expand Up @@ -224,6 +257,67 @@
]
}
]
},
{
"Effect": "Allow",
"Action": [
"dynamodb:Put*",
"dynamodb:Create*",
"dynamodb:BatchWriteItem",
"dynamodb:Get*",
"dynamodb:BatchGetItem",
"dynamodb:List*",
"dynamodb:Describe*",
"dynamodb:Scan",
"dynamodb:Query",
"dynamodb:Update*",
"dynamodb:RestoreTable*"
],
"Resource": [
{
"Fn::Join": [
"",
[
"arn:aws:dynamodb:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":table/",
{
"Fn::ImportValue": {
"Fn::Sub": "${apimemesrcGraphQLAPIIdOutput}:GetAtt:AnalyticsMetricsTable:Name"
}
}
]
]
},
{
"Fn::Join": [
"",
[
"arn:aws:dynamodb:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":table/",
{
"Fn::ImportValue": {
"Fn::Sub": "${apimemesrcGraphQLAPIIdOutput}:GetAtt:AnalyticsMetricsTable:Name"
}
},
"/index/*"
]
]
}
]
}
]
}
Expand Down Expand Up @@ -293,6 +387,45 @@
]
},
"DependsOn": "LambdaExecutionRole"
},
"CloudWatchEvent": {
"Type": "AWS::Events::Rule",
"Properties": {
"Description": "Schedule rule for Lambda",
"ScheduleExpression": {
"Ref": "CloudWatchRule"
},
"State": "ENABLED",
"Targets": [
{
"Arn": {
"Fn::GetAtt": [
"LambdaFunction",
"Arn"
]
},
"Id": {
"Ref": "LambdaFunction"
}
}
]
}
},
"PermissionForEventsToInvokeLambda": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"FunctionName": {
"Ref": "LambdaFunction"
},
"Action": "lambda:InvokeFunction",
"Principal": "events.amazonaws.com",
"SourceArn": {
"Fn::GetAtt": [
"CloudWatchEvent",
"Arn"
]
}
}
}
},
"Outputs": {
Expand Down Expand Up @@ -326,6 +459,11 @@
"Arn"
]
}
},
"CloudWatchEventRule": {
"Value": {
"Ref": "CloudWatchEvent"
}
}
}
}
4 changes: 3 additions & 1 deletion amplify/backend/function/memesrcAnalyticsReporting/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{}
{
"CloudWatchRule": "rate(5 minutes)"
}
2 changes: 1 addition & 1 deletion amplify/backend/function/memesrcAnalyticsReporting/src/event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"queryStringParameters": {
"metric": "popularShows"
"metric": "totalFrameViews"
}
}
Loading
0