Merge branch 'release/v0.2.0' into main

devrel-kr · Jan 4, 2021 · da8e3ec · da8e3ec
2 parents 60b4457 + a2e5447
commit da8e3ec
Show file tree

Hide file tree

Showing 10 changed files with 115 additions and 79 deletions.
diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml
@@ -170,7 +170,7 @@ jobs:
         resourceGroupName: ${{ secrets.RESOURCE_GROUP_NAME_DEV }}
         deploymentName: 'ytwebsub'
         template: 'resources/logappdeploy.subscription.json'
-        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} logicAppSubscriptionTopicUri=${{ secrets.YOUTUBE_TOPIC_URL_DEV }}
+        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} youTubeChannelId=${{ secrets.YOUTUBE_CHANNEL_ID_DEV }}
 
     - name: Deploy LogicApp as EventGrid subscription handler for Twitter
       id: twitter
@@ -180,7 +180,7 @@ jobs:
         resourceGroupName: ${{ secrets.RESOURCE_GROUP_NAME_DEV }}
         deploymentName: 'ytwebsub'
         template: 'resources/logappdeploy.eventgridhandler-twitter.json'
-        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} youTubeAcceptedTitleSegment=${{ secrets.YOUTUBE_ACCEPTED_TITLE_SEGMENT }} youTubeAcceptedEventType=${{ secrets.ACCEPTED_EVENT_TYPE_YOUTUBE }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }}
+        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} youTubeEventType=${{ secrets.YOUTUBE_ACCEPTED_EVENT_TYPE }} youTubeChannelId=${{ secrets.YOUTUBE_CHANNEL_ID_DEV }} youTubeTitleSegment=${{ secrets.YOUTUBE_ACCEPTED_TITLE_SEGMENT }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }} twitterEventType=${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }}
 
     - name: Deploy LogicApp as EventGrid subscription handler for ReTweet
       id: retweeter
@@ -190,7 +190,7 @@ jobs:
         resourceGroupName: ${{ secrets.RESOURCE_GROUP_NAME_DEV }}
         deploymentName: 'ytwebsub'
         template: 'resources/logappdeploy.eventgridhandler-retweeter.json'
-        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} twitterEventType=${{ secrets.ACCEPTED_EVENT_TYPE_TWITTER }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }} retweeterProfileId=${{ secrets.RETWEETER_PROFILE_ID }}
+        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} twitterEventType=${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }} retweeterProfileId=${{ secrets.RETWEETER_PROFILE_ID }}
 
     - name: Download EventGrid name
       uses: actions/download-artifact@v2
@@ -225,8 +225,8 @@ jobs:
                 -n ${{ steps.twitter.outputs.logicAppName }} \
                 --query "id" -o tsv)/triggers/manual/listCallbackUrl?api-version=2016-06-01" \
               --query "value" -o tsv) \
-            --advanced-filter type StringBeginsWith ${{ secrets.ACCEPTED_EVENT_TYPE_YOUTUBE }} \
-            --advanced-filter type StringEndsWith ${{ secrets.ACCEPTED_EVENT_TYPE_YOUTUBE }})
+            --advanced-filter type StringBeginsWith ${{ secrets.YOUTUBE_ACCEPTED_EVENT_TYPE }} \
+            --advanced-filter type StringEndsWith ${{ secrets.YOUTUBE_ACCEPTED_EVENT_TYPE }})
 
     - name: Provision EventGrid subscription for ReTweet
       uses: azure/CLI@v1
@@ -249,5 +249,5 @@ jobs:
                 -n ${{ steps.retweeter.outputs.logicAppName }} \
                 --query "id" -o tsv)/triggers/manual/listCallbackUrl?api-version=2016-06-01" \
               --query "value" -o tsv) \
-            --advanced-filter type StringBeginsWith ${{ secrets.ACCEPTED_EVENT_TYPE_TWITTER }} \
-            --advanced-filter type StringEndsWith ${{ secrets.ACCEPTED_EVENT_TYPE_TWITTER }})
+            --advanced-filter type StringBeginsWith ${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }} \
+            --advanced-filter type StringEndsWith ${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }})
diff --git a/.github/workflows/feature.yaml b/.github/workflows/feature.yaml
@@ -171,7 +171,7 @@ jobs:
         resourceGroupName: ${{ secrets.RESOURCE_GROUP_NAME_DEV }}
         deploymentName: 'ytwebsub'
         template: 'resources/logappdeploy.subscription.json'
