Merge branch 'openziti:main' into main

Author: r-caamano

.github/CODEOWNERS

@@ -0,0 +1,4 @@
+# see:
+# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners
+* @openziti/maintainers
+

.github/workflows/main.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: '~1.16.0'
+          go-version: '~1.18.0'
 
       - name: Install Ziti CI
         uses: netfoundry/ziti-ci@v1
@@ -33,6 +33,8 @@ jobs:
       - name: Release
         env:
           gh_ci_key: ${{ secrets.GH_CI_KEY }}
+          ziti_ci_gpg_key: ${{ secrets.ZITI_CI_GPG_KEY }}
+          ziti_ci_gpg_key_id: ${{ secrets.ZITI_CI_GPG_KEY_ID }}
         if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-')
         run: |
           $(go env GOPATH)/bin/ziti-ci configure-git

.github/workflows/mattermost-ziti-webhook.yml

@@ -15,6 +15,7 @@ jobs:
   mattermost-ziti-webhook:
     runs-on: macos-latest
     name: POST Webhook
+    if: github.actor!= 'dependabot[bot]'
     steps:
     - uses: openziti/ziti-webhook-action@main
       with:

.github/workflows/update-dependency.yml

@@ -19,20 +19,22 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: '~1.16.0'
+          go-version: '~1.18.0'
 
       - name: Install Ziti CI
         uses: netfoundry/ziti-ci@v1
 
       - name: Update Dependency
         env:
           gh_ci_key: ${{ secrets.GH_CI_KEY }}
+          ziti_ci_gpg_key: ${{ secrets.ZITI_CI_GPG_KEY }}
+          ziti_ci_gpg_key_id: ${{ secrets.ZITI_CI_GPG_KEY_ID }}
         run: |
           $(go env GOPATH)/bin/ziti-ci configure-git
           $(go env GOPATH)/bin/ziti-ci update-go-dependency  ${{ github.event.inputs.updated-dependency }}
 
       - name: Build and Test
-        run: go test ./...
+        run: go test ./... --tags apitests
 
       - name: Complete Dependency Update
         run: $(go env GOPATH)/bin/ziti-ci complete-update-go-dependency

buildinfo.yml

@@ -0,0 +1,5 @@
+# Excercises
+
+This directory is meant for any code samples or documentation that would help one learn more about how to use the Ziti SDK for go.
+
+The first exercise shows code before and after zitifying a simple http server. 

exercises/README.md

@@ -0,0 +1,18 @@
+# HTTP
+
+This exercise takes a simple server listening on a port. The example is contrived and simple on purpose. When deploying
+locally the basic setup would look like this:
+
+![image](./simple-example.png)
+
+When deploying a server like this out to the internet, for example using AWS, that same basic overview would 
+probably look more like this simplified diagram below. Notice that port 8090 is now open through the firewall. The 
+server is also listening on port 8090.
+
+![image](./simple-cloud.png)
+
+With Ziti you can eliminate the need for listening ports, the need for firewall holes in you deployments entirely. 
+This is what the same example looks like using Ziti. Notice no inbound firewall ports needed on either side. No 
+listening port at all in the zitified example, just a Ziti service which is "bound" to the server identity
+
+![image](./simple-zitified-example.png)

exercises/http/README.md

@@ -0,0 +1,29 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+)
+
+func main() {
+	target := "localhost:8090"
+	helloUrl := fmt.Sprintf("http://%s/hello", target)
+	httpClient := http.Client{}
+	resp, e := httpClient.Get(helloUrl)
+	if e != nil {
+		panic(e)
+	}
+	body, _ := ioutil.ReadAll(resp.Body)
+	fmt.Println("Hello response:", string(body))
+
+	a := 1
+	b := 2
+	addUrl := fmt.Sprintf("http://%s/add?a=%d&b=%d", target, a, b)
+	resp, _ = httpClient.Get(addUrl)
+	if e != nil {
+		panic(e)
+	}
+	body, _ = ioutil.ReadAll(resp.Body)
+	fmt.Println("Add Result:", string(body))
+}

exercises/http/client/before/simple-client.go

@@ -0,0 +1,52 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"github.com/openziti/sdk-golang/ziti"
+	"github.com/openziti/sdk-golang/ziti/config"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"os"
+	"strings"
+)
+
+func main() {
+	target := os.Args[2]
+	helloUrl := fmt.Sprintf("http://%s/hello", target)
+	httpClient := createZitifiedHttpClient(os.Args[1])
+	resp, e := httpClient.Get(helloUrl)
+	if e != nil {
+		panic(e)
+	}
+	body, _ := ioutil.ReadAll(resp.Body)
+	fmt.Println("Hello response:", string(body))
+
+	a := 1
+	b := 2
+	addUrl := fmt.Sprintf("http://%s/add?a=%d&b=%d", target, a, b)
+	resp, _ = httpClient.Get(addUrl)
+	if e != nil {
+		panic(e)
+	}
+	body, _ = ioutil.ReadAll(resp.Body)
+	fmt.Println("Add Result:", string(body))
+}
+
+var zitiContext ziti.Context
+
+func Dial(_ context.Context, _ string, addr string) (net.Conn, error) {
+	service := strings.Split(addr, ":")[0] // will always get passed host:port
+	return zitiContext.Dial(service)
+}
+func createZitifiedHttpClient(idFile string) http.Client {
+	cfg, err := config.NewFromFile(idFile)
+	if err != nil {
+		panic(err)
+	}
+	zitiContext = ziti.NewContextWithConfig(cfg)
+	zitiTransport := http.DefaultTransport.(*http.Transport).Clone() // copy default transport
+	zitiTransport.DialContext = Dial                                 //zitiDialContext.Dial
+	return http.Client{Transport: zitiTransport}
+}

