diff --git a/.gitignore b/.gitignore index 5fe00fea85e..85050a25140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ out node_modules +.DS_Store .vscode-test/ *.vsix diff --git a/build-scripts/bundleDeps.js b/build-scripts/bundleDeps.js new file mode 100644 index 00000000000..712dcd76691 --- /dev/null +++ b/build-scripts/bundleDeps.js @@ -0,0 +1,32 @@ +'use strict'; +/* + This script is called from npm run compile. + It adds clientside libraries to ./media/libs. +*/ +const fs = require('fs-extra'); +const path = require('path'); +const _ = require('lodash'); + +const DEPS = [{ + name: 'vue.min.js', + path: 'vue/dist/vue.min.js' + } +]; +const workingDir = path.join(__dirname, '..'); +const nodeModulesDir = path.join(workingDir, 'node_modules'); +const libraryDir = path.join(workingDir, 'media', 'libs'); +(async () => { + const work = []; + _.forEach(DEPS, (dep) => { + const depPath = path.join(nodeModulesDir, dep.path); + console.log(`Copying ${depPath} to ${libraryDir}`); + work.push(fs.copy(depPath, path.join(libraryDir, dep.name))); + }); + try { + await Promise.all(work); + console.log('Successfully copied all clientside dependencies.'); + } catch (e) { + console.error('Error when copying clientside dependencies.'); + console.error(e); + } +})(); \ No newline at end of file diff --git a/media/js/sampleRequests.js b/media/js/sampleRequests.js new file mode 100644 index 00000000000..f5136f29ff2 --- /dev/null +++ b/media/js/sampleRequests.js @@ -0,0 +1,44 @@ +console.log('Loaded!'); +(function () { + const vscode = acquireVsCodeApi(); + const app = new Vue({ + el: '#app', + data: { + selectedSampleRequest: {}, + sampleText: "" + }, + mounted() { + this.$nextTick(function () { + window.addEventListener('message', this.handleMessageReceived); + }) + }, + methods: { + newSelection: function () { + vscode.postMessage({ + command: 'sampleRequestSelected', + value: this.selectedSampleRequest + }) + }, + handleMessageReceived: function (e) { + const message = event.data; + console.log(message.command); + console.log(message.sample); + switch (message.command) { + case 'loadedSample': + this.loadSampleText(message.sample); + break; + } + }, + loadSampleText: function (txt) { + this.sampleText = txt; + }, + sendInput: function() { + console.log(this.sampleText); + vscode.postMessage({ + command: 'invokeLambda', + value: this.sampleText + }) + } + } + }); +})(); \ No newline at end of file diff --git a/media/libs/vue.min.js b/media/libs/vue.min.js new file mode 100644 index 00000000000..37febff24c6 --- /dev/null +++ b/media/libs/vue.min.js @@ -0,0 +1,6 @@ +/*! + * Vue.js v2.5.16 + * (c) 2014-2018 Evan You + * Released under the MIT License. + */ +!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.Vue=t()}(this,function(){"use strict";var y=Object.freeze({});function M(e){return null==e}function D(e){return null!=e}function S(e){return!0===e}function T(e){return"string"==typeof e||"number"==typeof e||"symbol"==typeof e||"boolean"==typeof e}function P(e){return null!==e&&"object"==typeof e}var r=Object.prototype.toString;function l(e){return"[object Object]"===r.call(e)}function i(e){var t=parseFloat(String(e));return 0<=t&&Math.floor(t)===t&&isFinite(e)}function t(e){return null==e?"":"object"==typeof e?JSON.stringify(e,null,2):String(e)}function F(e){var t=parseFloat(e);return isNaN(t)?e:t}function s(e,t){for(var n=Object.create(null),r=e.split(","),i=0;ie.id;)n--;bt.splice(n+1,0,e)}else bt.push(e);Ct||(Ct=!0,Ze(At))}}(this)},St.prototype.run=function(){if(this.active){var e=this.get();if(e!==this.value||P(e)||this.deep){var t=this.value;if(this.value=e,this.user)try{this.cb.call(this.vm,e,t)}catch(e){Fe(e,this.vm,'callback for watcher "'+this.expression+'"')}else this.cb.call(this.vm,e,t)}}},St.prototype.evaluate=function(){this.value=this.get(),this.dirty=!1},St.prototype.depend=function(){for(var e=this.deps.length;e--;)this.deps[e].depend()},St.prototype.teardown=function(){if(this.active){this.vm._isBeingDestroyed||f(this.vm._watchers,this);for(var e=this.deps.length;e--;)this.deps[e].removeSub(this);this.active=!1}};var Tt={enumerable:!0,configurable:!0,get:$,set:$};function Et(e,t,n){Tt.get=function(){return this[t][n]},Tt.set=function(e){this[t][n]=e},Object.defineProperty(e,n,Tt)}function jt(e){e._watchers=[];var t=e.$options;t.props&&function(n,r){var i=n.$options.propsData||{},o=n._props={},a=n.$options._propKeys=[];n.$parent&&ge(!1);var e=function(e){a.push(e);var t=Ie(e,r,i,n);Ce(o,e,t),e in n||Et(n,"_props",e)};for(var t in r)e(t);ge(!0)}(e,t.props),t.methods&&function(e,t){e.$options.props;for(var n in t)e[n]=null==t[n]?$:v(t[n],e)}(e,t.methods),t.data?function(e){var t=e.$options.data;l(t=e._data="function"==typeof t?function(e,t){se();try{return e.call(t,t)}catch(e){return Fe(e,t,"data()"),{}}finally{ce()}}(t,e):t||{})||(t={});var n=Object.keys(t),r=e.$options.props,i=(e.$options.methods,n.length);for(;i--;){var o=n[i];r&&p(r,o)||(void 0,36!==(a=(o+"").charCodeAt(0))&&95!==a&&Et(e,"_data",o))}var a;we(t,!0)}(e):we(e._data={},!0),t.computed&&function(e,t){var n=e._computedWatchers=Object.create(null),r=Y();for(var i in t){var o=t[i],a="function"==typeof o?o:o.get;r||(n[i]=new St(e,a||$,$,Nt)),i in e||Lt(e,i,o)}}(e,t.computed),t.watch&&t.watch!==G&&function(e,t){for(var n in t){var r=t[n];if(Array.isArray(r))for(var i=0;iparseInt(this.max)&&bn(a,s[0],s,this._vnode)),t.data.keepAlive=!0}return t||e&&e[0]}}};$n=hn,Cn={get:function(){return j}},Object.defineProperty($n,"config",Cn),$n.util={warn:re,extend:m,mergeOptions:Ne,defineReactive:Ce},$n.set=xe,$n.delete=ke,$n.nextTick=Ze,$n.options=Object.create(null),k.forEach(function(e){$n.options[e+"s"]=Object.create(null)}),m(($n.options._base=$n).options.components,kn),$n.use=function(e){var t=this._installedPlugins||(this._installedPlugins=[]);if(-1=a&&l()};setTimeout(function(){c\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,oo="[a-zA-Z_][\\w\\-\\.]*",ao="((?:"+oo+"\\:)?"+oo+")",so=new RegExp("^<"+ao),co=/^\s*(\/?)>/,lo=new RegExp("^<\\/"+ao+"[^>]*>"),uo=/^]+>/i,fo=/^",""":'"',"&":"&"," ":"\n"," ":"\t"},go=/&(?:lt|gt|quot|amp);/g,_o=/&(?:lt|gt|quot|amp|#10|#9);/g,bo=s("pre,textarea",!0),$o=function(e,t){return e&&bo(e)&&"\n"===t[0]};var wo,Co,xo,ko,Ao,Oo,So,To,Eo=/^@|^v-on:/,jo=/^v-|^@|^:/,No=/([^]*?)\s+(?:in|of)\s+([^]*)/,Lo=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,Io=/^\(|\)$/g,Mo=/:(.*)$/,Do=/^:|^v-bind:/,Po=/\.[^.]+/g,Fo=e(eo);function Ro(e,t,n){return{type:1,tag:e,attrsList:t,attrsMap:function(e){for(var t={},n=0,r=e.length;n]*>)","i")),n=i.replace(t,function(e,t,n){return r=n.length,ho(o)||"noscript"===o||(t=t.replace(//g,"$1").replace(//g,"$1")),$o(o,t)&&(t=t.slice(1)),d.chars&&d.chars(t),""});a+=i.length-n.length,i=n,A(o,a-r,a)}else{var s=i.indexOf("<");if(0===s){if(fo.test(i)){var c=i.indexOf("--\x3e");if(0<=c){d.shouldKeepComment&&d.comment(i.substring(4,c)),C(c+3);continue}}if(po.test(i)){var l=i.indexOf("]>");if(0<=l){C(l+2);continue}}var u=i.match(uo);if(u){C(u[0].length);continue}var f=i.match(lo);if(f){var p=a;C(f[0].length),A(f[1],p,a);continue}var _=x();if(_){k(_),$o(v,i)&&C(1);continue}}var b=void 0,$=void 0,w=void 0;if(0<=s){for($=i.slice(s);!(lo.test($)||so.test($)||fo.test($)||po.test($)||(w=$.indexOf("<",1))<0);)s+=w,$=i.slice(s);b=i.substring(0,s),C(s)}s<0&&(b=i,i=""),d.chars&&b&&d.chars(b)}if(i===e){d.chars&&d.chars(i);break}}function C(e){a+=e,i=i.substring(e)}function x(){var e=i.match(so);if(e){var t,n,r={tagName:e[1],attrs:[],start:a};for(C(e[0].length);!(t=i.match(co))&&(n=i.match(io));)C(n[0].length),r.attrs.push(n);if(t)return r.unarySlash=t[1],C(t[0].length),r.end=a,r}}function k(e){var t=e.tagName,n=e.unarySlash;m&&("p"===v&&ro(t)&&A(v),g(t)&&v===t&&A(t));for(var r,i,o,a=y(t)||!!n,s=e.attrs.length,c=new Array(s),l=0;l-1"+("true"===d?":("+l+")":":_q("+l+","+d+")")),Ar(c,"change","var $$a="+l+",$$el=$event.target,$$c=$$el.checked?("+d+"):("+v+");if(Array.isArray($$a)){var $$v="+(f?"_n("+p+")":p)+",$$i=_i($$a,$$v);if($$el.checked){$$i<0&&("+Er(l,"$$a.concat([$$v])")+")}else{$$i>-1&&("+Er(l,"$$a.slice(0,$$i).concat($$a.slice($$i+1))")+")}}else{"+Er(l,"$$c")+"}",null,!0);else if("input"===$&&"radio"===w)r=e,i=_,a=(o=b)&&o.number,s=Or(r,"value")||"null",Cr(r,"checked","_q("+i+","+(s=a?"_n("+s+")":s)+")"),Ar(r,"change",Er(i,s),null,!0);else if("input"===$||"textarea"===$)!function(e,t,n){var r=e.attrsMap.type,i=n||{},o=i.lazy,a=i.number,s=i.trim,c=!o&&"range"!==r,l=o?"change":"range"===r?Pr:"input",u="$event.target.value";s&&(u="$event.target.value.trim()"),a&&(u="_n("+u+")");var f=Er(t,u);c&&(f="if($event.target.composing)return;"+f),Cr(e,"value","("+t+")"),Ar(e,l,f,null,!0),(s||a)&&Ar(e,"blur","$forceUpdate()")}(e,_,b);else if(!j.isReservedTag($))return Tr(e,_,b),!1;return!0},text:function(e,t){t.value&&Cr(e,"textContent","_s("+t.value+")")},html:function(e,t){t.value&&Cr(e,"innerHTML","_s("+t.value+")")}},isPreTag:function(e){return"pre"===e},isUnaryTag:to,mustUseProp:Sn,canBeLeftOpenTag:no,isReservedTag:Un,getTagNamespace:Vn,staticKeys:(Go=Wo,Go.reduce(function(e,t){return e.concat(t.staticKeys||[])},[]).join(","))},Qo=e(function(e){return s("type,tag,attrsList,attrsMap,plain,parent,children,attrs"+(e?","+e:""))});function ea(e,t){e&&(Zo=Qo(t.staticKeys||""),Xo=t.isReservedTag||O,function e(t){t.static=function(e){if(2===e.type)return!1;if(3===e.type)return!0;return!(!e.pre&&(e.hasBindings||e.if||e.for||c(e.tag)||!Xo(e.tag)||function(e){for(;e.parent;){if("template"!==(e=e.parent).tag)return!1;if(e.for)return!0}return!1}(e)||!Object.keys(e).every(Zo)))}(t);if(1===t.type){if(!Xo(t.tag)&&"slot"!==t.tag&&null==t.attrsMap["inline-template"])return;for(var n=0,r=t.children.length;n|^function\s*\(/,na=/^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/,ra={esc:27,tab:9,enter:13,space:32,up:38,left:37,right:39,down:40,delete:[8,46]},ia={esc:"Escape",tab:"Tab",enter:"Enter",space:" ",up:["Up","ArrowUp"],left:["Left","ArrowLeft"],right:["Right","ArrowRight"],down:["Down","ArrowDown"],delete:["Backspace","Delete"]},oa=function(e){return"if("+e+")return null;"},aa={stop:"$event.stopPropagation();",prevent:"$event.preventDefault();",self:oa("$event.target !== $event.currentTarget"),ctrl:oa("!$event.ctrlKey"),shift:oa("!$event.shiftKey"),alt:oa("!$event.altKey"),meta:oa("!$event.metaKey"),left:oa("'button' in $event && $event.button !== 0"),middle:oa("'button' in $event && $event.button !== 1"),right:oa("'button' in $event && $event.button !== 2")};function sa(e,t,n){var r=t?"nativeOn:{":"on:{";for(var i in e)r+='"'+i+'":'+ca(i,e[i])+",";return r.slice(0,-1)+"}"}function ca(t,e){if(!e)return"function(){}";if(Array.isArray(e))return"["+e.map(function(e){return ca(t,e)}).join(",")+"]";var n=na.test(e.value),r=ta.test(e.value);if(e.modifiers){var i="",o="",a=[];for(var s in e.modifiers)if(aa[s])o+=aa[s],ra[s]&&a.push(s);else if("exact"===s){var c=e.modifiers;o+=oa(["ctrl","shift","alt","meta"].filter(function(e){return!c[e]}).map(function(e){return"$event."+e+"Key"}).join("||"))}else a.push(s);return a.length&&(i+="if(!('button' in $event)&&"+a.map(la).join("&&")+")return null;"),o&&(i+=o),"function($event){"+i+(n?"return "+e.value+"($event)":r?"return ("+e.value+")($event)":e.value)+"}"}return n||r?e.value:"function($event){"+e.value+"}"}function la(e){var t=parseInt(e,10);if(t)return"$event.keyCode!=="+t;var n=ra[e],r=ia[e];return"_k($event.keyCode,"+JSON.stringify(e)+","+JSON.stringify(n)+",$event.key,"+JSON.stringify(r)+")"}var ua={on:function(e,t){e.wrapListeners=function(e){return"_g("+e+","+t.value+")"}},bind:function(t,n){t.wrapData=function(e){return"_b("+e+",'"+t.tag+"',"+n.value+","+(n.modifiers&&n.modifiers.prop?"true":"false")+(n.modifiers&&n.modifiers.sync?",true":"")+")"}},cloak:$},fa=function(e){this.options=e,this.warn=e.warn||$r,this.transforms=wr(e.modules,"transformCode"),this.dataGenFns=wr(e.modules,"genData"),this.directives=m(m({},ua),e.directives);var t=e.isReservedTag||O;this.maybeComponent=function(e){return!t(e.tag)},this.onceId=0,this.staticRenderFns=[]};function pa(e,t){var n=new fa(t);return{render:"with(this){return "+(e?da(e,n):'_c("div")')+"}",staticRenderFns:n.staticRenderFns}}function da(e,t){if(e.staticRoot&&!e.staticProcessed)return va(e,t);if(e.once&&!e.onceProcessed)return ha(e,t);if(e.for&&!e.forProcessed)return f=t,v=(u=e).for,h=u.alias,m=u.iterator1?","+u.iterator1:"",y=u.iterator2?","+u.iterator2:"",u.forProcessed=!0,(d||"_l")+"(("+v+"),function("+h+m+y+"){return "+(p||da)(u,f)+"})";if(e.if&&!e.ifProcessed)return ma(e,t);if("template"!==e.tag||e.slotTarget){if("slot"===e.tag)return function(e,t){var n=e.slotName||'"default"',r=_a(e,t),i="_t("+n+(r?","+r:""),o=e.attrs&&"{"+e.attrs.map(function(e){return g(e.name)+":"+e.value}).join(",")+"}",a=e.attrsMap["v-bind"];!o&&!a||r||(i+=",null");o&&(i+=","+o);a&&(i+=(o?"":",null")+","+a);return i+")"}(e,t);var n;if(e.component)a=e.component,c=t,l=(s=e).inlineTemplate?null:_a(s,c,!0),n="_c("+a+","+ya(s,c)+(l?","+l:"")+")";else{var r=e.plain?void 0:ya(e,t),i=e.inlineTemplate?null:_a(e,t,!0);n="_c('"+e.tag+"'"+(r?","+r:"")+(i?","+i:"")+")"}for(var o=0;o':'
',0 + + + API Gateway AWS Proxy + APIGatewayAWSProxy.json + + + API Gateway Authorizer + APIGatewayAuthorizer.json + + + Rekognition S3 Request + RekognitionS3Request.json + + + CodeCommit + CodeCommit.json + + + CloudFormation Create Request + CloudFormationCreateRequest.json + + + SES Email Receiving + SESEmailReceiving.json + + + Scheduled Event + ScheduledEvent.json + + + CloudWatch Logs + CloudWatchLogs.json + + + SNS + SNS.json + + + DynamoDB Update + DynamoDBUpdate.json + + + Cognito Sync Trigger + CognitoSyncTrigger.json + + + Kinesis + Kinesis.json + + + Kinesis Firehose + KinesisFirehose.json + + + S3 Put + S3Put.json + + + S3 Delete + S3Delete.json + + + AWS Config Periodic Rule + AWSConfigPeriodicRule.json + + + AWS Config Change Trigger Rule + AWSConfigChangeTriggerRule.json + + + Lex Book Car + LexBookCar.json + + + Lex Book Hotel + LexBookHotel.json + + + Order Flowers + OrderFlowers.json + + + Alexa Start Session + AlexaStartSession.json + + + Alexa End Session + AlexaEndSession.json + + + Alexa Smart Home - Control + AlexaSmartHomeControl.json + + + Alexa Intent - MyColorIs + AlexaIntentMyColorIs.json + + + Hello World + HelloWorld.json + + + Mobile Backend + MobileBackend.json + + \ No newline at end of file diff --git a/src/lambda/commands/invokeLambda.ts b/src/lambda/commands/invokeLambda.ts index 0db71395825..2154de9525c 100644 --- a/src/lambda/commands/invokeLambda.ts +++ b/src/lambda/commands/invokeLambda.ts @@ -1,5 +1,7 @@ 'use strict'; +import xml2js = require('xml2js'); +import path = require('path'); import { FunctionNode } from "../explorer/functionNode"; import { getSelectedLambdaNode } from '../utils'; import { BaseTemplates } from "../../shared/templates/baseTemplates"; @@ -9,30 +11,115 @@ import { ext } from "../../shared/extensionGlobals"; import { LambdaTemplates } from "../templates/lambdaTemplates"; import { AWSError } from "aws-sdk"; import Lambda = require('aws-sdk/clients/lambda'); +import { ResourceFetcher } from "../../shared/resourceFetcher"; +import { sampleRequestManifestPath, sampleRequestPath } from "../constants"; +import { SampleRequest } from '../models/sampleRequest'; +import { ExtensionUtilities } from '../../shared/extensionUtilities'; export async function invokeLambda(element?: FunctionNode) { try { const fn: FunctionNode = await getSelectedLambdaNode(element); - const view = vscode.window.createWebviewPanel('html', `Invoked ${fn.functionConfiguration.FunctionName}`, -1); + const view = vscode.window.createWebviewPanel( + 'html', + `Invoked ${fn.functionConfiguration.FunctionName}`, + vscode.ViewColumn.One, + { + // Enable scripts in the webview + enableScripts: true + } + ); const baseTemplateFn = _.template(BaseTemplates.SimpleHTML); - view.webview.html = baseTemplateFn({ content: `

Loading...

` }); + view.webview.html = baseTemplateFn({ + content: `

Loading...

` + }); // ideally need to get the client from the explorer, but the context will do for now - const lambdaClient = await ext.sdkClientBuilder.createAndConfigureSdkClient(Lambda, undefined); - const funcResponse = await lambdaClient.invoke({ FunctionName: fn.functionConfiguration.FunctionArn!, LogType: 'Tail' }).promise(); - const logs = funcResponse.LogResult ? Buffer.from(funcResponse.LogResult, 'base64') : ""; - const payload = funcResponse.Payload ? funcResponse.Payload : JSON.stringify({}); - const invokeTemplateFn = _.template(LambdaTemplates.InvokeTemplate); - view.webview.html = baseTemplateFn({ - content: invokeTemplateFn({ - FunctionName: fn.functionConfiguration.FunctionName, - LogResult: logs, - StatusCode: funcResponse.StatusCode, - Payload: payload - }) - }); + console.log('building template...'); + const invokeInputTemplateFn = _.template(LambdaTemplates.InvokeInputTemplate); + const resourcePath = path.join(ext.context.extensionPath, 'resources', 'vs-lambda-sample-request-manifest.xml'); + console.log(sampleRequestManifestPath); + console.log(resourcePath); + try { + const sampleInput = await ResourceFetcher.fetchHostedResource(sampleRequestManifestPath, resourcePath); + const inputs: SampleRequest[] = []; + console.log('querying manifest url'); + xml2js.parseString(sampleInput, { explicitArray: false }, (err, result) => { + console.log(result); + if (err) { return; } + _.forEach(result.requests.request, (r) => { + inputs.push({ name: r.name, filename: r.filename }); + }); + }); + const loadScripts = ExtensionUtilities.getScriptsForHtml(['sampleRequests.js']); + const loadLibs = ExtensionUtilities.getLibrariesForHtml(['vue.min.js']); + console.log(loadLibs); + view.webview.html = baseTemplateFn({ + content: invokeInputTemplateFn({ + FunctionName: fn.functionConfiguration.FunctionName, + InputSamples: inputs, + Scripts: loadScripts, + Libraries: loadLibs + // LogResult: logs, + // StatusCode: funcResponse.StatusCode, + // Payload: payload + }), + }); + + view.webview.onDidReceiveMessage(async message => { + switch (message.command) { + case 'sampleRequestSelected': + console.log('selected the following sample:'); + console.log(message.value); + const sample = await ResourceFetcher.fetchHostedResource(sampleRequestPath + message.value, resourcePath); + console.log(sample); + view.webview.postMessage({ command: 'loadedSample', sample: sample }); + return; + case 'invokeLambda': + console.log('got the following payload:'); + console.log(message.value); + const lambdaClient = await ext.sdkClientBuilder.createAndConfigureSdkClient(Lambda, undefined); + let funcRequest = { + FunctionName: fn.functionConfiguration.FunctionArn!, + LogType: 'Tail' + } as AWS.Lambda.InvocationRequest; + if (message.value) { + console.log('found a payload'); + funcRequest.Payload = message.value; + } + const invokeTemplateFn = _.template(LambdaTemplates.InvokeTemplate); + try { + const funcResponse = await lambdaClient.invoke(funcRequest).promise(); + const logs = funcResponse.LogResult ? Buffer.from(funcResponse.LogResult, 'base64') : ""; + const payload = funcResponse.Payload ? funcResponse.Payload : JSON.stringify({}); + view.webview.html = baseTemplateFn({ + content: invokeTemplateFn({ + FunctionName: fn.functionConfiguration.FunctionName, + LogResult: logs, + StatusCode: funcResponse.StatusCode, + Payload: payload + }), + }); + } catch (e) { + view.webview.html = baseTemplateFn({ + content: invokeTemplateFn({ + FunctionName: fn.functionConfiguration.FunctionName, + LogResult: null, + StatusCode: null, + Payload: null, + Error: e + }), + }); + } + break; + } + }, undefined, ext.context.subscriptions); + } + catch (err) { + console.log('Error getting manifest data..'); + console.log(err); + } } catch (err) { const ex: AWSError = err; diff --git a/src/lambda/constants.ts b/src/lambda/constants.ts index 4e046675de6..672edb3579e 100644 --- a/src/lambda/constants.ts +++ b/src/lambda/constants.ts @@ -1,3 +1,7 @@ 'use strict'; +import { hostedFilesBaseUrl } from "../shared/constants"; export const blueprintsManifestPath: string = 'LambdaSampleFunctions/NETCore/msbuild-v4/vs-lambda-blueprint-manifest.xml'; +export const sampleRequestBase: string = 'LambdaSampleFunctions/SampleRequests'; +export const sampleRequestPath: string = `${hostedFilesBaseUrl}${sampleRequestBase}/`; +export const sampleRequestManifestPath: string = `${hostedFilesBaseUrl}${sampleRequestBase}/manifest.xml`; diff --git a/src/lambda/models/sampleRequest.ts b/src/lambda/models/sampleRequest.ts new file mode 100644 index 00000000000..e61bf67f3ab --- /dev/null +++ b/src/lambda/models/sampleRequest.ts @@ -0,0 +1,4 @@ +export class SampleRequest { + public name: string | undefined; + public filename: string | undefined; +} \ No newline at end of file diff --git a/src/lambda/models/scriptResource.ts b/src/lambda/models/scriptResource.ts new file mode 100644 index 00000000000..3e367fd8812 --- /dev/null +++ b/src/lambda/models/scriptResource.ts @@ -0,0 +1,5 @@ +import * as vscode from 'vscode'; +export class ScriptResource { + public Uri: vscode.Uri | undefined; + public Nonce: string | undefined; +} \ No newline at end of file diff --git a/src/lambda/templates/lambdaTemplates.ts b/src/lambda/templates/lambdaTemplates.ts index 6423332c653..0c4ce1ed9f1 100644 --- a/src/lambda/templates/lambdaTemplates.ts +++ b/src/lambda/templates/lambdaTemplates.ts @@ -1,15 +1,52 @@ export class LambdaTemplates { + static readonly InvokeInputTemplate = ` +

+ Include input payload with <%= FunctionName %> +

+
+

+ Use an input template: +

+ +
+ +
+ +
+ <% Libraries.forEach(function(lib) { %> + + <% }); %> + <% Scripts.forEach(function(scr) { %> + + <% }); %> + `; static readonly InvokeTemplate = `

Invoking <%= FunctionName %>...

-

Status Code: <%= StatusCode %>

-

Response: - 

<%- JSON.stringify(JSON.parse(Payload), null, 4) %>
-

-

Logs: - 

<%= LogResult %>
-

+ <% if (Error) { %> +
+

Something went wrong.

+ 
<%= Error %>
+
+ <% } else { %> +

Status Code: <%= StatusCode %>

+

Response: + 

<%- JSON.stringify(JSON.parse(Payload), null, 4) %>
+

+

Logs: + 

<%= LogResult %>
+

+ <% } %> `; static readonly GetPolicyTemplate = `

diff --git a/src/shared/extensionUtilities.ts b/src/shared/extensionUtilities.ts new file mode 100644 index 00000000000..c8c268870ce --- /dev/null +++ b/src/shared/extensionUtilities.ts @@ -0,0 +1,36 @@ +import * as vscode from 'vscode'; +import * as path from 'path'; +import { ext } from "../shared/extensionGlobals"; +import { ScriptResource } from '../lambda/models/scriptResource'; +import * as _ from 'lodash'; + +export class ExtensionUtilities { + public static getLibrariesForHtml(names: string[]): ScriptResource[] { + const basePath = path.join(ext.context.extensionPath, 'media', 'libs'); + return this.resolveResourceURIs(basePath, names); + } + public static getScriptsForHtml(names: string[]): ScriptResource[] { + const basePath = path.join(ext.context.extensionPath, 'media', 'js'); + return this.resolveResourceURIs(basePath, names); + } + + private static resolveResourceURIs(basePath: string, names: string[]): ScriptResource[] { + const scripts: ScriptResource[] = []; + _.forEach(names, (scriptName) => { + const scriptPathOnDisk = vscode.Uri.file(path.join(basePath, scriptName)); + const scriptUri = scriptPathOnDisk.with({ scheme: 'vscode-resource' }); + const nonce = ExtensionUtilities.getNonce(); + scripts.push({ Nonce: nonce, Uri: scriptUri }); + }); + return scripts; + } + + public static getNonce(): string { + let text = ""; + const possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + for (let i = 0; i < 32; i++) { + text += possible.charAt(Math.floor(Math.random() * possible.length)); + } + return text; + } +} \ No newline at end of file diff --git a/src/shared/templates/baseTemplates.ts b/src/shared/templates/baseTemplates.ts index cb26fb66e1a..dd192356c4e 100644 --- a/src/shared/templates/baseTemplates.ts +++ b/src/shared/templates/baseTemplates.ts @@ -1,6 +1,11 @@ export class BaseTemplates { static readonly SimpleHTML = ` + + + + + <%= content %>