-        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} logicAppSubscriptionTopicUri=${{ secrets.YOUTUBE_TOPIC_URL_DEV }}
+        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} youTubeChannelId=${{ secrets.YOUTUBE_CHANNEL_ID_DEV }}
 
     - name: Deploy LogicApp as EventGrid subscription handler for Twitter
       id: twitter
@@ -181,7 +181,7 @@ jobs:
         resourceGroupName: ${{ secrets.RESOURCE_GROUP_NAME_DEV }}
         deploymentName: 'ytwebsub'
         template: 'resources/logappdeploy.eventgridhandler-twitter.json'
-        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} youTubeAcceptedTitleSegment=${{ secrets.YOUTUBE_ACCEPTED_TITLE_SEGMENT }} youTubeAcceptedEventType=${{ secrets.ACCEPTED_EVENT_TYPE_YOUTUBE }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }}
+        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} youTubeEventType=${{ secrets.YOUTUBE_ACCEPTED_EVENT_TYPE }} youTubeChannelId=${{ secrets.YOUTUBE_CHANNEL_ID_DEV }} youTubeTitleSegment=${{ secrets.YOUTUBE_ACCEPTED_TITLE_SEGMENT }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }} twitterEventType=${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }}
 
     - name: Deploy LogicApp as EventGrid subscription handler for ReTweet
       id: retweeter
@@ -191,7 +191,7 @@ jobs:
         resourceGroupName: ${{ secrets.RESOURCE_GROUP_NAME_DEV }}
         deploymentName: 'ytwebsub'
         template: 'resources/logappdeploy.eventgridhandler-retweeter.json'
-        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} twitterEventType=${{ secrets.ACCEPTED_EVENT_TYPE_TWITTER }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }} retweeterProfileId=${{ secrets.RETWEETER_PROFILE_ID }}
+        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} twitterEventType=${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }} retweeterProfileId=${{ secrets.RETWEETER_PROFILE_ID }}
 
     - name: Download EventGrid name
       uses: actions/download-artifact@v2
@@ -226,8 +226,8 @@ jobs:
                 -n ${{ steps.twitter.outputs.logicAppName }} \
                 --query "id" -o tsv)/triggers/manual/listCallbackUrl?api-version=2016-06-01" \
               --query "value" -o tsv) \
-            --advanced-filter type StringBeginsWith ${{ secrets.ACCEPTED_EVENT_TYPE_YOUTUBE }} \
-            --advanced-filter type StringEndsWith ${{ secrets.ACCEPTED_EVENT_TYPE_YOUTUBE }})
+            --advanced-filter type StringBeginsWith ${{ secrets.YOUTUBE_ACCEPTED_EVENT_TYPE }} \
+            --advanced-filter type StringEndsWith ${{ secrets.YOUTUBE_ACCEPTED_EVENT_TYPE }})
 
     - name: Provision EventGrid subscription for ReTweet
       uses: azure/CLI@v1
@@ -250,5 +250,5 @@ jobs:
                 -n ${{ steps.retweeter.outputs.logicAppName }} \
                 --query "id" -o tsv)/triggers/manual/listCallbackUrl?api-version=2016-06-01" \
               --query "value" -o tsv) \
-            --advanced-filter type StringBeginsWith ${{ secrets.ACCEPTED_EVENT_TYPE_TWITTER }} \
-            --advanced-filter type StringEndsWith ${{ secrets.ACCEPTED_EVENT_TYPE_TWITTER }})
+            --advanced-filter type StringBeginsWith ${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }} \
+            --advanced-filter type StringEndsWith ${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }})
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -224,7 +224,7 @@ jobs:
         resourceGroupName: ${{ secrets.RESOURCE_GROUP_NAME_DEV }}
         deploymentName: 'ytwebsub'
         template: 'resources/logappdeploy.subscription.json'
-        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} logicAppSubscriptionTopicUri=${{ secrets.YOUTUBE_TOPIC_URL_DEV }}
+        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} youTubeChannelId=${{ secrets.YOUTUBE_CHANNEL_ID_DEV }}
 
     - name: Deploy LogicApp as EventGrid subscription handler for Twitter
       id: twitter
@@ -234,7 +234,7 @@ jobs:
         resourceGroupName: ${{ secrets.RESOURCE_GROUP_NAME_DEV }}
         deploymentName: 'ytwebsub'
         template: 'resources/logappdeploy.eventgridhandler-twitter.json'
-        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} youTubeAcceptedTitleSegment=${{ secrets.YOUTUBE_ACCEPTED_TITLE_SEGMENT }} youTubeAcceptedEventType=${{ secrets.ACCEPTED_EVENT_TYPE_YOUTUBE }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }}
+        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} youTubeEventType=${{ secrets.YOUTUBE_ACCEPTED_EVENT_TYPE }} youTubeChannelId=${{ secrets.YOUTUBE_CHANNEL_ID_DEV }} youTubeTitleSegment=${{ secrets.YOUTUBE_ACCEPTED_TITLE_SEGMENT }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }} twitterEventType=${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }}
 
     - name: Deploy LogicApp as EventGrid subscription handler for ReTweet
       id: retweeter
@@ -244,7 +244,7 @@ jobs:
         resourceGroupName: ${{ secrets.RESOURCE_GROUP_NAME_DEV }}
         deploymentName: 'ytwebsub'
         template: 'resources/logappdeploy.eventgridhandler-retweeter.json'
-        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} twitterEventType=${{ secrets.ACCEPTED_EVENT_TYPE_TWITTER }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }} retweeterProfileId=${{ secrets.RETWEETER_PROFILE_ID }}
+        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_DEV }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} twitterEventType=${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }} retweeterProfileId=${{ secrets.RETWEETER_PROFILE_ID }}
 
     - name: Download EventGrid name
       uses: actions/download-artifact@v2
@@ -279,8 +279,8 @@ jobs:
                 -n ${{ steps.twitter.outputs.logicAppName }} \
                 --query "id" -o tsv)/triggers/manual/listCallbackUrl?api-version=2016-06-01" \
               --query "value" -o tsv) \
-            --advanced-filter type StringBeginsWith ${{ secrets.ACCEPTED_EVENT_TYPE_YOUTUBE }} \
-            --advanced-filter type StringEndsWith ${{ secrets.ACCEPTED_EVENT_TYPE_YOUTUBE }})
+            --advanced-filter type StringBeginsWith ${{ secrets.YOUTUBE_ACCEPTED_EVENT_TYPE }} \
+            --advanced-filter type StringEndsWith ${{ secrets.YOUTUBE_ACCEPTED_EVENT_TYPE }})
 
     - name: Provision EventGrid subscription for ReTweet
       uses: azure/CLI@v1
@@ -303,8 +303,8 @@ jobs:
                 -n ${{ steps.retweeter.outputs.logicAppName }} \
                 --query "id" -o tsv)/triggers/manual/listCallbackUrl?api-version=2016-06-01" \
               --query "value" -o tsv) \
-            --advanced-filter type StringBeginsWith ${{ secrets.ACCEPTED_EVENT_TYPE_TWITTER }} \
-            --advanced-filter type StringEndsWith ${{ secrets.ACCEPTED_EVENT_TYPE_TWITTER }})
+            --advanced-filter type StringBeginsWith ${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }} \
+            --advanced-filter type StringEndsWith ${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }})
 
   functionapp_build_test_deploy_prod:
     name: 'PROD: FunctionApp Build, Test & Deploy'
@@ -417,7 +417,7 @@ jobs:
         resourceGroupName: ${{ secrets.RESOURCE_GROUP_NAME_PROD }}
         deploymentName: 'ytwebsub'
         template: 'resources/logappdeploy.subscription.json'
-        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_PROD }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} logicAppSubscriptionTopicUri=${{ secrets.YOUTUBE_TOPIC_URL_PROD }}
+        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_PROD }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} youTubeChannelId=${{ secrets.YOUTUBE_CHANNEL_ID_PROD }}
 
     - name: Deploy LogicApp as EventGrid subscription handler for Twitter
       id: twitter
@@ -427,7 +427,7 @@ jobs:
         resourceGroupName: ${{ secrets.RESOURCE_GROUP_NAME_PROD }}
         deploymentName: 'ytwebsub'
         template: 'resources/logappdeploy.eventgridhandler-twitter.json'
-        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_PROD }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} youTubeAcceptedTitleSegment=${{ secrets.YOUTUBE_ACCEPTED_TITLE_SEGMENT }} youTubeAcceptedEventType=${{ secrets.ACCEPTED_EVENT_TYPE_YOUTUBE }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }}
+        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_PROD }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} youTubeEventType=${{ secrets.YOUTUBE_ACCEPTED_EVENT_TYPE }} youTubeChannelId=${{ secrets.YOUTUBE_CHANNEL_ID_PROD }} youTubeTitleSegment=${{ secrets.YOUTUBE_ACCEPTED_TITLE_SEGMENT }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }} twitterEventType=${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }}
 
     - name: Deploy LogicApp as EventGrid subscription handler for ReTweet
       id: retweeter
@@ -437,7 +437,7 @@ jobs:
         resourceGroupName: ${{ secrets.RESOURCE_GROUP_NAME_PROD }}
         deploymentName: 'ytwebsub'
         template: 'resources/logappdeploy.eventgridhandler-retweeter.json'
-        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_PROD }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} twitterEventType=${{ secrets.ACCEPTED_EVENT_TYPE_TWITTER }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }} retweeterProfileId=${{ secrets.RETWEETER_PROFILE_ID }}
+        parameters: name=${{ secrets.RESOURCE_NAME }} env=${{ secrets.RESOURCE_ENVIRONMENT_PROD }} locationCode=${{ secrets.RESOURCE_LOCATION_CODE }} twitterEventType=${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }} twitterProfileId=${{ secrets.TWITTER_PROFILE_ID }} retweeterProfileId=${{ secrets.RETWEETER_PROFILE_ID }}
 
     - name: Download EventGrid name
       uses: actions/download-artifact@v2
@@ -472,8 +472,8 @@ jobs:
                 -n ${{ steps.twitter.outputs.logicAppName }} \
                 --query "id" -o tsv)/triggers/manual/listCallbackUrl?api-version=2016-06-01" \
               --query "value" -o tsv) \
-            --advanced-filter type StringBeginsWith ${{ secrets.ACCEPTED_EVENT_TYPE_YOUTUBE }} \
-            --advanced-filter type StringEndsWith ${{ secrets.ACCEPTED_EVENT_TYPE_YOUTUBE }})
+            --advanced-filter type StringBeginsWith ${{ secrets.YOUTUBE_ACCEPTED_EVENT_TYPE }} \
+            --advanced-filter type StringEndsWith ${{ secrets.YOUTUBE_ACCEPTED_EVENT_TYPE }})
 
     - name: Provision EventGrid subscription for ReTweet
       uses: azure/CLI@v1
@@ -496,5 +496,5 @@ jobs:
                 -n ${{ steps.retweeter.outputs.logicAppName }} \
                 --query "id" -o tsv)/triggers/manual/listCallbackUrl?api-version=2016-06-01" \
               --query "value" -o tsv) \
-            --advanced-filter type StringBeginsWith ${{ secrets.ACCEPTED_EVENT_TYPE_TWITTER }} \
-            --advanced-filter type StringEndsWith ${{ secrets.ACCEPTED_EVENT_TYPE_TWITTER }})
+            --advanced-filter type StringBeginsWith ${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }} \
+            --advanced-filter type StringEndsWith ${{ secrets.TWITTER_ACCEPTED_EVENT_TYPE }})
diff --git a/resources/logappdeploy.eventgridhandler-retweeter.json b/resources/logappdeploy.eventgridhandler-retweeter.json
@@ -22,13 +22,13 @@
       "type": "string",
       "defaultValue": "krc"
     },