exercises/http/client/zitified/simple-client.go

@@ -0,0 +1,28 @@
+package main
+
+import (
+	"fmt"
+	"net/http"
+	"os"
+	"strconv"
+)
+
+func main() {
+	http.HandleFunc("/hello", hello)
+	http.HandleFunc("/add", add)
+	if err := http.ListenAndServe(":8090", nil); err != nil {
+		panic(err)
+	}
+}
+
+func hello(w http.ResponseWriter, req *http.Request) {
+	host, _ := os.Hostname()
+	fmt.Fprintf(w, "zitified hello from %s", host)
+}
+
+func add(w http.ResponseWriter, req *http.Request) {
+	a, _ := strconv.Atoi(req.URL.Query().Get("a"))
+	b, _ := strconv.Atoi(req.URL.Query().Get("b"))
+	c := a + b
+	fmt.Fprintf(w, "a+b=%d+%d=%d", a, b, c)
+}

exercises/http/server/before/simple-server.go

@@ -0,0 +1,48 @@
+package main
+
+import (
+	"fmt"
+	"github.com/openziti/sdk-golang/ziti"
+	"github.com/openziti/sdk-golang/ziti/config"
+	"net"
+	"net/http"
+	"os"
+	"strconv"
+	"time"
+)
+
+func main() {
+	http.HandleFunc("/hello", hello)
+	http.HandleFunc("/add", add)
+	if err := http.Serve(createZitiListener(), nil); err != nil {
+		panic(err)
+	}
+}
+
+func hello(w http.ResponseWriter, req *http.Request) {
+	host, _ := os.Hostname()
+	fmt.Fprintf(w, "zitified hello from %s", host)
+}
+
+func add(w http.ResponseWriter, req *http.Request) {
+	a, _ := strconv.Atoi(req.URL.Query().Get("a"))
+	b, _ := strconv.Atoi(req.URL.Query().Get("b"))
+	c := a + b
+	fmt.Fprintf(w, "zitified a+b=%d+%d=%d", a, b, c)
+}
+
+func createZitiListener() net.Listener {
+	cfg, err := config.NewFromFile(os.Args[1])
+	if err != nil {
+		panic(err)
+	}
+	options := ziti.ListenOptions{
+		ConnectTimeout: 5 * time.Minute,
+	}
+	listener, err := ziti.NewContextWithConfig(cfg).ListenWithOptions(os.Args[2], &options)
+	if err != nil {
+		fmt.Printf("Error binding service %+v\n", err)
+		panic(err)
+	}
+	return listener
+}

exercises/http/server/zitified/simple-server.go

@@ -1,33 +1,60 @@
 module github.com/openziti/sdk-golang
 
-go 1.16
+go 1.17
 
 //replace github.com/openziti/foundation => ../foundation
 
 require (
 	github.com/Jeffail/gabs v1.4.0
-	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
-	github.com/cenkalti/backoff/v4 v4.1.1
-	github.com/deepmap/oapi-codegen v1.8.2 // indirect
+	github.com/cenkalti/backoff/v4 v4.1.3
 	github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa
-	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/google/uuid v1.3.0
-	github.com/influxdata/influxdb-client-go/v2 v2.4.0
-	github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
-	github.com/michaelquigley/pfxlog v0.6.1
+	github.com/influxdata/influxdb-client-go/v2 v2.8.1
+	github.com/michaelquigley/pfxlog v0.6.9
 	github.com/mitchellh/go-ps v1.0.0
-	github.com/mitchellh/mapstructure v1.4.2
+	github.com/mitchellh/mapstructure v1.4.3
 	github.com/netfoundry/secretstream v0.1.2
-	github.com/openziti/foundation v0.15.76
+	github.com/openziti/channel v0.18.28
+	github.com/openziti/foundation v0.17.22
+	github.com/openziti/transport v0.1.5
 	github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6
 	github.com/pkg/errors v0.9.1
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
-	github.com/shirou/gopsutil v2.20.9+incompatible
+	github.com/shirou/gopsutil v2.21.11+incompatible
 	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/cobra v1.2.1
-	github.com/stretchr/testify v1.7.0
+	github.com/spf13/cobra v1.4.0
+	github.com/stretchr/testify v1.7.1
 	go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1
-	golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
-	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1
+	golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/deepmap/oapi-codegen v1.8.2 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d // indirect
+	github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
+	github.com/miekg/pkcs11 v1.1.1 // indirect
+	github.com/parallaxsecond/parsec-client-go v0.0.0-20220111122524-cb78842db373 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/speps/go-hashids v2.0.0+incompatible // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/tklauser/go-sysconf v0.3.9 // indirect
+	github.com/tklauser/numcpus v0.3.0 // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 // indirect
+	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )