Merge branch 'master' into joerger/pr-buddy-963

gravitational · Nov 28, 2023 · 416bb57 · 416bb57
2 parents c1828d1 + d0e372b
commit 416bb57
Show file tree

Hide file tree

Showing 44 changed files with 2,227 additions and 259 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -24,7 +24,7 @@ steps:
       - make lint
 
   - name: Run tests
-    image: golang:1.21.3
+    image: golang:1.21.4
     environment:
       RUNNER_TEMP: /tmp
       TELEPORT_ENTERPRISE_LICENSE:
@@ -66,7 +66,7 @@ workspace:
 
 steps:
   - name: Build artifacts
-    image: golang:1.21.3
+    image: golang:1.21.4
     commands:
       - make build-all
 
@@ -97,7 +97,7 @@ workspace:
 
 steps:
   - name: Build artifacts
-    image: golang:1.21.3
+    image: golang:1.21.4
     commands:
       - mkdir -p build/
       - export PLUGIN_TYPE=$(echo ${DRONE_TAG} | cut -d- -f2)
@@ -311,7 +311,7 @@ workspace:
 
 steps:
   - name: Build artifacts
-    image: golang:1.21.3
+    image: golang:1.21.4
     commands:
       - mkdir -p build/
       - go install github.com/konoui/lipo@latest
@@ -384,7 +384,7 @@ workspace:
 
 steps:
   - name: Build artifacts
-    image: golang:1.21.3
+    image: golang:1.21.4
     commands:
       - mkdir -p build/
       - make OS=linux ARCH=amd64 release/event-handler
@@ -927,7 +927,7 @@ concurrency:
 
 steps:
   - name: Upload terraform provider to staging registry
-    image: golang:1.21.3
+    image: golang:1.21.4
     commands:
       - cd tooling
       - |
@@ -985,7 +985,7 @@ concurrency:
 
 steps:
   - name: Upload terraform provider to staging registry
-    image: golang:1.21.3
+    image: golang:1.21.4
     commands:
       - cd tooling
       - |
@@ -1043,7 +1043,7 @@ concurrency:
 
 steps:
   - name: Promote terraform provider to public registry
-    image: golang:1.21.3
+    image: golang:1.21.4
     commands:
       - cd tooling
       - |
@@ -1081,6 +1081,6 @@ steps:
         from_secret: PRODUCTION_TERRAFORM_REGISTRY_SIGNING_KEY
 ---
 kind: signature
-hmac: 63e4d9ad2fc74400265609424f058f2ccbd18c52d60c5e884ba07181c3cdd637
+hmac: 0c826745b4e302f17699d82532ddadb4005f75395648b99b74e989e0f01e7c33
 
 ...
diff --git a/access/discord/Makefile b/access/discord/Makefile
@@ -1,5 +1,5 @@
-VERSION=14.1.0
-GO_VERSION=1.21.3
+VERSION=14.2.0
+GO_VERSION=1.21.4
 
 BUILDDIR ?= build
 BINARY = $(BUILDDIR)/teleport-discord

diff --git a/access/email/Makefile b/access/email/Makefile
@@ -1,5 +1,5 @@
-VERSION=14.1.0
-GO_VERSION=1.21.3
+VERSION=14.2.0
+GO_VERSION=1.21.4
 
 BUILDDIR ?= build
 BINARY = $(BUILDDIR)/teleport-email

diff --git a/access/email/app.go b/access/email/app.go
@@ -20,9 +20,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/gravitational/teleport/api/client"
 	"github.com/gravitational/teleport/api/client/proto"
 	"github.com/gravitational/teleport/api/types"
+	"github.com/gravitational/teleport/integrations/access/common"
+	"github.com/gravitational/teleport/integrations/access/common/teleport"
 	"github.com/gravitational/teleport/integrations/lib"
 	"github.com/gravitational/teleport/integrations/lib/logger"
 	"github.com/gravitational/teleport/integrations/lib/watcherjob"
