From a9238f56317069c219abca7c7f15c001b620e72e Mon Sep 17 00:00:00 2001
From: Andrew Cornies <acornies@gmail.com>
Date: Sun, 18 Nov 2018 09:38:41 -0500
Subject: [PATCH] Secrets iteration: - added delete http verb to system/secrets
 - added secrets request type - added vagrant env provisioned by existing
 deploy_stack.sh

Signed-off-by: Andrew Cornies <acornies@gmail.com>
---
 .gitignore                   |  1 +
 Vagrantfile                  | 78 ++++++++++++++++++++++++++++++++++++
 gateway/requests/requests.go |  5 +++
 gateway/server.go            |  2 +-
 4 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 Vagrantfile

diff --git a/.gitignore b/.gitignore
index 5443baa6..fbb8ee97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ certifier
 .editorconfig
 /contrib/staging/
 **/*.sha256
+.vagrant
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 00000000..c1ce54e5
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,78 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://vagrantcloud.com/search.
+  config.vm.box = "generic/ubuntu1604"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # NOTE: This will enable public access to the opened port
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine and only allow access
+  # via 127.0.0.1 to disable public access
+  config.vm.network "forwarded_port", guest: 8080, host: 8080, host_ip: "127.0.0.1"
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  config.vm.synced_folder "./", "/vagrant"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  config.vm.provider "virtualbox" do |vb|
+    # Display the VirtualBox GUI when booting the machine
+    vb.gui = false
+  
+    # Customize the amount of memory on the VM:
+    vb.memory = "2048"
+  end
+
+  config.vm.provider "vmware_fusion" do |vmf|
+    vmf.gui = false
+    vmf.memory = "2048"
+  end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  config.vm.provision "docker"
+
+  config.vm.provision "shell", inline: <<-SHELL
+    docker swarm init
+    cd /vagrant
+    sh deploy_stack.sh
+  SHELL
+end
diff --git a/gateway/requests/requests.go b/gateway/requests/requests.go
index 3ca4a8ce..04603d22 100644
--- a/gateway/requests/requests.go
+++ b/gateway/requests/requests.go
@@ -90,3 +90,8 @@ type AsyncReport struct {
 type DeleteFunctionRequest struct {
 	FunctionName string `json:"functionName"`
 }
+
+// SecretRequest create, update a secret
+type SecretRequest struct {
+	Secrets *map[string]string `json:"secrets"`
+}
diff --git a/gateway/server.go b/gateway/server.go
index fe97862d..42b08d12 100644
--- a/gateway/server.go
+++ b/gateway/server.go
@@ -163,7 +163,7 @@ func main() {
 	r.HandleFunc("/system/functions", faasHandlers.UpdateFunction).Methods(http.MethodPut)
 	r.HandleFunc("/system/scale-function/{name:[-a-zA-Z_0-9]+}", faasHandlers.ScaleFunction).Methods(http.MethodPost)
 
-	r.HandleFunc("/system/secrets", faasHandlers.SecretHandler).Methods(http.MethodGet, http.MethodPut, http.MethodPost)
+	r.HandleFunc("/system/secrets", faasHandlers.SecretHandler).Methods(http.MethodGet, http.MethodPut, http.MethodPost, http.MethodDelete)
 
 	if faasHandlers.QueuedProxy != nil {
 		r.HandleFunc("/async-function/{name:[-a-zA-Z_0-9]+}/", faasHandlers.QueuedProxy).Methods(http.MethodPost)