generic sample generator with test

Author: michele-sciabarra

CHANGELOG

@@ -1,8 +1,13 @@
 # 0.5.3
 
+- updated package-lock.json for vulnerabilities
 - fixed problems with latest version of docker
-- updated package-lock.json
 - adding --use-version flag to use specific versions of images
+- adding sample.py to generate samples 
+- reworked import to handle "too many requests"
+- adding checkbox to form
+- proxy importer now supports http and https, get and post with args
+- credits
 
 # 0.5.2
 

admin/actions/deploy/iosdk/send.py

@@ -42,17 +42,17 @@ def main(args):
     >>> #args['io-apikey'] = "c64b38f22e8344a18d63d7c524b171cc"
     >>> #args['fiscal_code'] = "SCCNDR68T05L483L"
     >>> #print(main(args))
-
     """
     try:
         url = args['io-messages']
         key = args['io-apikey']
+        code = args['fiscal_code'].split(":")[0]
         msg = {
             "content": {
                 "subject": args['subject'],
                 "markdown": args['markdown'],
             },
-            "fiscal_code": args['fiscal_code']
+            "fiscal_code": code
         }
         if "amount" in args and args["amount"] != "":
             pd = {

admin/actions/deploy/samples/env.py

@@ -0,0 +1,8 @@
+import os
+def main(args):
+    res = {}
+    env = os.environ
+    for k in env:
+        if k.startswith("__OW"):
+            res[k] = env[k]
+    return res

admin/actions/deploy/util/import.js

@@ -1,29 +1,61 @@
 function main(args) {
     if(args.url) {
+        let url = args.url
+
+        // use http or https
+        let client = require("https")
+        if(args.url.startsWith("http:"))
+            client = require("http")
+        
+        // fix calls to API HOST
+        if(url.startsWith("http://localhost:3280")) 
+            url = process.env.__OW_API_HOST + url.substring(21)
+
+        // build url
+        let authURL = new URL(url);
+        if(args.username)
+            authURL.username = args.username;
+        if(args.password)
+            authURL.password = args.password
+
+        let body = args["jsonargs"] || "{}"
         return new Promise(function(resolve) {
-            let url = new URL(args.url);
-            if(args.username)
-                url.username = args.username;
-            if(args.password)
-                url.password = args.password
-            require('https').get(url, function handleHttp(resp)  {
+            let handleHttp = (resp) => {
+                resp.setEncoding('utf8');
                 let data = '';
                 resp.on('data', (chunk) => { data += chunk; });
                 resp.on('end', () => { resolve({"body": { "data": JSON.parse(data) }})});
-              }
-            ).on("error", (err) => {resolve({"error": err.message})})
+            }
+            let handleError = (err) => {resolve({"error": err.message})}
+            if(args.useget == "true") {
+                console.log("GET "+url)
+                client.get(authURL, handleHttp).on("error", handleError)
+            } else {
+                console.log("POST "+url+" data="+body)
+                let req = client.request(authURL, {
+                    method: "POST",
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'Content-Length': body.length
+                    }
+                }, handleHttp)
+                req.on("error", handleError)
+                req.write(body)
+                req.end()
+            }
         })
     }
     return { "body": { "form": [
         {
             "type": "message",
             "name": "note",
-            "description": "Use url 'https://raw.githubusercontent.com/pagopa/io-sdk/master/docs/sample.json' for sample data"
+            "description": "Import from JSON source. Replace the sample endpoint with your service."
         },
         {
             "name": "url",
             "description": "URL",
             "type": "string",
+            "value": "http://localhost:3280/api/v1/web/guest/util/sample",
             "required": false
         },
         {
@@ -36,7 +68,21 @@ function main(args) {
             "name": "password",
             "description": "Password",
             "type": "password",
-            "required": true
-        }]
+            "required": false
+        },
+        {
+            "name": "jsonargs",
+            "description": "Args in JSON format to POST:",
+            "type": "string",
+            "value": "{\"count\":1, \"fiscal_code\":\"AAAAAA00A00A000A\", \"amount\":0,  \"due_date\":\"\"}",
+            "required": false
+        },
+        {
+            "name": "useget",
+            "description": "Use GET (ignoring JSON args):",
+            "type": "checkbox",
+            "required": false
+        }
+    ]
     } }
 }

admin/actions/deploy/util/sample.py

@@ -0,0 +1,34 @@
+import datetime
+import json
+
+def main(args):
+  try:
+    print(args)
+    count = args.get("count", 1)
+    fiscal_code = args.get("fiscal_code", "")
+    if fiscal_code == "":
+        fiscal_code = "AAAAAA00A00A000A"
+
+    rec = {}
+    if "amount" in args and args["amount"] != "":
+        try: rec["amount"]=int(args["amount"])   
+        except Exception as e: print(str(e))
+    if "due_date" in args and args["due_date"] != "":
+        try: rec["due_date"] = datetime.datetime.fromisoformat(args["due_date"]).isoformat()
+        except Exception as e: print(str(e))
+
+    res = []
+    for i in range(0, int(count)):
+        code = "%s:%d" %  (fiscal_code, i)
+        rec1 = rec.copy()
+        rec1["fiscal_code"]  = code
+        rec1["subject"] =  "Benvenuto  %s" % code
+        rec1["markdown"] = "# Benvenuto, %s\nTi diamo il benvenuto. Questo è un messaggio di *benvenuto* per mostrare come generare markdown in **HTML**. Ricordare che deve essere un testo lungo." % code
+        res.append(rec1)
+    
+    return { "body": json.dumps(res, indent=2)}
+  except Exception as e:
+    return { "body": { "error": str(e)}}
+
+
+    

admin/actions/manifest.yaml

@@ -30,6 +30,10 @@ packages:
         function: deploy/util/import.js
         docker: openwhisk/action-nodejs-v10
         web: true
+      sample:
+        function: deploy/util/sample.py
+        docker: actionloop/actionloop-python-v3.7
+        web: true
   iosdk:
     version: 1.0
     actions:

admin/actions/debug-src admin/actions/source-me-for-debug

@@ -2,18 +2,43 @@
 load util
 
 @test "util/import" {
-
    ipost $URL/util/import
    ckline '"name": "url"'
    ckline '"name": "username"'
    ckline '"name": "password"'
+   ckline '"name": "jsonargs"'
+   ckline '"name": "useget"'
 }
 
-@test "util/import post" {
-   ipost $URL/util/import url=https://raw.githubusercontent.com/pagopa/io-sdk/master/docs/sample.json
+@test "util/import get" {
+   ipost $URL/util/import useget=true url=https://raw.githubusercontent.com/pagopa/io-sdk/master/docs/sample.json
    ckline '"fiscal_code": "AAAAAA00A00A000A"'
    ckline '"markdown":'
    ckline '"subject":'
 }
 
+@test "util/import sample get" {
+  ipost $URL/util/import useget=true url="http://localhost:3280/api/v1/web/guest/util/sample"
+  ckline '"AAAAAA00A00A000A:0"'
+  ckline '"markdown"'
+  ckline '"subject"'
+  ipost $URL/util/import useget=true url="http://localhost:3280/api/v1/web/guest/util/sample?count=2"
+  ckline '"AAAAAA00A00A000A:1"'
+  ipost $URL/util/import useget=true url="http://localhost:3280/api/v1/web/guest/util/sample?fiscal_code=BBBBB00B00B000B"
+  ckline '"BBBBB00B00B000B:0"'
+}
 
+@test "util/import sample post" {
+   ipost $URL/util/import url=http://localhost:3280/api/v1/web/guest/util/sample
+   ckline '"fiscal_code": "AAAAAA00A00A000A:0"'
+   ckline '"markdown":'
+   ckline '"subject":'
+}
+
+@test "util/import sample post with args" {
+   run http --timeout 300 --json POST $URL/util/import url=http://localhost:3280/api/v1/web/guest/util/sample jsonargs='{"count":2,"fiscal_code":"BBBBB00B00B000B","amount":1,"due_date":"2021-01-01"}'
+   #curl -X POST  -F url=http://localhost:3280/api/v1/web/guest/util/sample $URL/util/import
+   ckline '"BBBBB00B00B000B:1"'
+   ckline '"amount": 1'
+   ckline '"due_date": "2021-01-01T00:00:00"'
+}

admin/actions/test/import.bats

@@ -5,7 +5,7 @@
       "due_date": 44197,
       "fiscal_code": "ISPXNB32R82Y766F",
       "invalid_after_due_date": false,
-      "markdown": "# Welcome, Giovanni Rossi\\\\nYour fiscal code is ISPXNB32R82Y766F\\\\nI hope you will enjoy IO.",
+      "markdown": "# Welcome, Giovanni Rossi\nYour fiscal code is ISPXNB32R82Y766F\nI hope you will enjoy IO.",
       "notice_number": 1,
       "subject": "Welcome to IO, Giovanni"
     },
@@ -14,7 +14,7 @@
       "due_date": 44197,
       "fiscal_code": "ISPXNB32R82Y766D",
       "invalid_after_due_date": false,
-      "markdown": "# Welcome, Luca Rossi\\\\nYour fiscal code is ISPXNB32R82Y766D\\\\n.I hope you will enjoy IO.",
+      "markdown": "# Welcome, Luca Ross\nYour fiscal code is ISPXNB32R82Y766D\n.I hope you will enjoy IO.",
       "notice_number": 1,
       "subject": "Welcome to IO, Luca"
     }

admin/actions/test/import.json

@@ -0,0 +1,34 @@
+#!/usr/bin/env bats
+load util
+
+@test "util/sample post" {
+    ipost http://localhost:3280/api/v1/web/guest/util/sample
+    ckline '"fiscal_code": "AAAAAA00A00A000A:0"'
+    ckline '"markdown": "# Benvenuto,'
+    ckline '"subject": "Benvenuto'
+    ipost http://localhost:3280/api/v1/web/guest/util/sample fiscal_code="PLMFNZ48R20I480G" due_date="2020-12-12" amount=1
+    ckline '"amount": 1'
+    ckline '"due_date": "2020-12-12T00:00:00"'
+    ckline '"fiscal_code": "PLMFNZ48R20I480G:0"'
+    ipost http://localhost:3280/api/v1/web/guest/util/sample count=2
+    ckline '"fiscal_code": "AAAAAA00A00A000A:1"'
+}
+
+@test "util/sample get" {
+    get http://localhost:3280/api/v1/web/guest/util/sample
+    ckline '"fiscal_code": "AAAAAA00A00A000A:0"'
+    ckline '"markdown": "# Benvenuto,'
+    ckline '"subject": "Benvenuto'
+}
+
+@test "util/sample get count" {
+    get "http://localhost:3280/api/v1/web/guest/util/sample?count=2"
+    ckline '"fiscal_code": "AAAAAA00A00A000A:1"'
+}
+
+@test "util/sample get extra" {
+    run http --timeout=300 GET 'http://localhost:3280/api/v1/web/guest/util/sample?fiscal_code=PLMFNZ48R20I480G&due_date=2020-12-12&amount=1'
+    ckline '"amount": 1'
+    ckline '"due_date": "2020-12-12T00:00:00"'
+    ckline '"fiscal_code": "PLMFNZ48R20I480G:0"'
+}

admin/actions/test/sample.bats

@@ -6,13 +6,24 @@ let body = marked(`
 
 IO-SDK è il kit di sviluppo per IO.
 
-Consente lo sviluppo di importatori per la app dei servizi pubblici italiani.
+Consente lo sviluppo di importatori per la app IO dei servizi pubblici italiani.
 
-Il nostro team è composto da:
+Hanno contribuito allo sviluppo, con codice, test, documentazione, gestione e promozione le seguenti persone:
 
-- Federico Feroldi, Team Leader
-- Mirko Calvaresi, Project Manager
-- Michele Sciabarrà, Developer
+- Andrea Saccavini
+- Andrea Tironi
+- Calogero Bonasia
+- Federico Feroldi
+- Francesco Rossi
+- Francesco Timperi Tiberi
+- Giovanni Gadaleta
+- Greta Quadrati
+- Leonardo Cigolini Gulesu
+- Michele Sciabarrà
+- Mirko Calvaresi
+- Pasquale Finocchiaro
+- Pierluigi Di Lorenzo
+- Simone Paolucci
 `);
 </script>
 

admin/src/About.svelte

@@ -1,3 +1,34 @@
+<script>
+  import { onMount } from 'svelte'
+  let error = "error"
+
+async function test(url) {
+    //try {
+      return fetch(url, {
+        headers: { 'Accept': 'application/json'}
+      }).then((res) => {
+        console.log("then")
+        console.log(res)
+        error = res.statusText
+        return res.json()
+      }).catch((err) => {
+        console.log("catch")
+        console.log(err)
+        error = err
+      })
+    //} catch(ex) { error = ex }
+}
+
+async function start() {
+  let r = await test("https://httpstat.us/429")
+  console.log(r)
+}
+
+onMount(start)
+
+
+</script>
+
 <div class="it-hero-wrapper">
   <div class="container-fluid">
     <div class="row">
@@ -6,8 +37,10 @@
               <span class="it-category">Welcome</span>
               <h1 class="no_toc">IO-SDK</h1>
               <p class="d-none d-lg-block">Welcome to the development kit to easily build IO importers.</p>
+              <br>
+              <p>ERROR: {error}</p>
           </div>
         </div>
     </div>
   </div>
-</div>
+</div>