Merge edge

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: gomod
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

.github/workflows/main.yml

@@ -140,6 +140,35 @@ jobs:
           path: release/
           retention-days: 5
 
+  tests:
+    name: Run Unit and Integration Tests
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.20.x'
+
+      - name: Install Ziti CI
+        uses: openziti/ziti-ci@v1
+
+      - name: Run Go Quickstart Test
+        timeout-minutes: 5
+        shell: bash
+        run: |
+          go test -v -tags "quickstart automated" ./ziti/cmd/edge/...;
+
+      - name: Run Unit and Integration Tests
+        timeout-minutes: 5
+        shell: bash
+        run: |
+          go test ./... --tags apitests
+
   fablab-smoketest:
     name: Fablab Smoketest
     # not applicable to forks. shouldn't run on release build
@@ -366,7 +395,7 @@ jobs:
         && (needs.fablab-smoketest.result == 'success' || needs.fablab-smoketest.result == 'skipped') 
       }}
     runs-on: ubuntu-20.04
-    needs: [ linux-build, mac-os-build, windows-build, fablab-smoketest, fablab-ha-smoketest ]
+    needs: [ tests, linux-build, mac-os-build, windows-build, fablab-smoketest, fablab-ha-smoketest ]
     outputs:
       ZITI_VERSION: ${{ steps.get_version.outputs.ZITI_VERSION }}
     steps:

.github/workflows/update-dependency.yml

@@ -0,0 +1,42 @@
+name: update-dependency
+on:
+  workflow_dispatch:
+    inputs:
+      updated-dependency:
+        description: The dependency that was updated
+        required: true
+
+concurrency: update-dependency
+
+jobs:
+  build:
+    if: github.ref == 'refs/heads/update-dependency'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '1.20.x'
+
+      - name: Install Ziti CI
+        uses: openziti/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 ./... --tags apitests
+
+      - name: Complete Dependency Update
+        run: $(go env GOPATH)/bin/ziti-ci complete-update-go-dependency

.golangci.yml

@@ -2,3 +2,10 @@ run:
   deadline: 8m
   skip-files:
     - ziti/cmd/edge/verify_ca.go
+
+# golangci gives false positives for implementations of methods using generics in generic interfaces
+issues:
+  exclude-rules:
+    - path: 'controller/model/.*.go'
+      linters:
+        - unused

common/binding.go

@@ -0,0 +1,22 @@
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+
+package common
+
+const (
+	EdgeBinding   = "edge"
+	TunnelBinding = "tunnel"
+)