-    "twitterProfileId": {
-      "type": "string"
-    },
     "twitterEventType": {
       "type": "string",
       "defaultValue": "com.twitter.tweet.posted"
     },
+    "twitterProfileId": {
+      "type": "string"
+    },
     "retweeterProfileId": {
       "type": "string"
     }

diff --git a/resources/logappdeploy.eventgridhandler-twitter.bicep b/resources/logappdeploy.eventgridhandler-twitter.bicep
@@ -21,8 +21,9 @@ param locationCode string = 'krc'
 param functionName string = 'FetchAsync'
 
 // YouTube
-param youTubeAcceptedTitleSegment string
-param youTubeAcceptedEventType string = 'com.youtube.video.published'
+param youTubeEventType string = 'com.youtube.video.published'
+param youTubeChannelId string
+param youTubeTitleSegment string
 
 // Twitter
 param twitterProfileId string
@@ -68,8 +69,9 @@ var eventGridTopic = {
 }
 
 var youtube = {
-    acceptedEventType: youTubeAcceptedEventType
-    acceptedTitleSegment: youTubeAcceptedTitleSegment
+    source: 'https://www.youtube.com/xml/feeds/videos.xml?channel_id=${youTubeChannelId}'
+    type: youTubeEventType
+    titleSegment: youTubeTitleSegment
 }
 
 var twitter = {
@@ -118,13 +120,17 @@ resource logapp 'Microsoft.Logic/workflows@2019-05-01' = {
                     type: 'string'
                     defaultValue: ''
                 }
-                acceptedTitleSegment: {
+                acceptedYouTubeSource: {
                     type: 'string'
-                    defaultValue: youtube.acceptedTitleSegment
+                    defaultValue: youtube.source
                 }
-                acceptedEventType: {
+                acceptedYouTubeType: {
                     type: 'string'
-                    defaultValue: youtube.acceptedEventType
+                    defaultValue: youtube.type
+                }
+                acceptedYouTubeTitleSegment: {
+                    type: 'string'
+                    defaultValue: youtube.titleSegment
                 }
                 eventGridTopicEndpoint: {
                     type: 'string'
@@ -186,10 +192,16 @@ resource logapp 'Microsoft.Logic/workflows@2019-05-01' = {
                     runAfter: {}
                     expression: {
                         and: [
+                            {
+                                equals: [
+                                    '@triggerBody()?[\'source\']'
+                                    '@parameters(\'acceptedYouTubeSource\')'
+                                ]
+                            }
                             {
                                 equals: [
                                     '@triggerBody()?[\'type\']'
-                                    '@parameters(\'acceptedEventType\')'
+                                    '@parameters(\'acceptedYouTubeType\')'
                                 ]
                             }
                         ]
@@ -253,7 +265,7 @@ resource logapp 'Microsoft.Logic/workflows@2019-05-01' = {
                             {
                                 equals: [
                                     '@trim(last(outputs(\'Split_Title\')))'
-                                    '@parameters(\'acceptedTitleSegment\')'
+                                    '@parameters(\'acceptedYouTubeTitleSegment\')'
                                 ]
                             }
                         ]
@@ -262,7 +274,7 @@ resource logapp 'Microsoft.Logic/workflows@2019-05-01' = {
                         Build_Tweet_Post: {
                             type: 'Compose'
                             runAfter: {}
-                            inputs: '@{trim(first(outputs(\'Split_Description\')))}\n\n@{body(\'Fetch_YouTube_Video_Details\')?[\'link\']}'
+                            inputs: '@{trim(first(outputs(\'Split_Title\')))}\n\n@{trim(first(outputs(\'Split_Description\')))}\n\n@{body(\'Fetch_YouTube_Video_Details\')?[\'link\']}'
                         }
                     }
                     else: {