@@ -46,7 +47,7 @@ const (
 type App struct {
 	conf Config
 
-	apiClient *client.Client
+	apiClient teleport.Client
 	client    Client
 	mainJob   lib.ServiceJob
 
@@ -124,7 +125,7 @@ func (a *App) init(ctx context.Context) error {
 	defer cancel()
 
 	var err error
-	if a.apiClient, err = a.conf.Teleport.NewClient(ctx); err != nil {
+	if a.apiClient, err = common.GetTeleportClient(ctx, a.conf.Teleport); err != nil {
 		return trace.Wrap(err)
 	}
 

diff --git a/access/jira/Makefile b/access/jira/Makefile
@@ -1,5 +1,5 @@
-VERSION=14.1.0
-GO_VERSION=1.21.3
+VERSION=14.2.0
+GO_VERSION=1.21.4
 
 BUILDDIR ?= build
 BINARY = $(BUILDDIR)/teleport-jira

diff --git a/access/mattermost/Makefile b/access/mattermost/Makefile
@@ -1,5 +1,5 @@
-VERSION=14.1.0
-GO_VERSION=1.21.3
+VERSION=14.2.0
+GO_VERSION=1.21.4
 
 BUILDDIR ?= build
 BINARY = $(BUILDDIR)/teleport-mattermost

diff --git a/access/msteams/Makefile b/access/msteams/Makefile
@@ -1,5 +1,5 @@
-VERSION=14.1.0
-GO_VERSION=1.21.3
+VERSION=14.2.0
+GO_VERSION=1.21.4
 
 BUILDDIR ?= build
 BINARY = $(BUILDDIR)/teleport-msteams

diff --git a/access/msteams/app.go b/access/msteams/app.go
@@ -18,9 +18,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/gravitational/teleport/api/client"
 	"github.com/gravitational/teleport/api/client/proto"
 	"github.com/gravitational/teleport/api/types"
+	"github.com/gravitational/teleport/integrations/access/common"
+	"github.com/gravitational/teleport/integrations/access/common/teleport"
 	"github.com/gravitational/teleport/integrations/lib"
 	"github.com/gravitational/teleport/integrations/lib/logger"
 	pd "github.com/gravitational/teleport/integrations/lib/plugindata"
@@ -44,7 +45,7 @@ const (
 type App struct {
 	conf Config
 
-	apiClient  *client.Client
+	apiClient  teleport.Client
 	bot        *Bot
 	mainJob    lib.ServiceJob
 	watcherJob lib.ServiceJob
@@ -104,14 +105,14 @@ func (a *App) init(ctx context.Context) error {
 	ctx, cancel := context.WithTimeout(ctx, initTimeout)
 	defer cancel()
 
-	apiClient, err := a.conf.Teleport.NewClient(ctx)
+	var err error
+	a.apiClient, err = common.GetTeleportClient(ctx, a.conf.Teleport)
 	if err != nil {
 		return trace.Wrap(err)
 	}
 
-	a.apiClient = apiClient
 	a.pd = pd.NewCAS(
-		apiClient,
+		a.apiClient,
 		pluginName,
 		types.KindAccessRequest,
 		EncodePluginData,

diff --git a/access/pagerduty/Makefile b/access/pagerduty/Makefile
@@ -1,5 +1,5 @@
-VERSION=14.1.0
-GO_VERSION=1.21.3
+VERSION=14.2.0
+GO_VERSION=1.21.4
 
 BUILDDIR ?= build
 BINARY = $(BUILDDIR)/teleport-pagerduty

diff --git a/access/slack/Makefile b/access/slack/Makefile
@@ -1,5 +1,5 @@
-VERSION=14.1.0
-GO_VERSION=1.21.3
+VERSION=14.2.0
+GO_VERSION=1.21.4
 
 BUILDDIR ?= build
 BINARY = $(BUILDDIR)/teleport-slack

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: "14.1.0"
+version: "14.2.0"
 
 # 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: "14.1.0"
+version: "14.2.0"
 
 # 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: "14.1.0"
+appVersion: "14.2.0"
diff --git a/charts/access/discord/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/discord/tests/__snapshot__/configmap_test.yaml.snap
@@ -23,6 +23,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: 14.1.0
-        helm.sh/chart: teleport-plugin-discord-14.1.0
+        app.kubernetes.io/version: 14.2.0
+        helm.sh/chart: teleport-plugin-discord-14.2.0
       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: 14.1.0
-        helm.sh/chart: teleport-plugin-discord-14.1.0
+        app.kubernetes.io/version: 14.2.0
+        helm.sh/chart: teleport-plugin-discord-14.2.0
       name: RELEASE-NAME-teleport-plugin-discord
     spec:
       replicas: 1

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: "14.1.0"
+version: "14.2.0"
 
 # 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: "14.1.0"
+appVersion: "14.2.0"
diff --git a/charts/access/email/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/email/tests/__snapshot__/configmap_test.yaml.snap
@@ -25,8 +25,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: 14.1.0
-        helm.sh/chart: teleport-plugin-email-14.1.0
+        app.kubernetes.io/version: 14.2.0
+        helm.sh/chart: teleport-plugin-email-14.2.0
       name: RELEASE-NAME-teleport-plugin-email
 should match the snapshot (smtp on):
   1: |
@@ -57,8 +57,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: 14.1.0
-        helm.sh/chart: teleport-plugin-email-14.1.0
+        app.kubernetes.io/version: 14.2.0
+        helm.sh/chart: teleport-plugin-email-14.2.0
       name: RELEASE-NAME-teleport-plugin-email
 should match the snapshot (smtp on, no starttls):
   1: |
@@ -89,8 +89,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: 14.1.0
-        helm.sh/chart: teleport-plugin-email-14.1.0
+        app.kubernetes.io/version: 14.2.0
+        helm.sh/chart: teleport-plugin-email-14.2.0
       name: RELEASE-NAME-teleport-plugin-email
 should match the snapshot (smtp on, password file):
   1: |
@@ -121,8 +121,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: 14.1.0
-        helm.sh/chart: teleport-plugin-email-14.1.0
+        app.kubernetes.io/version: 14.2.0
+        helm.sh/chart: teleport-plugin-email-14.2.0
       name: RELEASE-NAME-teleport-plugin-email
 should match the snapshot (smtp on, roleToRecipients set):
   1: |
@@ -156,8 +156,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: 14.1.0
-        helm.sh/chart: teleport-plugin-email-14.1.0
+        app.kubernetes.io/version: 14.2.0
+        helm.sh/chart: teleport-plugin-email-14.2.0
       name: RELEASE-NAME-teleport-plugin-email
 should match the snapshot (smtp on, starttls disabled):
   1: |
@@ -188,6 +188,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: 14.1.0
-        helm.sh/chart: teleport-plugin-email-14.1.0
+        app.kubernetes.io/version: 14.2.0
+        helm.sh/chart: teleport-plugin-email-14.2.0
       name: RELEASE-NAME-teleport-plugin-email