Release 15.3.1 (#1066)

* Release 15.3.1 * access/email: Embed example TOML file The teleport repo changed to remove the exported `email.ExampleConfig` variable, but we depend on it here. Add the example config as a file and embed it in main. This plugin is on its last days as it gets migrated to the teleport repo, so duplicating this example config here for a short time will not become a maintenance issue.
gravitational · May 8, 2024 · 819f62a · 819f62a
1 parent 7df001e
commit 819f62a
Show file tree

Hide file tree

Showing 37 changed files with 175 additions and 127 deletions.
diff --git a/access/discord/Makefile b/access/discord/Makefile
@@ -1,4 +1,4 @@
-VERSION?=15.3.0
+VERSION?=15.3.1
 GO_VERSION=1.21.9
 
 BUILDDIR ?= build

diff --git a/access/email/Makefile b/access/email/Makefile
@@ -1,4 +1,4 @@
-VERSION?=15.3.0
+VERSION?=15.3.1
 GO_VERSION=1.21.9
 
 BUILDDIR ?= build

diff --git a/access/email/example_config.toml b/access/email/example_config.toml
@@ -0,0 +1,37 @@
+# Example email plugin configuration TOML file
+
+[teleport]
+addr = "0.0.0.0:3025"                              # Teleport Auth Server GRPC API address
+
+# When using --format=file:
+# identity = "/var/lib/teleport/plugins/email/auth_id"    # Identity file
+# refresh_identity = true                                 # Refresh identity file on a periodic basis.
+#
+# When using --format=tls:
+# client_key = "/var/lib/teleport/plugins/email/auth.key" # Teleport TLS secret key
+# client_crt = "/var/lib/teleport/plugins/email/auth.crt" # Teleport TLS certificate
+# root_cas = "/var/lib/teleport/plugins/email/auth.cas"   # Teleport CA certs
+
+[mailgun]
+domain = "your-domain-name"
+private_key = "xoxb-11xx"
+# private_key_file = "/var/lib/teleport/plugins/email/mailgun_private_key"
+
+[smtp]
+host = "smtp.gmail.com"
+port = 587
+username = "[email protected]"
+password = ""
+# password_file = "/var/lib/teleport/plugins/email/smtp_password"
+starttls_policy = "mandatory" # mandatory|opportunistic|disabled
+
+[delivery]
+sender = "[email protected]" # From: email address
+
+[role_to_recipients]
+"dev" = "[email protected]" # All requests to 'dev' role will be sent to this address
+"*" = ["[email protected]", "[email protected]"] # These recipients will receive review requests not handled by the roles above
+
+[log]
+output = "stderr" # Logger output. Could be "stdout", "stderr" or "/var/lib/teleport/email.log"
+severity = "INFO" # Logger severity. Could be "INFO", "ERROR", "DEBUG" or "WARN".
diff --git a/access/email/main.go b/access/email/main.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"context"
+	_ "embed"
 	"fmt"
 	"os"
 	"time"
@@ -29,6 +30,9 @@ import (
 	"github.com/gravitational/trace"
 )
 
+//go:embed example_config.toml
+var exampleConfig string
+
 func main() {
 	logger.Init()
 	app := kingpin.New("teleport-email", "Teleport plugin for access requests approval via E-mail.")
@@ -52,7 +56,7 @@ func main() {
 
 	switch selectedCmd {
 	case "configure":
-		fmt.Print(email.ExampleConfig)
+		fmt.Print(exampleConfig)
 	case "version":
 		lib.PrintVersion(app.Name, Version, Gitref)
 	case "start":

diff --git a/access/jira/Makefile b/access/jira/Makefile
@@ -1,4 +1,4 @@
-VERSION?=15.3.0
+VERSION?=15.3.1
 GO_VERSION=1.21.9
 
 BUILDDIR ?= build

diff --git a/access/mattermost/Makefile b/access/mattermost/Makefile
@@ -1,4 +1,4 @@
-VERSION?=15.3.0
+VERSION?=15.3.1
 GO_VERSION=1.21.9
 
 BUILDDIR ?= build

diff --git a/access/msteams/Makefile b/access/msteams/Makefile
@@ -1,4 +1,4 @@
-VERSION?=15.3.0
+VERSION?=15.3.1
 GO_VERSION=1.21.9
 
 BUILDDIR ?= build

diff --git a/access/pagerduty/Makefile b/access/pagerduty/Makefile
@@ -1,4 +1,4 @@
-VERSION?=15.3.0
+VERSION?=15.3.1
 GO_VERSION=1.21.9
 
 BUILDDIR ?= build

diff --git a/access/slack/Makefile b/access/slack/Makefile
@@ -1,4 +1,4 @@
-VERSION?=15.3.0
+VERSION?=15.3.1
 GO_VERSION=1.21.9
 
 BUILDDIR ?= build

diff --git a/charts/access/discord/Chart.yaml b/charts/access/discord/Chart.yaml
@@ -15,16 +15,16 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "15.3.0"
+version: "15.3.1"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-version: "15.3.0"
+version: "15.3.1"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "15.3.0"
+appVersion: "15.3.1"
diff --git a/charts/access/discord/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/discord/tests/__snapshot__/configmap_test.yaml.snap
@@ -24,6 +24,6 @@ should match the snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: teleport-plugin-discord
-        app.kubernetes.io/version: 15.3.0
-        helm.sh/chart: teleport-plugin-discord-15.3.0
+        app.kubernetes.io/version: 15.3.1
+        helm.sh/chart: teleport-plugin-discord-15.3.1
       name: RELEASE-NAME-teleport-plugin-discord
diff --git a/charts/access/discord/tests/__snapshot__/deployment_test.yaml.snap b/charts/access/discord/tests/__snapshot__/deployment_test.yaml.snap
@@ -7,8 +7,8 @@ should match the snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: teleport-plugin-discord
-        app.kubernetes.io/version: 15.3.0
-        helm.sh/chart: teleport-plugin-discord-15.3.0
+        app.kubernetes.io/version: 15.3.1
+        helm.sh/chart: teleport-plugin-discord-15.3.1
       name: RELEASE-NAME-teleport-plugin-discord
     spec:
       replicas: 1
@@ -22,8 +22,8 @@ should match the snapshot:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: teleport-plugin-discord
-            app.kubernetes.io/version: 15.3.0
-            helm.sh/chart: teleport-plugin-discord-15.3.0
+            app.kubernetes.io/version: 15.3.1
+            helm.sh/chart: teleport-plugin-discord-15.3.1
         spec:
           containers:
           - command:

diff --git a/charts/access/email/Chart.yaml b/charts/access/email/Chart.yaml
@@ -13,10 +13,10 @@ description: A Helm chart for the Teleport Email Plugin
 type: application
 
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "15.3.0"
+version: "15.3.1"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "15.3.0"
+appVersion: "15.3.1"
diff --git a/charts/access/email/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/email/tests/__snapshot__/configmap_test.yaml.snap
@@ -26,8 +26,8 @@ should match the snapshot (mailgun on):
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: teleport-plugin-email
-        app.kubernetes.io/version: 15.3.0
-        helm.sh/chart: teleport-plugin-email-15.3.0
+        app.kubernetes.io/version: 15.3.1
+        helm.sh/chart: teleport-plugin-email-15.3.1
       name: RELEASE-NAME-teleport-plugin-email
 should match the snapshot (smtp on):
   1: |
@@ -59,8 +59,8 @@ should match the snapshot (smtp on):
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: teleport-plugin-email
-        app.kubernetes.io/version: 15.3.0
-        helm.sh/chart: teleport-plugin-email-15.3.0
+        app.kubernetes.io/version: 15.3.1
+        helm.sh/chart: teleport-plugin-email-15.3.1
       name: RELEASE-NAME-teleport-plugin-email
 should match the snapshot (smtp on, no starttls):
   1: |
@@ -92,8 +92,8 @@ should match the snapshot (smtp on, no starttls):
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: teleport-plugin-email
-        app.kubernetes.io/version: 15.3.0
-        helm.sh/chart: teleport-plugin-email-15.3.0
+        app.kubernetes.io/version: 15.3.1
+        helm.sh/chart: teleport-plugin-email-15.3.1
       name: RELEASE-NAME-teleport-plugin-email
 should match the snapshot (smtp on, password file):
   1: |
@@ -125,8 +125,8 @@ should match the snapshot (smtp on, password file):
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: teleport-plugin-email
-        app.kubernetes.io/version: 15.3.0
-        helm.sh/chart: teleport-plugin-email-15.3.0
+        app.kubernetes.io/version: 15.3.1
+        helm.sh/chart: teleport-plugin-email-15.3.1
       name: RELEASE-NAME-teleport-plugin-email
 should match the snapshot (smtp on, roleToRecipients set):
   1: |
@@ -161,8 +161,8 @@ should match the snapshot (smtp on, roleToRecipients set):
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: teleport-plugin-email
-        app.kubernetes.io/version: 15.3.0
-        helm.sh/chart: teleport-plugin-email-15.3.0
+        app.kubernetes.io/version: 15.3.1
+        helm.sh/chart: teleport-plugin-email-15.3.1
       name: RELEASE-NAME-teleport-plugin-email
 should match the snapshot (smtp on, starttls disabled):
   1: |
@@ -194,6 +194,6 @@ should match the snapshot (smtp on, starttls disabled):
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: teleport-plugin-email
-        app.kubernetes.io/version: 15.3.0
-        helm.sh/chart: teleport-plugin-email-15.3.0
+        app.kubernetes.io/version: 15.3.1
+        helm.sh/chart: teleport-plugin-email-15.3.1
       name: RELEASE-NAME-teleport-plugin-email