From e91ebfd19447c7f7f6e55d614293a34b9af0be47 Mon Sep 17 00:00:00 2001 From: Trent Clarke Date: Thu, 28 Mar 2024 13:03:12 +1100 Subject: [PATCH 1/2] Release 15.1.10 --- access/discord/Makefile | 2 +- access/email/Makefile | 2 +- access/jira/Makefile | 2 +- access/mattermost/Makefile | 2 +- access/msteams/Makefile | 2 +- access/pagerduty/Makefile | 2 +- access/slack/Makefile | 2 +- charts/access/discord/Chart.yaml | 6 +- .../__snapshot__/configmap_test.yaml.snap | 4 +- .../__snapshot__/deployment_test.yaml.snap | 8 +-- charts/access/email/Chart.yaml | 4 +- .../__snapshot__/configmap_test.yaml.snap | 24 ++++---- .../__snapshot__/deployment_test.yaml.snap | 58 +++++++++---------- charts/access/jira/Chart.yaml | 4 +- .../__snapshot__/configmap_test.yaml.snap | 4 +- .../__snapshot__/deployment_test.yaml.snap | 8 +-- charts/access/mattermost/Chart.yaml | 4 +- .../__snapshot__/configmap_test.yaml.snap | 4 +- .../__snapshot__/deployment_test.yaml.snap | 28 ++++----- charts/access/msteams/Chart.yaml | 4 +- .../__snapshot__/configmap_test.yaml.snap | 4 +- .../__snapshot__/deployment_test.yaml.snap | 8 +-- charts/access/pagerduty/Chart.yaml | 4 +- .../__snapshot__/configmap_test.yaml.snap | 4 +- .../__snapshot__/deployment_test.yaml.snap | 8 +-- charts/access/slack/Chart.yaml | 4 +- .../__snapshot__/configmap_test.yaml.snap | 4 +- .../__snapshot__/deployment_test.yaml.snap | 8 +-- charts/event-handler/Chart.yaml | 4 +- .../__snapshot__/configmap_test.yaml.snap | 4 +- .../__snapshot__/deployment_test.yaml.snap | 4 +- event-handler/Makefile | 2 +- go.mod | 16 +++-- go.sum | 32 +++++----- terraform/install.mk | 2 +- 35 files changed, 138 insertions(+), 144 deletions(-) diff --git a/access/discord/Makefile b/access/discord/Makefile index 3b8f810d7..cf9978180 100644 --- a/access/discord/Makefile +++ b/access/discord/Makefile @@ -1,4 +1,4 @@ -VERSION?=15.1.9 +VERSION?=15.1.10 GO_VERSION=1.21.8 BUILDDIR ?= build diff --git a/access/email/Makefile b/access/email/Makefile index 5c6b95f2e..0e6869816 100644 --- a/access/email/Makefile +++ b/access/email/Makefile @@ -1,4 +1,4 @@ -VERSION?=15.1.9 +VERSION?=15.1.10 GO_VERSION=1.21.8 BUILDDIR ?= build diff --git a/access/jira/Makefile b/access/jira/Makefile index b888404c3..b1e66fc1f 100644 --- a/access/jira/Makefile +++ b/access/jira/Makefile @@ -1,4 +1,4 @@ -VERSION?=15.1.9 +VERSION?=15.1.10 GO_VERSION=1.21.8 BUILDDIR ?= build diff --git a/access/mattermost/Makefile b/access/mattermost/Makefile index 8f3abdad5..4f2c624b7 100644 --- a/access/mattermost/Makefile +++ b/access/mattermost/Makefile @@ -1,4 +1,4 @@ -VERSION?=15.1.9 +VERSION?=15.1.10 GO_VERSION=1.21.8 BUILDDIR ?= build diff --git a/access/msteams/Makefile b/access/msteams/Makefile index 73f1d76fb..ba68c4418 100644 --- a/access/msteams/Makefile +++ b/access/msteams/Makefile @@ -1,4 +1,4 @@ -VERSION?=15.1.9 +VERSION?=15.1.10 GO_VERSION=1.21.8 BUILDDIR ?= build diff --git a/access/pagerduty/Makefile b/access/pagerduty/Makefile index a149c6cdb..79c4a2507 100644 --- a/access/pagerduty/Makefile +++ b/access/pagerduty/Makefile @@ -1,4 +1,4 @@ -VERSION?=15.1.9 +VERSION?=15.1.10 GO_VERSION=1.21.8 BUILDDIR ?= build diff --git a/access/slack/Makefile b/access/slack/Makefile index ac406582b..ff7611140 100644 --- a/access/slack/Makefile +++ b/access/slack/Makefile @@ -1,4 +1,4 @@ -VERSION?=15.1.9 +VERSION?=15.1.10 GO_VERSION=1.21.8 BUILDDIR ?= build diff --git a/charts/access/discord/Chart.yaml b/charts/access/discord/Chart.yaml index 4068ec119..dcac69fed 100644 --- 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.1.9" +version: "15.1.10" # 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.1.9" +version: "15.1.10" # 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.1.9" +appVersion: "15.1.10" diff --git a/charts/access/discord/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/discord/tests/__snapshot__/configmap_test.yaml.snap index c3fc732f2..8e090c20c 100644 --- 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.1.9 - helm.sh/chart: teleport-plugin-discord-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-discord-15.1.10 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 index 82b260b82..e5e21b56b 100644 --- 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.1.9 - helm.sh/chart: teleport-plugin-discord-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-discord-15.1.10 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.1.9 - helm.sh/chart: teleport-plugin-discord-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-discord-15.1.10 spec: containers: - command: diff --git a/charts/access/email/Chart.yaml b/charts/access/email/Chart.yaml index 206395982..f6ab35856 100644 --- 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.1.9" +version: "15.1.10" # 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.1.9" +appVersion: "15.1.10" diff --git a/charts/access/email/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/email/tests/__snapshot__/configmap_test.yaml.snap index 1cc3da658..eea73cee5 100644 --- 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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 name: RELEASE-NAME-teleport-plugin-email diff --git a/charts/access/email/tests/__snapshot__/deployment_test.yaml.snap b/charts/access/email/tests/__snapshot__/deployment_test.yaml.snap index afb05ed67..4f21dc55e 100644 --- a/charts/access/email/tests/__snapshot__/deployment_test.yaml.snap +++ b/charts/access/email/tests/__snapshot__/deployment_test.yaml.snap @@ -7,8 +7,8 @@ should be possible to override volume name (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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 name: RELEASE-NAME-teleport-plugin-email spec: replicas: 1 @@ -22,8 +22,8 @@ should be possible to override volume name (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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 spec: containers: - command: @@ -34,7 +34,7 @@ should be possible to override volume name (smtp on): env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-email:15.1.9 + image: public.ecr.aws/gravitational/teleport-plugin-email:15.1.10 imagePullPolicy: IfNotPresent name: teleport-plugin-email ports: @@ -75,8 +75,8 @@ should match the snapshot: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: teleport-plugin-email - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 name: RELEASE-NAME-teleport-plugin-email spec: replicas: 1 @@ -90,8 +90,8 @@ should match the snapshot: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: teleport-plugin-email - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 spec: containers: - command: @@ -136,8 +136,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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 name: RELEASE-NAME-teleport-plugin-email spec: replicas: 1 @@ -151,8 +151,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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 spec: containers: - command: @@ -163,7 +163,7 @@ should match the snapshot (mailgun on): env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-email:15.1.9 + image: public.ecr.aws/gravitational/teleport-plugin-email:15.1.10 imagePullPolicy: IfNotPresent name: teleport-plugin-email ports: @@ -204,8 +204,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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 name: RELEASE-NAME-teleport-plugin-email spec: replicas: 1 @@ -219,8 +219,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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 spec: containers: - command: @@ -231,7 +231,7 @@ should match the snapshot (smtp on): env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-email:15.1.9 + image: public.ecr.aws/gravitational/teleport-plugin-email:15.1.10 imagePullPolicy: IfNotPresent name: teleport-plugin-email ports: @@ -272,8 +272,8 @@ should mount external secret (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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 name: RELEASE-NAME-teleport-plugin-email spec: replicas: 1 @@ -287,8 +287,8 @@ should mount external secret (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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 spec: containers: - command: @@ -299,7 +299,7 @@ should mount external secret (mailgun on): env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-email:15.1.9 + image: public.ecr.aws/gravitational/teleport-plugin-email:15.1.10 imagePullPolicy: IfNotPresent name: teleport-plugin-email ports: @@ -340,8 +340,8 @@ should mount external secret (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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 name: RELEASE-NAME-teleport-plugin-email spec: replicas: 1 @@ -355,8 +355,8 @@ should mount external secret (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.1.9 - helm.sh/chart: teleport-plugin-email-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-email-15.1.10 spec: containers: - command: @@ -367,7 +367,7 @@ should mount external secret (smtp on): env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-email:15.1.9 + image: public.ecr.aws/gravitational/teleport-plugin-email:15.1.10 imagePullPolicy: IfNotPresent name: teleport-plugin-email ports: diff --git a/charts/access/jira/Chart.yaml b/charts/access/jira/Chart.yaml index 698b06de8..41376a09e 100644 --- a/charts/access/jira/Chart.yaml +++ b/charts/access/jira/Chart.yaml @@ -15,10 +15,10 @@ 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.1.9" +version: "15.1.10" # 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.1.9" +appVersion: "15.1.10" diff --git a/charts/access/jira/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/jira/tests/__snapshot__/configmap_test.yaml.snap index 8cb790cf0..b8639f62a 100644 --- a/charts/access/jira/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/access/jira/tests/__snapshot__/configmap_test.yaml.snap @@ -32,6 +32,6 @@ should match the snapshot (smtp on): app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: teleport-plugin-jira - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-jira-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-jira-15.1.10 name: RELEASE-NAME-teleport-plugin-jira diff --git a/charts/access/jira/tests/__snapshot__/deployment_test.yaml.snap b/charts/access/jira/tests/__snapshot__/deployment_test.yaml.snap index cdce99366..cb45fcf67 100644 --- a/charts/access/jira/tests/__snapshot__/deployment_test.yaml.snap +++ b/charts/access/jira/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-jira - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-jira-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-jira-15.1.10 name: RELEASE-NAME-teleport-plugin-jira 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-jira - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-jira-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-jira-15.1.10 spec: containers: - command: diff --git a/charts/access/mattermost/Chart.yaml b/charts/access/mattermost/Chart.yaml index c4a99ebdd..3d1b1f022 100644 --- a/charts/access/mattermost/Chart.yaml +++ b/charts/access/mattermost/Chart.yaml @@ -15,10 +15,10 @@ 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.1.9" +version: "15.1.10" # 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.1.9" +appVersion: "15.1.10" diff --git a/charts/access/mattermost/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/mattermost/tests/__snapshot__/configmap_test.yaml.snap index d85bf3121..222942560 100644 --- a/charts/access/mattermost/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/access/mattermost/tests/__snapshot__/configmap_test.yaml.snap @@ -22,6 +22,6 @@ should match the snapshot: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: teleport-plugin-mattermost - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-mattermost-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-mattermost-15.1.10 name: RELEASE-NAME-teleport-plugin-mattermost diff --git a/charts/access/mattermost/tests/__snapshot__/deployment_test.yaml.snap b/charts/access/mattermost/tests/__snapshot__/deployment_test.yaml.snap index 38ac1ae22..5c9fa5fc1 100644 --- a/charts/access/mattermost/tests/__snapshot__/deployment_test.yaml.snap +++ b/charts/access/mattermost/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-mattermost - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-mattermost-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-mattermost-15.1.10 name: RELEASE-NAME-teleport-plugin-mattermost 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-mattermost - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-mattermost-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-mattermost-15.1.10 spec: containers: - command: @@ -75,8 +75,8 @@ should mount external secret: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: teleport-plugin-mattermost - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-mattermost-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-mattermost-15.1.10 name: RELEASE-NAME-teleport-plugin-mattermost spec: replicas: 1 @@ -90,8 +90,8 @@ should mount external secret: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: teleport-plugin-mattermost - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-mattermost-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-mattermost-15.1.10 spec: containers: - command: @@ -102,7 +102,7 @@ should mount external secret: env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-mattermost:15.1.9 + image: public.ecr.aws/gravitational/teleport-plugin-mattermost:15.1.10 imagePullPolicy: IfNotPresent name: teleport-plugin-mattermost ports: @@ -143,8 +143,8 @@ should override volume name: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: teleport-plugin-mattermost - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-mattermost-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-mattermost-15.1.10 name: RELEASE-NAME-teleport-plugin-mattermost spec: replicas: 1 @@ -158,8 +158,8 @@ should override volume name: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: teleport-plugin-mattermost - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-mattermost-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-mattermost-15.1.10 spec: containers: - command: @@ -170,7 +170,7 @@ should override volume name: env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-mattermost:15.1.9 + image: public.ecr.aws/gravitational/teleport-plugin-mattermost:15.1.10 imagePullPolicy: IfNotPresent name: teleport-plugin-mattermost ports: diff --git a/charts/access/msteams/Chart.yaml b/charts/access/msteams/Chart.yaml index 2c103a679..61d0898f1 100644 --- a/charts/access/msteams/Chart.yaml +++ b/charts/access/msteams/Chart.yaml @@ -15,10 +15,10 @@ 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.1.9" +version: "15.1.10" # 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.1.9" +appVersion: "15.1.10" diff --git a/charts/access/msteams/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/msteams/tests/__snapshot__/configmap_test.yaml.snap index 834706f70..ca0103a3d 100644 --- a/charts/access/msteams/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/access/msteams/tests/__snapshot__/configmap_test.yaml.snap @@ -29,6 +29,6 @@ should match the snapshot: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: teleport-plugin-msteams - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-msteams-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-msteams-15.1.10 name: RELEASE-NAME-teleport-plugin-msteams diff --git a/charts/access/msteams/tests/__snapshot__/deployment_test.yaml.snap b/charts/access/msteams/tests/__snapshot__/deployment_test.yaml.snap index b464317ec..0582b63e5 100644 --- a/charts/access/msteams/tests/__snapshot__/deployment_test.yaml.snap +++ b/charts/access/msteams/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-msteams - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-msteams-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-msteams-15.1.10 name: RELEASE-NAME-teleport-plugin-msteams 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-msteams - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-msteams-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-msteams-15.1.10 spec: containers: - command: diff --git a/charts/access/pagerduty/Chart.yaml b/charts/access/pagerduty/Chart.yaml index 7124fe4cf..d5724edf9 100644 --- a/charts/access/pagerduty/Chart.yaml +++ b/charts/access/pagerduty/Chart.yaml @@ -15,10 +15,10 @@ 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.1.9" +version: "15.1.10" # 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.1.9" +appVersion: "15.1.10" diff --git a/charts/access/pagerduty/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/pagerduty/tests/__snapshot__/configmap_test.yaml.snap index 44357e7c0..f85b1b0ef 100644 --- a/charts/access/pagerduty/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/access/pagerduty/tests/__snapshot__/configmap_test.yaml.snap @@ -21,6 +21,6 @@ should match the snapshot (smtp on): app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: teleport-plugin-pagerduty - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-pagerduty-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-pagerduty-15.1.10 name: RELEASE-NAME-teleport-plugin-pagerduty diff --git a/charts/access/pagerduty/tests/__snapshot__/deployment_test.yaml.snap b/charts/access/pagerduty/tests/__snapshot__/deployment_test.yaml.snap index 148fd20b4..a8bf09783 100644 --- a/charts/access/pagerduty/tests/__snapshot__/deployment_test.yaml.snap +++ b/charts/access/pagerduty/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-pagerduty - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-pagerduty-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-pagerduty-15.1.10 name: RELEASE-NAME-teleport-plugin-pagerduty 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-pagerduty - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-pagerduty-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-pagerduty-15.1.10 spec: containers: - command: diff --git a/charts/access/slack/Chart.yaml b/charts/access/slack/Chart.yaml index f46a537eb..c315304c3 100644 --- a/charts/access/slack/Chart.yaml +++ b/charts/access/slack/Chart.yaml @@ -15,10 +15,10 @@ 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.1.9" +version: "15.1.10" # 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.1.9" +appVersion: "15.1.10" diff --git a/charts/access/slack/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/slack/tests/__snapshot__/configmap_test.yaml.snap index d64b86f3a..e998e5fa3 100644 --- a/charts/access/slack/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/access/slack/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-slack - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-slack-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-slack-15.1.10 name: RELEASE-NAME-teleport-plugin-slack diff --git a/charts/access/slack/tests/__snapshot__/deployment_test.yaml.snap b/charts/access/slack/tests/__snapshot__/deployment_test.yaml.snap index 77fa89167..8e4a66665 100644 --- a/charts/access/slack/tests/__snapshot__/deployment_test.yaml.snap +++ b/charts/access/slack/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-slack - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-slack-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-slack-15.1.10 name: RELEASE-NAME-teleport-plugin-slack 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-slack - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-slack-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-slack-15.1.10 spec: containers: - command: diff --git a/charts/event-handler/Chart.yaml b/charts/event-handler/Chart.yaml index 051cfbfe7..36eac8844 100644 --- a/charts/event-handler/Chart.yaml +++ b/charts/event-handler/Chart.yaml @@ -15,10 +15,10 @@ 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.1.9" +version: "15.1.10" # 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.1.9" +appVersion: "15.1.10" diff --git a/charts/event-handler/tests/__snapshot__/configmap_test.yaml.snap b/charts/event-handler/tests/__snapshot__/configmap_test.yaml.snap index 4f552fd99..1ebdc4524 100644 --- a/charts/event-handler/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/event-handler/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-event-handler - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-event-handler-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-event-handler-15.1.10 name: RELEASE-NAME-teleport-plugin-event-handler diff --git a/charts/event-handler/tests/__snapshot__/deployment_test.yaml.snap b/charts/event-handler/tests/__snapshot__/deployment_test.yaml.snap index 641da00db..ad7e74a38 100644 --- a/charts/event-handler/tests/__snapshot__/deployment_test.yaml.snap +++ b/charts/event-handler/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-event-handler - app.kubernetes.io/version: 15.1.9 - helm.sh/chart: teleport-plugin-event-handler-15.1.9 + app.kubernetes.io/version: 15.1.10 + helm.sh/chart: teleport-plugin-event-handler-15.1.10 name: RELEASE-NAME-teleport-plugin-event-handler spec: replicas: 1 diff --git a/event-handler/Makefile b/event-handler/Makefile index 0be08e493..3d94e79aa 100644 --- a/event-handler/Makefile +++ b/event-handler/Makefile @@ -1,4 +1,4 @@ -VERSION?=15.1.9 +VERSION?=15.1.10 GO_VERSION=1.21.8 GITTAG=v$(VERSION) diff --git a/go.mod b/go.mod index 94651d6e6..6e47221b6 100644 --- a/go.mod +++ b/go.mod @@ -128,13 +128,12 @@ require ( github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 // indirect github.com/distribution/reference v0.5.0 // indirect github.com/dlclark/regexp2 v1.9.0 // indirect - github.com/docker/cli v24.0.7+incompatible // indirect + github.com/docker/cli v25.0.1+incompatible // indirect github.com/docker/distribution v2.8.3+incompatible // indirect - github.com/docker/docker v24.0.9+incompatible // indirect + github.com/docker/docker v25.0.5+incompatible // indirect github.com/docker/docker-credential-helpers v0.8.0 // indirect - github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-metrics v0.0.1 // indirect - github.com/docker/go-units v0.5.0 // indirect github.com/elimity-com/scim v0.0.0-20230426070224-941a5eac92f3 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/emirpasic/gods v1.18.1 // indirect @@ -257,13 +256,12 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect - github.com/morikuni/aec v1.0.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/oklog/run v1.0.0 // indirect github.com/okta/okta-sdk-golang/v2 v2.20.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.1.0-rc5 // indirect + github.com/opencontainers/image-spec v1.1.0-rc6 // indirect github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect @@ -353,7 +351,7 @@ require ( k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/kubectl v0.29.0 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect - oras.land/oras-go v1.2.4 // indirect + oras.land/oras-go v1.2.5 // indirect sigs.k8s.io/controller-runtime v0.16.1 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect @@ -366,8 +364,8 @@ replace ( github.com/alecthomas/kingpin/v2 => github.com/gravitational/kingpin/v2 v2.1.11-0.20230515143221-4ec6b70ecd33 github.com/coreos/go-oidc => github.com/gravitational/go-oidc v0.1.1 github.com/gogo/protobuf => github.com/gravitational/protobuf v1.3.2-0.20201123192827-2b9fcfaffcbf - github.com/gravitational/teleport => github.com/gravitational/teleport v0.0.0-20240319191213-2ba061355e99 // ref: tags/v15.1.9 - github.com/gravitational/teleport/api => github.com/gravitational/teleport/api v0.0.0-20240319191213-2ba061355e99 // ref: tags/v15.1.9 + github.com/gravitational/teleport => github.com/gravitational/teleport v0.0.0-20240327020503-fc3b2b31dec6 // ref: tags/v15.1.10 + github.com/gravitational/teleport/api => github.com/gravitational/teleport/api v0.0.0-20240327020503-fc3b2b31dec6 // ref: tags/v15.1.10 github.com/julienschmidt/httprouter => github.com/gravitational/httprouter v1.3.1-0.20220408074523-c876c5e705a5 github.com/microsoft/go-mssqldb => github.com/gravitational/go-mssqldb v0.11.1-0.20230331180905-0f76f1751cd3 github.com/vulcand/predicate => github.com/gravitational/predicate v1.3.1 diff --git a/go.sum b/go.sum index c9a8a181c..46ed9aa64 100644 --- a/go.sum +++ b/go.sum @@ -327,22 +327,20 @@ github.com/dlclark/regexp2 v1.9.0 h1:pTK/l/3qYIKaRXuHnEnIf7Y5NxfRPfpb7dis6/gdlVI github.com/dlclark/regexp2 v1.9.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg= -github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v25.0.1+incompatible h1:mFpqnrS6Hsm3v1k7Wa/BO23oz0k121MTbTO1lpcGSkU= +github.com/docker/cli v25.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0= -github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v25.0.5+incompatible h1:UmQydMduGkrD5nQde1mecF/YnSbTOaPeFIeP5C4W+DE= +github.com/docker/docker v25.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8= github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40= -github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= -github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= -github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4= github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/elimity-com/scim v0.0.0-20230426070224-941a5eac92f3 h1:+zrUtdBUJpY9qptMaaY3CA3T/lBI2+QqfUbzM2uxJss= @@ -611,10 +609,10 @@ github.com/gravitational/protobuf v1.3.2-0.20201123192827-2b9fcfaffcbf h1:MQ4e8X github.com/gravitational/protobuf v1.3.2-0.20201123192827-2b9fcfaffcbf/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gravitational/roundtrip v1.0.2 h1:eOCY0NEKKaB0ksJmvhO6lPMFz1pIIef+vyPBTBROQ5c= github.com/gravitational/roundtrip v1.0.2/go.mod h1:fuI1booM2hLRA/B/m5MRAPOU6mBZNYcNycono2UuTw0= -github.com/gravitational/teleport v0.0.0-20240319191213-2ba061355e99 h1:wUzxCZK8AT35XF0Hfq1pJugqYCHeabGf98JiSYeYDPs= -github.com/gravitational/teleport v0.0.0-20240319191213-2ba061355e99/go.mod h1:RYyynjBFD57jMhr42/XQmXMfqV0jHNyoWkf4+ALmnf8= -github.com/gravitational/teleport/api v0.0.0-20240319191213-2ba061355e99 h1:Ek/803oCmgr/qRQBznTRDDNlKtQhFJ2g0CSVNvwTKfI= -github.com/gravitational/teleport/api v0.0.0-20240319191213-2ba061355e99/go.mod h1:TbJnZvy5Q8Ye692yRVQzW5KfnkFRlh3qMd922HAtQ8Q= +github.com/gravitational/teleport v0.0.0-20240327020503-fc3b2b31dec6 h1:3nHYZlcljAYrvQVbBYTjtltJQDn7y3cF2/khrw2XM9I= +github.com/gravitational/teleport v0.0.0-20240327020503-fc3b2b31dec6/go.mod h1:jzLyYVmL2JU/8fJUJmhyzqYeCQgmz6Ypq8mP2BgC4fU= +github.com/gravitational/teleport/api v0.0.0-20240327020503-fc3b2b31dec6 h1:p3oWqebbUx0nx+tEzfswKqkIbH3XVL5dFUJhdmRgIoo= +github.com/gravitational/teleport/api v0.0.0-20240327020503-fc3b2b31dec6/go.mod h1:TbJnZvy5Q8Ye692yRVQzW5KfnkFRlh3qMd922HAtQ8Q= github.com/gravitational/trace v1.3.1 h1:jwZEuRtCYpLhUtqHo+JH+lu2qM0LB98UagqHtvdKuLI= github.com/gravitational/trace v1.3.1/go.mod h1:E61mn73aro7Zg9gZheZaeUsK6gjUMbCLazY76xuYAVA= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= @@ -957,8 +955,6 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY/JU= github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= -github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= github.com/mreiferson/go-httpclient v0.0.0-20201222173833-5e475fde3a4d/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= @@ -982,8 +978,8 @@ github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8P github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= -github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= +github.com/opencontainers/image-spec v1.1.0-rc6 h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU= +github.com/opencontainers/image-spec v1.1.0-rc6/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627 h1:pSCLCl6joCFRnjpeojzOpEYs4q7Vditq8fySFG5ap3Y= github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= @@ -1720,8 +1716,8 @@ k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSn k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= launchpad.net/gocheck v0.0.0-20140225173054-000000000087 h1:Izowp2XBH6Ya6rv+hqbceQyw/gSGoXfH/UPoTGduL54= launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM= -oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY= -oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324= +oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo= +oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/terraform/install.mk b/terraform/install.mk index caa7306c1..9fec620ce 100644 --- a/terraform/install.mk +++ b/terraform/install.mk @@ -1,4 +1,4 @@ -VERSION?=15.1.9 +VERSION?=15.1.10 OS ?= $(shell go env GOOS) ARCH ?= $(shell go env GOARCH) From 5ac1a2c7b5833416f250a3b5e233dcec7bde12a7 Mon Sep 17 00:00:00 2001 From: Trent Clarke Date: Thu, 28 Mar 2024 14:30:48 +1100 Subject: [PATCH 2/2] Update Terraform to match Teleport 15.1.10 --- terraform/reference.mdx | 133 +++++++++--------- .../accesslist/v1/accesslist_terraform.go | 92 +----------- terraform/tfschema/types_terraform.go | 71 ++++++++-- 3 files changed, 125 insertions(+), 171 deletions(-) diff --git a/terraform/reference.mdx b/terraform/reference.mdx index a2cac9775..5509823ee 100755 --- a/terraform/reference.mdx +++ b/terraform/reference.mdx @@ -159,18 +159,16 @@ metadata is resource metadata. spec is the specification for the access list. -| Name | Type | Required | Description | -|---------------------|--------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| audit | object | * | audit describes the frequency that this access list must be audited. | -| description | string | | description is an optional plaintext description of the access list. | -| grants | object | * | grants describes the access granted by membership to this access list. | -| membership | string | | membership defines how list membership is applied. There are two possible values: `explicit` (default): To be considered ag member of the access list, a user must both meet the `membership_requires` conditions AND be explicitly added to the list. `implicit`: Any user meeting the `membership_requires` conditions will automatically be considered a member of this list. | -| membership_requires | object | | membership_requires describes the requirements for a user to be a member of the access list. For a membership to an access list to be effective, the user must meet the requirements of Membership_requires and must be in the members list. | -| owner_grants | object | | owner_grants describes the access granted by owners to this access list. | -| owners | object | * | owners is a list of owners of the access list. | -| ownership | string | | ownership defines how list ownership of this list is determined. There are two possible values: `explicit` (default): To be considered an owner of the access list, a user must both meet the `ownership_requires` conditions AND be explicitly added to the list. `implicit`: Any user meeting the `ownership_requires` conditions will automatically be considered an owner of this list. | -| ownership_requires | object | | ownership_requires describes the requirements for a user to be an owner of the access list. For ownership of an access list to be effective, the user must meet the requirements of ownership_requires and must be in the owners list. | -| title | string | | title is a plaintext short description of the access list. | +| Name | Type | Required | Description | +|---------------------|--------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| audit | object | * | audit describes the frequency that this access list must be audited. | +| description | string | | description is an optional plaintext description of the access list. | +| grants | object | * | grants describes the access granted by membership to this access list. | +| membership_requires | object | | membership_requires describes the requirements for a user to be a member of the access list. For a membership to an access list to be effective, the user must meet the requirements of Membership_requires and must be in the members list. | +| owner_grants | object | | owner_grants describes the access granted by owners to this access list. | +| owners | object | * | owners is a list of owners of the access list. | +| ownership_requires | object | | ownership_requires describes the requirements for a user to be an owner of the access list. For ownership of an access list to be effective, the user must meet the requirements of ownership_requires and must be in the owners list. | +| title | string | | title is a plaintext short description of the access list. | #### spec.audit @@ -194,10 +192,10 @@ notifications is the configuration for notifying users. recurrence is the recurrence definition -| Name | Type | Required | Description | -|--------------|--------|----------|---------------------------------------------------------------------| -| day_of_month | number | | day_of_month is the day of month that reviews will be scheduled on. | -| frequency | number | * | frequency is the frequency of reviews. | +| Name | Type | Required | Description | +|--------------|--------|----------|-------------------------------------------------------------------------------------------------------------------------------------------| +| day_of_month | number | | day_of_month is the day of month that reviews will be scheduled on. Supported values are 0, 1, 15, and 31. | +| frequency | number | * | frequency is the frequency of reviews. This represents the period in months between two reviews. Supported values are 0, 1, 3, 6, and 12. | #### spec.grants @@ -351,16 +349,17 @@ Metadata is the app resource metadata. Spec is the app resource spec. -| Name | Type | Required | Description | -|----------------------|------------------|----------|---------------------------------------------------------------------------| -| aws | object | | AWS contains additional options for AWS applications. | -| cloud | string | | Cloud identifies the cloud instance the app represents. | -| dynamic_labels | object | | DynamicLabels are the app's command labels. | -| insecure_skip_verify | bool | | InsecureSkipVerify disables app's TLS certificate verification. | -| public_addr | string | | PublicAddr is the public address the application is accessible at. | -| rewrite | object | | Rewrite is a list of rewriting rules to apply to requests and responses. | -| uri | string | | URI is the web app endpoint. | -| user_groups | array of strings | | UserGroups are a list of user group IDs that this app is associated with. | +| Name | Type | Required | Description | +|----------------------|------------------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| aws | object | | AWS contains additional options for AWS applications. | +| cloud | string | | Cloud identifies the cloud instance the app represents. | +| dynamic_labels | object | | DynamicLabels are the app's command labels. | +| insecure_skip_verify | bool | | InsecureSkipVerify disables app's TLS certificate verification. | +| integration | string | | Integration is the integration name that must be used to access this Application. Only applicable to AWS App Access. If present, the Application must use the Integration's credentials instead of ambient credentials to access Cloud APIs. | +| public_addr | string | | PublicAddr is the public address the application is accessible at. | +| rewrite | object | | Rewrite is a list of rewriting rules to apply to requests and responses. | +| uri | string | | URI is the web app endpoint. | +| user_groups | array of strings | | UserGroups are a list of user group IDs that this app is associated with. | #### spec.aws @@ -703,9 +702,9 @@ Spec is a ClusterNetworkingConfig specification | idle_timeout_message | string | | ClientIdleTimeoutMessage is the message sent to the user when a connection times out. | | keep_alive_count_max | number | | KeepAliveCountMax is the number of keep-alive messages that can be missed before the server disconnects the connection to the client. | | keep_alive_interval | duration | | KeepAliveInterval is the interval at which the server sends keep-alive messages to the client. | -| proxy_listener_mode | number | | ProxyListenerMode is proxy listener mode used by Teleport Proxies. | +| proxy_listener_mode | number | | ProxyListenerMode is proxy listener mode used by Teleport Proxies. 0 is "separate"; 1 is "multiplex". | | proxy_ping_interval | duration | | ProxyPingInterval defines in which interval the TLS routing ping message should be sent. This is applicable only when using ping-wrapped connections, regular TLS routing connections are not affected. | -| routing_strategy | number | | RoutingStrategy determines the strategy used to route to nodes. | +| routing_strategy | number | | RoutingStrategy determines the strategy used to route to nodes. 0 is "unambiguous_match"; 1 is "most_recent". | | session_control_timeout | duration | | SessionControlTimeout is the session control lease expiry and defines the upper limit of how long a node may be out of contact with the auth server before it begins terminating controlled sessions. | | tunnel_strategy | object | | TunnelStrategyV1 determines the tunnel strategy used in the cluster. | | web_idle_timeout | duration | | WebIdleTimeout sets global cluster default setting for the web UI idle timeouts. | @@ -991,7 +990,7 @@ TLS is the TLS configuration used when establishing connection to target databas | Name | Type | Required | Description | |-------------|--------|----------|------------------------------------------------------------------------------------------------------------------------------------| | ca_cert | string | | CACert is an optional user provided CA certificate used for verifying database TLS connection. | -| mode | number | | Mode is a TLS connection mode. See DatabaseTLSMode for details. | +| mode | number | | Mode is a TLS connection mode. 0 is "verify-full"; 1 is "verify-ca", 2 is "insecure". | | server_name | string | | ServerName allows to provide custom hostname. This value will override the servername/hostname on a certificate during validation. | Example: @@ -2009,47 +2008,47 @@ SPIFFE is used to allow or deny access to a role holder to generating a SPIFFE S Options is for OpenSSH options like agent forwarding. -| Name | Type | Required | Description | -|----------------------------|------------------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| cert_extensions | object | | CertExtensions specifies the key/values | -| cert_format | string | | CertificateFormat defines the format of the user certificate to allow compatibility with older versions of OpenSSH. | -| client_idle_timeout | duration | | ClientIdleTimeout sets disconnect clients on idle timeout behavior, if set to 0 means do not disconnect, otherwise is set to the idle duration. | -| create_db_user | bool | | | -| create_db_user_mode | number | | CreateDatabaseUserMode allows users to be automatically created on a database when not set to off. | -| create_desktop_user | bool | | | -| create_host_user | bool | | | -| create_host_user_mode | number | | CreateHostUserMode allows users to be automatically created on a host when not set to off | -| desktop_clipboard | bool | | | -| desktop_directory_sharing | bool | | | -| device_trust_mode | string | | DeviceTrustMode is the device authorization mode used for the resources associated with the role. See DeviceTrust.Mode. Reserved for future use, not yet used by Teleport. | -| disconnect_expired_cert | bool | | DisconnectExpiredCert sets disconnect clients on expired certificates. | -| enhanced_recording | array of strings | | BPF defines what events to record for the BPF-based session recorder. | -| forward_agent | bool | | ForwardAgent is SSH agent forwarding. | -| idp | object | | IDP is a set of options related to accessing IdPs within Teleport. Requires Teleport Enterprise. | -| lock | string | | Lock specifies the locking mode (strict|best_effort) to be applied with the role. | -| max_connections | number | | MaxConnections defines the maximum number of concurrent connections a user may hold. | -| max_kubernetes_connections | number | | MaxKubernetesConnections defines the maximum number of concurrent Kubernetes sessions a user may hold. | -| max_session_ttl | duration | | MaxSessionTTL defines how long a SSH session can last for. | -| max_sessions | number | | MaxSessions defines the maximum number of concurrent sessions per connection. | -| permit_x11_forwarding | bool | | PermitX11Forwarding authorizes use of X11 forwarding. | -| pin_source_ip | bool | | PinSourceIP forces the same client IP for certificate generation and usage | -| port_forwarding | bool | | | -| record_session | object | | RecordDesktopSession indicates whether desktop access sessions should be recorded. It defaults to true unless explicitly set to false. | -| request_access | string | | RequestAccess defines the access request strategy (optional|note|always) where optional is the default. | -| request_prompt | string | | RequestPrompt is an optional message which tells users what they aught to request. | -| require_session_mfa | number | | RequireMFAType is the type of MFA requirement enforced for this role: 0:Off, 1:Session, 2:SessionAndHardwareKey, 3:HardwareKeyTouch | -| ssh_file_copy | bool | | | +| Name | Type | Required | Description | +|----------------------------|------------------|----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| cert_extensions | object | | CertExtensions specifies the key/values | +| cert_format | string | | CertificateFormat defines the format of the user certificate to allow compatibility with older versions of OpenSSH. | +| client_idle_timeout | duration | | ClientIdleTimeout sets disconnect clients on idle timeout behavior, if set to 0 means do not disconnect, otherwise is set to the idle duration. | +| create_db_user | bool | | | +| create_db_user_mode | number | | CreateDatabaseUserMode allows users to be automatically created on a database when not set to off. 0 is "unspecified", 1 is "off", 2 is "keep", 3 is "best_effort_drop". | +| create_desktop_user | bool | | | +| create_host_user | bool | | | +| create_host_user_mode | number | | CreateHostUserMode allows users to be automatically created on a host when not set to off. 0 is "unspecified"; 1 is "off"; 2 is "drop" (removed for v15 and above), 3 is "keep"; 4 is "insecure-drop". | +| desktop_clipboard | bool | | | +| desktop_directory_sharing | bool | | | +| device_trust_mode | string | | DeviceTrustMode is the device authorization mode used for the resources associated with the role. See DeviceTrust.Mode. Reserved for future use, not yet used by Teleport. | +| disconnect_expired_cert | bool | | DisconnectExpiredCert sets disconnect clients on expired certificates. | +| enhanced_recording | array of strings | | BPF defines what events to record for the BPF-based session recorder. | +| forward_agent | bool | | ForwardAgent is SSH agent forwarding. | +| idp | object | | IDP is a set of options related to accessing IdPs within Teleport. Requires Teleport Enterprise. | +| lock | string | | Lock specifies the locking mode (strict|best_effort) to be applied with the role. | +| max_connections | number | | MaxConnections defines the maximum number of concurrent connections a user may hold. | +| max_kubernetes_connections | number | | MaxKubernetesConnections defines the maximum number of concurrent Kubernetes sessions a user may hold. | +| max_session_ttl | duration | | MaxSessionTTL defines how long a SSH session can last for. | +| max_sessions | number | | MaxSessions defines the maximum number of concurrent sessions per connection. | +| permit_x11_forwarding | bool | | PermitX11Forwarding authorizes use of X11 forwarding. | +| pin_source_ip | bool | | PinSourceIP forces the same client IP for certificate generation and usage | +| port_forwarding | bool | | | +| record_session | object | | RecordDesktopSession indicates whether desktop access sessions should be recorded. It defaults to true unless explicitly set to false. | +| request_access | string | | RequestAccess defines the access request strategy (optional|note|always) where optional is the default. | +| request_prompt | string | | RequestPrompt is an optional message which tells users what they aught to request. | +| require_session_mfa | number | | RequireMFAType is the type of MFA requirement enforced for this role: 0:Off, 1:Session, 2:SessionAndHardwareKey, 3:HardwareKeyTouch | +| ssh_file_copy | bool | | | ##### spec.options.cert_extensions CertExtensions specifies the key/values -| Name | Type | Required | Description | -|-------|--------|----------|------------------------------------------------------------------------------------------| -| mode | number | | Mode is the type of extension to be used -- currently critical-option is not supported | -| name | string | | Name specifies the key to be used in the cert extension. | -| type | number | | Type represents the certificate type being extended, only ssh is supported at this time. | -| value | string | | Value specifies the value to be used in the cert extension. | +| Name | Type | Required | Description | +|-------|--------|----------|-----------------------------------------------------------------------------------------------------------| +| mode | number | | Mode is the type of extension to be used -- currently critical-option is not supported. 0 is "extension". | +| name | string | | Name specifies the key to be used in the cert extension. | +| type | number | | Type represents the certificate type being extended, only ssh is supported at this time. 0 is "ssh". | +| value | string | | Value specifies the value to be used in the cert extension. | ##### spec.options.idp @@ -2358,12 +2357,12 @@ resource "teleport_server" "ssh_agentless_eice" { version = "v2" sub_kind = "openssh-ec2-ice" metadata = { - // It is recommended to put the instance ID as a name for EC2 Instance Connect + // It is recommended to put the account and instance ID as a name for EC2 Instance Connect // When dialing to this instance, teleport will detect that this is an // AWS instance ID an will contact this specific instance. This is more // robust than host-based and IP-based dialing (because several server // can have similar hostnames). - name = "i-0123456789abcdef" + name = "123456789012-i-0123456789abcdef" } spec = { addr = "127.0.0.1:22" diff --git a/terraform/tfschema/accesslist/v1/accesslist_terraform.go b/terraform/tfschema/accesslist/v1/accesslist_terraform.go index 2d9b0848f..8683faf23 100644 --- a/terraform/tfschema/accesslist/v1/accesslist_terraform.go +++ b/terraform/tfschema/accesslist/v1/accesslist_terraform.go @@ -122,12 +122,12 @@ func GenSchemaAccessList(ctx context.Context) (github_com_hashicorp_terraform_pl "recurrence": { Attributes: github_com_hashicorp_terraform_plugin_framework_tfsdk.SingleNestedAttributes(map[string]github_com_hashicorp_terraform_plugin_framework_tfsdk.Attribute{ "day_of_month": { - Description: "day_of_month is the day of month that reviews will be scheduled on.", + Description: "day_of_month is the day of month that reviews will be scheduled on. Supported values are 0, 1, 15, and 31.", Optional: true, Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, }, "frequency": { - Description: "frequency is the frequency of reviews.", + Description: "frequency is the frequency of reviews. This represents the period in months between two reviews. Supported values are 0, 1, 3, 6, and 12.", Required: true, Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, }, @@ -171,11 +171,6 @@ func GenSchemaAccessList(ctx context.Context) (github_com_hashicorp_terraform_pl Description: "grants describes the access granted by membership to this access list.", Required: true, }, - "membership": { - Description: "membership defines how list membership is applied. There are two possible values: `explicit` (default): To be considered ag member of the access list, a user must both meet the `membership_requires` conditions AND be explicitly added to the list. `implicit`: Any user meeting the `membership_requires` conditions will automatically be considered a member of this list.", - Optional: true, - Type: github_com_hashicorp_terraform_plugin_framework_types.StringType, - }, "membership_requires": { Attributes: github_com_hashicorp_terraform_plugin_framework_tfsdk.SingleNestedAttributes(map[string]github_com_hashicorp_terraform_plugin_framework_tfsdk.Attribute{ "roles": { @@ -246,11 +241,6 @@ func GenSchemaAccessList(ctx context.Context) (github_com_hashicorp_terraform_pl Description: "owners is a list of owners of the access list.", Required: true, }, - "ownership": { - Description: "ownership defines how list ownership of this list is determined. There are two possible values: `explicit` (default): To be considered an owner of the access list, a user must both meet the `ownership_requires` conditions AND be explicitly added to the list. `implicit`: Any user meeting the `ownership_requires` conditions will automatically be considered an owner of this list.", - Optional: true, - Type: github_com_hashicorp_terraform_plugin_framework_types.StringType, - }, "ownership_requires": { Attributes: github_com_hashicorp_terraform_plugin_framework_tfsdk.SingleNestedAttributes(map[string]github_com_hashicorp_terraform_plugin_framework_tfsdk.Attribute{ "roles": { @@ -1049,40 +1039,6 @@ func CopyAccessListFromTerraform(_ context.Context, tf github_com_hashicorp_terr } } } - { - a, ok := tf.Attrs["membership"] - if !ok { - diags.Append(attrReadMissingDiag{"AccessList.spec.membership"}) - } else { - v, ok := a.(github_com_hashicorp_terraform_plugin_framework_types.String) - if !ok { - diags.Append(attrReadConversionFailureDiag{"AccessList.spec.membership", "github.com/hashicorp/terraform-plugin-framework/types.String"}) - } else { - var t string - if !v.Null && !v.Unknown { - t = string(v.Value) - } - obj.Membership = t - } - } - } - { - a, ok := tf.Attrs["ownership"] - if !ok { - diags.Append(attrReadMissingDiag{"AccessList.spec.ownership"}) - } else { - v, ok := a.(github_com_hashicorp_terraform_plugin_framework_types.String) - if !ok { - diags.Append(attrReadConversionFailureDiag{"AccessList.spec.ownership", "github.com/hashicorp/terraform-plugin-framework/types.String"}) - } else { - var t string - if !v.Null && !v.Unknown { - t = string(v.Value) - } - obj.Ownership = t - } - } - } { a, ok := tf.Attrs["owner_grants"] if !ok { @@ -2477,50 +2433,6 @@ func CopyAccessListToTerraform(ctx context.Context, obj *github_com_gravitationa tf.Attrs["title"] = v } } - { - t, ok := tf.AttrTypes["membership"] - if !ok { - diags.Append(attrWriteMissingDiag{"AccessList.spec.membership"}) - } else { - v, ok := tf.Attrs["membership"].(github_com_hashicorp_terraform_plugin_framework_types.String) - if !ok { - i, err := t.ValueFromTerraform(ctx, github_com_hashicorp_terraform_plugin_go_tftypes.NewValue(t.TerraformType(ctx), nil)) - if err != nil { - diags.Append(attrWriteGeneralError{"AccessList.spec.membership", err}) - } - v, ok = i.(github_com_hashicorp_terraform_plugin_framework_types.String) - if !ok { - diags.Append(attrWriteConversionFailureDiag{"AccessList.spec.membership", "github.com/hashicorp/terraform-plugin-framework/types.String"}) - } - v.Null = string(obj.Membership) == "" - } - v.Value = string(obj.Membership) - v.Unknown = false - tf.Attrs["membership"] = v - } - } - { - t, ok := tf.AttrTypes["ownership"] - if !ok { - diags.Append(attrWriteMissingDiag{"AccessList.spec.ownership"}) - } else { - v, ok := tf.Attrs["ownership"].(github_com_hashicorp_terraform_plugin_framework_types.String) - if !ok { - i, err := t.ValueFromTerraform(ctx, github_com_hashicorp_terraform_plugin_go_tftypes.NewValue(t.TerraformType(ctx), nil)) - if err != nil { - diags.Append(attrWriteGeneralError{"AccessList.spec.ownership", err}) - } - v, ok = i.(github_com_hashicorp_terraform_plugin_framework_types.String) - if !ok { - diags.Append(attrWriteConversionFailureDiag{"AccessList.spec.ownership", "github.com/hashicorp/terraform-plugin-framework/types.String"}) - } - v.Null = string(obj.Ownership) == "" - } - v.Value = string(obj.Ownership) - v.Unknown = false - tf.Attrs["ownership"] = v - } - } { a, ok := tf.AttrTypes["owner_grants"] if !ok { diff --git a/terraform/tfschema/types_terraform.go b/terraform/tfschema/types_terraform.go index 5c6d54456..fcf655d25 100644 --- a/terraform/tfschema/types_terraform.go +++ b/terraform/tfschema/types_terraform.go @@ -479,7 +479,7 @@ func GenSchemaDatabaseV3(ctx context.Context) (github_com_hashicorp_terraform_pl Type: github_com_hashicorp_terraform_plugin_framework_types.StringType, }, "mode": { - Description: "Mode is a TLS connection mode. See DatabaseTLSMode for details.", + Description: "Mode is a TLS connection mode. 0 is \"verify-full\"; 1 is \"verify-ca\", 2 is \"insecure\".", Optional: true, Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, }, @@ -725,11 +725,10 @@ func GenSchemaServerV2(ctx context.Context) (github_com_hashicorp_terraform_plug Validators: []github_com_hashicorp_terraform_plugin_framework_tfsdk.AttributeValidator{UseValueIn("openssh", "openssh-ec2-ice")}, }, "version": { - Description: "Version is version", - PlanModifiers: []github_com_hashicorp_terraform_plugin_framework_tfsdk.AttributePlanModifier{github_com_hashicorp_terraform_plugin_framework_tfsdk.UseStateForUnknown(), github_com_hashicorp_terraform_plugin_framework_tfsdk.RequiresReplace()}, - Required: true, - Type: github_com_hashicorp_terraform_plugin_framework_types.StringType, - Validators: []github_com_hashicorp_terraform_plugin_framework_tfsdk.AttributeValidator{UseVersionBetween(2, 2)}, + Description: "Version is version", + Required: true, + Type: github_com_hashicorp_terraform_plugin_framework_types.StringType, + Validators: []github_com_hashicorp_terraform_plugin_framework_tfsdk.AttributeValidator{UseVersionBetween(2, 2)}, }, }}, nil } @@ -835,6 +834,11 @@ func GenSchemaAppV3(ctx context.Context) (github_com_hashicorp_terraform_plugin_ Optional: true, Type: github_com_hashicorp_terraform_plugin_framework_types.BoolType, }, + "integration": { + Description: "Integration is the integration name that must be used to access this Application. Only applicable to AWS App Access. If present, the Application must use the Integration's credentials instead of ambient credentials to access Cloud APIs.", + Optional: true, + Type: github_com_hashicorp_terraform_plugin_framework_types.StringType, + }, "public_addr": { Description: "PublicAddr is the public address the application is accessible at.", Optional: true, @@ -1407,7 +1411,7 @@ func GenSchemaClusterNetworkingConfigV2(ctx context.Context) (github_com_hashico Type: DurationType{}, }, "proxy_listener_mode": { - Description: "ProxyListenerMode is proxy listener mode used by Teleport Proxies.", + Description: "ProxyListenerMode is proxy listener mode used by Teleport Proxies. 0 is \"separate\"; 1 is \"multiplex\".", Optional: true, Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, }, @@ -1417,7 +1421,7 @@ func GenSchemaClusterNetworkingConfigV2(ctx context.Context) (github_com_hashico Type: DurationType{}, }, "routing_strategy": { - Description: "RoutingStrategy determines the strategy used to route to nodes.", + Description: "RoutingStrategy determines the strategy used to route to nodes. 0 is \"unambiguous_match\"; 1 is \"most_recent\".", Optional: true, Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, }, @@ -1710,7 +1714,7 @@ func GenSchemaAuthPreferenceV2(ctx context.Context) (github_com_hashicorp_terraf Type: github_com_hashicorp_terraform_plugin_framework_types.StringType, }, "require_session_mfa": { - Description: "RequireMFAType is the type of MFA requirement enforced for this cluster.", + Description: "RequireMFAType is the type of MFA requirement enforced for this cluster. 0 is \"OFF\", 1 is \"SESSION\", 2 is \"SESSION_AND_HARDWARE_KEY\", 3 is \"HARDWARE_KEY_TOUCH\", 4 is \"HARDWARE_KEY_PIN\", 5 is \"HARDWARE_KEY_TOUCH_AND_PIN\".", Optional: true, Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, }, @@ -2662,7 +2666,7 @@ func GenSchemaRoleV6(ctx context.Context) (github_com_hashicorp_terraform_plugin "cert_extensions": { Attributes: github_com_hashicorp_terraform_plugin_framework_tfsdk.ListNestedAttributes(map[string]github_com_hashicorp_terraform_plugin_framework_tfsdk.Attribute{ "mode": { - Description: "Mode is the type of extension to be used -- currently critical-option is not supported", + Description: "Mode is the type of extension to be used -- currently critical-option is not supported. 0 is \"extension\".", Optional: true, Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, }, @@ -2672,7 +2676,7 @@ func GenSchemaRoleV6(ctx context.Context) (github_com_hashicorp_terraform_plugin Type: github_com_hashicorp_terraform_plugin_framework_types.StringType, }, "type": { - Description: "Type represents the certificate type being extended, only ssh is supported at this time.", + Description: "Type represents the certificate type being extended, only ssh is supported at this time. 0 is \"ssh\".", Optional: true, Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, }, @@ -2699,14 +2703,14 @@ func GenSchemaRoleV6(ctx context.Context) (github_com_hashicorp_terraform_plugin }, "create_db_user": GenSchemaBoolOption(ctx), "create_db_user_mode": { - Description: "CreateDatabaseUserMode allows users to be automatically created on a database when not set to off.", + Description: "CreateDatabaseUserMode allows users to be automatically created on a database when not set to off. 0 is \"unspecified\", 1 is \"off\", 2 is \"keep\", 3 is \"best_effort_drop\".", Optional: true, Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, }, "create_desktop_user": GenSchemaBoolOption(ctx), "create_host_user": GenSchemaBoolOption(ctx), "create_host_user_mode": { - Description: "CreateHostUserMode allows users to be automatically created on a host when not set to off", + Description: "CreateHostUserMode allows users to be automatically created on a host when not set to off. 0 is \"unspecified\"; 1 is \"off\"; 2 is \"drop\" (removed for v15 and above), 3 is \"keep\"; 4 is \"insecure-drop\".", Optional: true, Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, }, @@ -2809,7 +2813,7 @@ func GenSchemaRoleV6(ctx context.Context) (github_com_hashicorp_terraform_plugin Type: github_com_hashicorp_terraform_plugin_framework_types.StringType, }, "require_session_mfa": { - Description: "RequireMFAType is the type of MFA requirement enforced for this user.", + Description: "RequireMFAType is the type of MFA requirement enforced for this user. 0 is \"OFF\", 1 is \"SESSION\", 2 is \"SESSION_AND_HARDWARE_KEY\", 3 is \"HARDWARE_KEY_TOUCH\", 4 is \"HARDWARE_KEY_PIN\", 5 is \"HARDWARE_KEY_TOUCH_AND_PIN\".", Optional: true, Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, }, @@ -9917,6 +9921,23 @@ func CopyAppV3FromTerraform(_ context.Context, tf github_com_hashicorp_terraform } } } + { + a, ok := tf.Attrs["integration"] + if !ok { + diags.Append(attrReadMissingDiag{"AppV3.Spec.Integration"}) + } else { + v, ok := a.(github_com_hashicorp_terraform_plugin_framework_types.String) + if !ok { + diags.Append(attrReadConversionFailureDiag{"AppV3.Spec.Integration", "github.com/hashicorp/terraform-plugin-framework/types.String"}) + } else { + var t string + if !v.Null && !v.Unknown { + t = string(v.Value) + } + obj.Integration = t + } + } + } } } } @@ -10771,6 +10792,28 @@ func CopyAppV3ToTerraform(ctx context.Context, obj *github_com_gravitational_tel } } } + { + t, ok := tf.AttrTypes["integration"] + if !ok { + diags.Append(attrWriteMissingDiag{"AppV3.Spec.Integration"}) + } else { + v, ok := tf.Attrs["integration"].(github_com_hashicorp_terraform_plugin_framework_types.String) + if !ok { + i, err := t.ValueFromTerraform(ctx, github_com_hashicorp_terraform_plugin_go_tftypes.NewValue(t.TerraformType(ctx), nil)) + if err != nil { + diags.Append(attrWriteGeneralError{"AppV3.Spec.Integration", err}) + } + v, ok = i.(github_com_hashicorp_terraform_plugin_framework_types.String) + if !ok { + diags.Append(attrWriteConversionFailureDiag{"AppV3.Spec.Integration", "github.com/hashicorp/terraform-plugin-framework/types.String"}) + } + v.Null = string(obj.Integration) == "" + } + v.Value = string(obj.Integration) + v.Unknown = false + tf.Attrs["integration"] = v + } + } } v.Unknown = false tf.Attrs["spec"] = v