diff --git a/.drone.yml b/.drone.yml index e2664e940..2b9719d63 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,7 +30,7 @@ steps: TELEPORT_ENTERPRISE_LICENSE: from_secret: TELEPORT_ENTERPRISE_LICENSE TERRAFORM_VERSION: 1.5.6-1 - TELEPORT_VERSION: 14.0.0 + TELEPORT_VERSION: 14.0.3 commands: - echo Testing plugins against Teleport $TELEPORT_VERSION - apt update && apt install -y gnupg software-properties-common @@ -1081,6 +1081,6 @@ steps: from_secret: PRODUCTION_TERRAFORM_REGISTRY_SIGNING_KEY --- kind: signature -hmac: 7329d41f2acd4c65f990204ced4435154add3fed15634bc7bcab06791dec41a1 +hmac: 63e4d9ad2fc74400265609424f058f2ccbd18c52d60c5e884ba07181c3cdd637 ... diff --git a/.github/workflows/terraform-tests.yaml b/.github/workflows/terraform-tests.yaml index 92cae4bba..10d2d5cdc 100644 --- a/.github/workflows/terraform-tests.yaml +++ b/.github/workflows/terraform-tests.yaml @@ -36,7 +36,7 @@ jobs: - name: Install Teleport uses: teleport-actions/setup@v1 with: - version: 14.0.0 + version: 14.0.3 enterprise: true - name: make test-terraform diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 824662991..53f16f10b 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -30,7 +30,7 @@ jobs: - name: Install Teleport uses: teleport-actions/setup@v1 with: - version: 14.0.0 + version: 14.0.3 enterprise: true - name: Run unit tests diff --git a/access/discord/Makefile b/access/discord/Makefile index c36b35111..8ad822fbd 100644 --- a/access/discord/Makefile +++ b/access/discord/Makefile @@ -1,4 +1,4 @@ -VERSION=14.0.1 +VERSION=14.0.3 GO_VERSION=1.21.3 BUILDDIR ?= build diff --git a/access/email/Makefile b/access/email/Makefile index 272a98ce4..64d3a6d54 100644 --- a/access/email/Makefile +++ b/access/email/Makefile @@ -1,4 +1,4 @@ -VERSION=14.0.1 +VERSION=14.0.3 GO_VERSION=1.21.3 BUILDDIR ?= build diff --git a/access/jira/Makefile b/access/jira/Makefile index 596d95b4b..518606098 100644 --- a/access/jira/Makefile +++ b/access/jira/Makefile @@ -1,4 +1,4 @@ -VERSION=14.0.1 +VERSION=14.0.3 GO_VERSION=1.21.3 BUILDDIR ?= build diff --git a/access/mattermost/Makefile b/access/mattermost/Makefile index 85e1cd693..8a3180b86 100644 --- a/access/mattermost/Makefile +++ b/access/mattermost/Makefile @@ -1,4 +1,4 @@ -VERSION=14.0.1 +VERSION=14.0.3 GO_VERSION=1.21.3 BUILDDIR ?= build diff --git a/access/msteams/Makefile b/access/msteams/Makefile index b3fd687d4..5c606a6c6 100644 --- a/access/msteams/Makefile +++ b/access/msteams/Makefile @@ -1,4 +1,4 @@ -VERSION=14.0.1 +VERSION=14.0.3 GO_VERSION=1.21.3 BUILDDIR ?= build diff --git a/access/pagerduty/Makefile b/access/pagerduty/Makefile index 4fc5779b9..a51023733 100644 --- a/access/pagerduty/Makefile +++ b/access/pagerduty/Makefile @@ -1,4 +1,4 @@ -VERSION=14.0.1 +VERSION=14.0.3 GO_VERSION=1.21.3 BUILDDIR ?= build diff --git a/access/slack/Makefile b/access/slack/Makefile index 5fac90aad..ec1c2c0e3 100644 --- a/access/slack/Makefile +++ b/access/slack/Makefile @@ -1,4 +1,4 @@ -VERSION=14.0.1 +VERSION=14.0.3 GO_VERSION=1.21.3 BUILDDIR ?= build diff --git a/charts/access/discord/Chart.yaml b/charts/access/discord/Chart.yaml index 58b21c2ba..180fd3fae 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: "14.0.1" +version: "14.0.3" # 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.0.1" +version: "14.0.3" # 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.0.1" +appVersion: "14.0.3" diff --git a/charts/access/discord/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/discord/tests/__snapshot__/configmap_test.yaml.snap index a14936797..3961279a3 100644 --- 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.0.1 - helm.sh/chart: teleport-plugin-discord-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-discord-14.0.3 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 52c3d9271..c36c81c95 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: 14.0.1 - helm.sh/chart: teleport-plugin-discord-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-discord-14.0.3 name: RELEASE-NAME-teleport-plugin-discord spec: replicas: 1 diff --git a/charts/access/email/Chart.yaml b/charts/access/email/Chart.yaml index b96c5148a..53840d834 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: "14.0.1" +version: "14.0.3" # 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.0.1" +appVersion: "14.0.3" diff --git a/charts/access/email/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/email/tests/__snapshot__/configmap_test.yaml.snap index a18e3e191..9c0200e00 100644 --- 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.0.1 - helm.sh/chart: teleport-plugin-email-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-email-14.0.3 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.0.1 - helm.sh/chart: teleport-plugin-email-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-email-14.0.3 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.0.1 - helm.sh/chart: teleport-plugin-email-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-email-14.0.3 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.0.1 - helm.sh/chart: teleport-plugin-email-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-email-14.0.3 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.0.1 - helm.sh/chart: teleport-plugin-email-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-email-14.0.3 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.0.1 - helm.sh/chart: teleport-plugin-email-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-email-14.0.3 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 88c57b306..59be378e8 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: 14.0.1 - helm.sh/chart: teleport-plugin-email-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-email-14.0.3 name: RELEASE-NAME-teleport-plugin-email spec: replicas: 1 @@ -31,7 +31,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:14.0.1 + image: public.ecr.aws/gravitational/teleport-plugin-email:14.0.3 imagePullPolicy: IfNotPresent name: teleport-plugin-email ports: @@ -73,8 +73,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: 14.0.1 - helm.sh/chart: teleport-plugin-email-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-email-14.0.3 name: RELEASE-NAME-teleport-plugin-email spec: replicas: 1 @@ -132,8 +132,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.0.1 - helm.sh/chart: teleport-plugin-email-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-email-14.0.3 name: RELEASE-NAME-teleport-plugin-email spec: replicas: 1 @@ -156,7 +156,7 @@ should match the snapshot (mailgun on): env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-email:14.0.1 + image: public.ecr.aws/gravitational/teleport-plugin-email:14.0.3 imagePullPolicy: IfNotPresent name: teleport-plugin-email ports: @@ -198,8 +198,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.0.1 - helm.sh/chart: teleport-plugin-email-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-email-14.0.3 name: RELEASE-NAME-teleport-plugin-email spec: replicas: 1 @@ -222,7 +222,7 @@ should match the snapshot (smtp on): env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-email:14.0.1 + image: public.ecr.aws/gravitational/teleport-plugin-email:14.0.3 imagePullPolicy: IfNotPresent name: teleport-plugin-email ports: @@ -264,8 +264,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: 14.0.1 - helm.sh/chart: teleport-plugin-email-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-email-14.0.3 name: RELEASE-NAME-teleport-plugin-email spec: replicas: 1 @@ -288,7 +288,7 @@ should mount external secret (mailgun on): env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-email:14.0.1 + image: public.ecr.aws/gravitational/teleport-plugin-email:14.0.3 imagePullPolicy: IfNotPresent name: teleport-plugin-email ports: @@ -330,8 +330,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: 14.0.1 - helm.sh/chart: teleport-plugin-email-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-email-14.0.3 name: RELEASE-NAME-teleport-plugin-email spec: replicas: 1 @@ -354,7 +354,7 @@ should mount external secret (smtp on): env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-email:14.0.1 + image: public.ecr.aws/gravitational/teleport-plugin-email:14.0.3 imagePullPolicy: IfNotPresent name: teleport-plugin-email ports: diff --git a/charts/access/jira/Chart.yaml b/charts/access/jira/Chart.yaml index 26ff7d7f2..11f2f37f7 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: "14.0.1" +version: "14.0.3" # 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.0.1" +appVersion: "14.0.3" diff --git a/charts/access/jira/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/jira/tests/__snapshot__/configmap_test.yaml.snap index c4a3beae8..a0ca5e98a 100644 --- a/charts/access/jira/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/access/jira/tests/__snapshot__/configmap_test.yaml.snap @@ -31,6 +31,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: 14.0.1 - helm.sh/chart: teleport-plugin-jira-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-jira-14.0.3 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 83ded0e0e..2a2cd76f4 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: 14.0.1 - helm.sh/chart: teleport-plugin-jira-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-jira-14.0.3 name: RELEASE-NAME-teleport-plugin-jira spec: replicas: 1 diff --git a/charts/access/mattermost/Chart.yaml b/charts/access/mattermost/Chart.yaml index a77d54087..e59e51196 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: "14.0.1" +version: "14.0.3" # 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.0.1" +appVersion: "14.0.3" diff --git a/charts/access/mattermost/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/mattermost/tests/__snapshot__/configmap_test.yaml.snap index 3e6a32ce9..89c2573a3 100644 --- a/charts/access/mattermost/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/access/mattermost/tests/__snapshot__/configmap_test.yaml.snap @@ -21,6 +21,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: 14.0.1 - helm.sh/chart: teleport-plugin-mattermost-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-mattermost-14.0.3 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 f110eaabd..5f6a6ff07 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: 14.0.1 - helm.sh/chart: teleport-plugin-mattermost-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-mattermost-14.0.3 name: RELEASE-NAME-teleport-plugin-mattermost spec: replicas: 1 @@ -73,8 +73,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: 14.0.1 - helm.sh/chart: teleport-plugin-mattermost-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-mattermost-14.0.3 name: RELEASE-NAME-teleport-plugin-mattermost spec: replicas: 1 @@ -97,7 +97,7 @@ should mount external secret: env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-mattermost:14.0.1 + image: public.ecr.aws/gravitational/teleport-plugin-mattermost:14.0.3 imagePullPolicy: IfNotPresent name: teleport-plugin-mattermost ports: @@ -139,8 +139,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: 14.0.1 - helm.sh/chart: teleport-plugin-mattermost-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-mattermost-14.0.3 name: RELEASE-NAME-teleport-plugin-mattermost spec: replicas: 1 @@ -163,7 +163,7 @@ should override volume name: env: - name: TELEPORT_PLUGIN_FAIL_FAST value: "true" - image: public.ecr.aws/gravitational/teleport-plugin-mattermost:14.0.1 + image: public.ecr.aws/gravitational/teleport-plugin-mattermost:14.0.3 imagePullPolicy: IfNotPresent name: teleport-plugin-mattermost ports: diff --git a/charts/access/msteams/Chart.yaml b/charts/access/msteams/Chart.yaml index ec6be021f..549cfda59 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: "14.0.1" +version: "14.0.3" # 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.0.1" +appVersion: "14.0.3" diff --git a/charts/access/msteams/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/msteams/tests/__snapshot__/configmap_test.yaml.snap index 546e98e61..8a2e3ac15 100644 --- a/charts/access/msteams/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/access/msteams/tests/__snapshot__/configmap_test.yaml.snap @@ -28,6 +28,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: 14.0.1 - helm.sh/chart: teleport-plugin-msteams-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-msteams-14.0.3 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 080b52566..66cec9dce 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: 14.0.1 - helm.sh/chart: teleport-plugin-msteams-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-msteams-14.0.3 name: RELEASE-NAME-teleport-plugin-msteams spec: replicas: 1 diff --git a/charts/access/pagerduty/Chart.yaml b/charts/access/pagerduty/Chart.yaml index 915fe45fb..d70ada4a1 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: "14.0.1" +version: "14.0.3" # 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.0.1" +appVersion: "14.0.3" diff --git a/charts/access/pagerduty/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/pagerduty/tests/__snapshot__/configmap_test.yaml.snap index d06a46ff1..9dc80d3f8 100644 --- a/charts/access/pagerduty/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/access/pagerduty/tests/__snapshot__/configmap_test.yaml.snap @@ -20,6 +20,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: 14.0.1 - helm.sh/chart: teleport-plugin-pagerduty-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-pagerduty-14.0.3 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 8d6d7ca42..d42ae098e 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: 14.0.1 - helm.sh/chart: teleport-plugin-pagerduty-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-pagerduty-14.0.3 name: RELEASE-NAME-teleport-plugin-pagerduty spec: replicas: 1 diff --git a/charts/access/slack/Chart.yaml b/charts/access/slack/Chart.yaml index cde95d7d6..792189a54 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: "14.0.1" +version: "14.0.3" # 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.0.1" +appVersion: "14.0.3" diff --git a/charts/access/slack/tests/__snapshot__/configmap_test.yaml.snap b/charts/access/slack/tests/__snapshot__/configmap_test.yaml.snap index 28af65811..d8eca6b92 100644 --- a/charts/access/slack/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/access/slack/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-slack - app.kubernetes.io/version: 14.0.1 - helm.sh/chart: teleport-plugin-slack-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-slack-14.0.3 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 f770fe542..d26d06599 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: 14.0.1 - helm.sh/chart: teleport-plugin-slack-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-slack-14.0.3 name: RELEASE-NAME-teleport-plugin-slack spec: replicas: 1 diff --git a/charts/event-handler/Chart.yaml b/charts/event-handler/Chart.yaml index 63fe69dfe..33f8739ac 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: "14.0.1" +version: "14.0.3" # 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.0.1" +appVersion: "14.0.3" diff --git a/charts/event-handler/tests/__snapshot__/configmap_test.yaml.snap b/charts/event-handler/tests/__snapshot__/configmap_test.yaml.snap index febbdd3f1..f6f8e9a5e 100644 --- a/charts/event-handler/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/event-handler/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-event-handler - app.kubernetes.io/version: 14.0.1 - helm.sh/chart: teleport-plugin-event-handler-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-event-handler-14.0.3 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 b370b64c6..235198118 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: 14.0.1 - helm.sh/chart: teleport-plugin-event-handler-14.0.1 + app.kubernetes.io/version: 14.0.3 + helm.sh/chart: teleport-plugin-event-handler-14.0.3 name: RELEASE-NAME-teleport-plugin-event-handler spec: replicas: 1 diff --git a/event-handler/Makefile b/event-handler/Makefile index 8727a8cbc..26f68fefd 100644 --- a/event-handler/Makefile +++ b/event-handler/Makefile @@ -1,4 +1,4 @@ -VERSION=14.0.1 +VERSION=14.0.3 GO_VERSION=1.21.3 GITTAG=v$(VERSION) diff --git a/event-handler/fake_fluentd_test.go b/event-handler/fake_fluentd_test.go index 67b99ca75..1713a7252 100644 --- a/event-handler/fake_fluentd_test.go +++ b/event-handler/fake_fluentd_test.go @@ -21,11 +21,11 @@ import ( "crypto/tls" "crypto/x509" "fmt" + "io" "net/http" "net/http/httptest" "os" "path" - "strings" "time" "github.com/gravitational/teleport/integrations/lib/logger" @@ -153,17 +153,14 @@ func (f *FakeFluentd) GetURL() string { // Respond is the response function func (f *FakeFluentd) Respond(w http.ResponseWriter, r *http.Request) { - var req = make([]byte, r.ContentLength) - - _, err := r.Body.Read(req) - // We omit err here because it always returns weird EOF. - // It has something to do with httptest, known bug. - // TODO: find out and resolve. - if !trace.IsEOF(err) { - logger.Standard().WithError(err).Error("FakeFluentd Respond() failed") + req, err := io.ReadAll(r.Body) + if err != nil { + logger.Standard().WithError(err).Error("FakeFluentd Respond() failed to read body") + fmt.Fprintln(w, "NOK") + return } - f.chMessages <- strings.TrimSpace(string(req)) + f.chMessages <- string(req) fmt.Fprintln(w, "OK") } diff --git a/go.mod b/go.mod index a185f1cdf..185004258 100644 --- a/go.mod +++ b/go.mod @@ -134,8 +134,8 @@ require ( replace ( 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-20230926235732-2108b207b45f // ref: tags/v14.0.1 - github.com/gravitational/teleport/api => github.com/gravitational/teleport/api v0.0.0-20230926235732-2108b207b45f // ref: tags/v14.0.1 + github.com/gravitational/teleport => github.com/gravitational/teleport v0.0.0-20231011153928-4d1c2ac05b42 // ref: tags/v14.0.3 + github.com/gravitational/teleport/api => github.com/gravitational/teleport/api v0.0.0-20231011153928-4d1c2ac05b42 // ref: tags/v14.0.3 github.com/julienschmidt/httprouter => github.com/rw-access/httprouter v1.3.1-0.20210321233808-98e93175c124 github.com/microsoft/go-mssqldb => github.com/gravitational/go-mssqldb v0.11.1-0.20230331180905-0f76f1751cd3 ) diff --git a/go.sum b/go.sum index 3ed173bdf..ae3ad157e 100644 --- a/go.sum +++ b/go.sum @@ -272,10 +272,10 @@ github.com/gravitational/kingpin v2.1.11-0.20220901134012-2a1956e29525+incompati github.com/gravitational/kingpin v2.1.11-0.20220901134012-2a1956e29525+incompatible/go.mod h1:LWxG30M3FcrjhOn3T4zz7JmBoQJ45MWZmOXgy9Ganoc= github.com/gravitational/protobuf v1.3.2-0.20201123192827-2b9fcfaffcbf h1:MQ4e8XcxvZTeuOmRl7yE519vcWc2h/lyvYzsvt41cdY= github.com/gravitational/protobuf v1.3.2-0.20201123192827-2b9fcfaffcbf/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gravitational/teleport v0.0.0-20230926235732-2108b207b45f h1:HKfQLW5BaP3AVxFRmzyORz2CsXojTlyxJk4iNuImrxc= -github.com/gravitational/teleport v0.0.0-20230926235732-2108b207b45f/go.mod h1:XB2I63saR2wfyon7i9m6QC//LEgoE6T5iLAZXXYGNhY= -github.com/gravitational/teleport/api v0.0.0-20230926235732-2108b207b45f h1:eg6FrVVPBAayi4P/wynSIVXhqcCZxE7hi8D6hcKCaXg= -github.com/gravitational/teleport/api v0.0.0-20230926235732-2108b207b45f/go.mod h1:Ze8VqE9BzsgLVSDK2dHIYP2VC0knkJC+0xn6xvOZtDE= +github.com/gravitational/teleport v0.0.0-20231011153928-4d1c2ac05b42 h1:u4dOuepsgMjVbNxF34Q0IFnsLxKGYKyoQ0IOX4gEiLY= +github.com/gravitational/teleport v0.0.0-20231011153928-4d1c2ac05b42/go.mod h1:BhWFJcdCDJiqgPuYuf9Z4ZqMY6X9IOqUoqT2eCk+CPw= +github.com/gravitational/teleport/api v0.0.0-20231011153928-4d1c2ac05b42 h1:p7KoJLf5qqIWNiP+WcwYGpF0xTqjMAeR6OLo4k/ujpw= +github.com/gravitational/teleport/api v0.0.0-20231011153928-4d1c2ac05b42/go.mod h1:NLjVINQH0CZOZr98OH9xoQEAPZ2tigK5Y478Qi/dKog= github.com/gravitational/trace v1.3.1 h1:jwZEuRtCYpLhUtqHo+JH+lu2qM0LB98UagqHtvdKuLI= github.com/gravitational/trace v1.3.1/go.mod h1:E61mn73aro7Zg9gZheZaeUsK6gjUMbCLazY76xuYAVA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= diff --git a/terraform/install.mk b/terraform/install.mk index 485ab15aa..fd060fcde 100644 --- a/terraform/install.mk +++ b/terraform/install.mk @@ -1,4 +1,4 @@ -VERSION=14.0.1 +VERSION=14.0.3 OS ?= $(shell go env GOOS) ARCH ?= $(shell go env GOARCH) diff --git a/terraform/reference.mdx b/terraform/reference.mdx index d373d7d72..de4f19f11 100755 --- a/terraform/reference.mdx +++ b/terraform/reference.mdx @@ -133,10 +133,19 @@ spec is the specification for the access list. audit describes the frequency that this access list must be audited. -| Name | Type | Required | Description | -|-----------------|--------------|----------|-------------| -| frequency | duration | | | -| next_audit_date | RFC3339 time | | | +| Name | Type | Required | Description | +|-----------------|--------------|----------|-----------------------------------------| +| next_audit_date | RFC3339 time | | | +| recurrence | object | | recurrence is the recurrence definition | + +##### spec.audit.recurrence + +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. | #### spec.grants diff --git a/terraform/test/access_list_test.go b/terraform/test/access_list_test.go index fa8861aa5..2e6071a67 100644 --- a/terraform/test/access_list_test.go +++ b/terraform/test/access_list_test.go @@ -48,6 +48,7 @@ func (s *TerraformSuite) TestAccessList() { resource.TestCheckResourceAttr(name, "spec.owners.0.name", "gru"), resource.TestCheckResourceAttr(name, "spec.membership_requires.roles.0", "minion"), resource.TestCheckResourceAttr(name, "spec.grants.roles.0", "crane-operator"), + resource.TestCheckResourceAttr(name, "spec.audit.recurrence.frequency", "6"), ), }, { diff --git a/terraform/test/fixtures/access_list_0_create.tf b/terraform/test/fixtures/access_list_0_create.tf index 53b3fe9fa..75a80ca33 100644 --- a/terraform/test/fixtures/access_list_0_create.tf +++ b/terraform/test/fixtures/access_list_0_create.tf @@ -26,7 +26,9 @@ resource "teleport_access_list" "test" { } title = "Hello" audit = { - frequency = "3600h" + recurrence = { + frequency = 6 + } } } } diff --git a/terraform/tfschema/accesslist/v1/accesslist_terraform.go b/terraform/tfschema/accesslist/v1/accesslist_terraform.go index e54ab3529..31371826f 100644 --- a/terraform/tfschema/accesslist/v1/accesslist_terraform.go +++ b/terraform/tfschema/accesslist/v1/accesslist_terraform.go @@ -34,7 +34,6 @@ import ( github_com_hashicorp_terraform_plugin_framework_tfsdk "github.com/hashicorp/terraform-plugin-framework/tfsdk" github_com_hashicorp_terraform_plugin_framework_types "github.com/hashicorp/terraform-plugin-framework/types" github_com_hashicorp_terraform_plugin_go_tftypes "github.com/hashicorp/terraform-plugin-go/tftypes" - _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" ) @@ -113,8 +112,23 @@ func GenSchemaAccessList(ctx context.Context) (github_com_hashicorp_terraform_pl Attributes: github_com_hashicorp_terraform_plugin_framework_tfsdk.SingleNestedAttributes(map[string]github_com_hashicorp_terraform_plugin_framework_tfsdk.Attribute{ "audit": { Attributes: github_com_hashicorp_terraform_plugin_framework_tfsdk.SingleNestedAttributes(map[string]github_com_hashicorp_terraform_plugin_framework_tfsdk.Attribute{ - "frequency": GenSchemaDuration(ctx), "next_audit_date": GenSchemaTimestamp(ctx), + "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.", + Optional: true, + Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, + }, + "frequency": { + Description: "frequency is the frequency of reviews.", + Optional: true, + Type: github_com_hashicorp_terraform_plugin_framework_types.Int64Type, + }, + }), + Description: "recurrence is the recurrence definition", + Optional: true, + }, }), Description: "audit describes the frequency that this access list must be audited.", Optional: true, @@ -534,18 +548,63 @@ func CopyAccessListFromTerraform(_ context.Context, tf github_com_hashicorp_terr obj.Audit = &github_com_gravitational_teleport_api_gen_proto_go_teleport_accesslist_v1.AccessListAudit{} obj := obj.Audit { - a, ok := tf.Attrs["frequency"] + a, ok := tf.Attrs["next_audit_date"] if !ok { - diags.Append(attrReadMissingDiag{"AccessList.spec.audit.frequency"}) + diags.Append(attrReadMissingDiag{"AccessList.spec.audit.next_audit_date"}) } - CopyFromDuration(diags, a, &obj.Frequency) + CopyFromTimestamp(diags, a, &obj.NextAuditDate) } { - a, ok := tf.Attrs["next_audit_date"] + a, ok := tf.Attrs["recurrence"] if !ok { - diags.Append(attrReadMissingDiag{"AccessList.spec.audit.next_audit_date"}) + diags.Append(attrReadMissingDiag{"AccessList.spec.audit.recurrence"}) + } else { + v, ok := a.(github_com_hashicorp_terraform_plugin_framework_types.Object) + if !ok { + diags.Append(attrReadConversionFailureDiag{"AccessList.spec.audit.recurrence", "github.com/hashicorp/terraform-plugin-framework/types.Object"}) + } else { + obj.Recurrence = nil + if !v.Null && !v.Unknown { + tf := v + obj.Recurrence = &github_com_gravitational_teleport_api_gen_proto_go_teleport_accesslist_v1.Recurrence{} + obj := obj.Recurrence + { + a, ok := tf.Attrs["frequency"] + if !ok { + diags.Append(attrReadMissingDiag{"AccessList.spec.audit.recurrence.frequency"}) + } else { + v, ok := a.(github_com_hashicorp_terraform_plugin_framework_types.Int64) + if !ok { + diags.Append(attrReadConversionFailureDiag{"AccessList.spec.audit.recurrence.frequency", "github.com/hashicorp/terraform-plugin-framework/types.Int64"}) + } else { + var t github_com_gravitational_teleport_api_gen_proto_go_teleport_accesslist_v1.ReviewFrequency + if !v.Null && !v.Unknown { + t = github_com_gravitational_teleport_api_gen_proto_go_teleport_accesslist_v1.ReviewFrequency(v.Value) + } + obj.Frequency = t + } + } + } + { + a, ok := tf.Attrs["day_of_month"] + if !ok { + diags.Append(attrReadMissingDiag{"AccessList.spec.audit.recurrence.day_of_month"}) + } else { + v, ok := a.(github_com_hashicorp_terraform_plugin_framework_types.Int64) + if !ok { + diags.Append(attrReadConversionFailureDiag{"AccessList.spec.audit.recurrence.day_of_month", "github.com/hashicorp/terraform-plugin-framework/types.Int64"}) + } else { + var t github_com_gravitational_teleport_api_gen_proto_go_teleport_accesslist_v1.ReviewDayOfMonth + if !v.Null && !v.Unknown { + t = github_com_gravitational_teleport_api_gen_proto_go_teleport_accesslist_v1.ReviewDayOfMonth(v.Value) + } + obj.DayOfMonth = t + } + } + } + } + } } - CopyFromTimestamp(diags, a, &obj.NextAuditDate) } } } @@ -1391,21 +1450,88 @@ func CopyAccessListToTerraform(ctx context.Context, obj *github_com_gravitationa obj := obj.Audit tf := &v { - t, ok := tf.AttrTypes["frequency"] + t, ok := tf.AttrTypes["next_audit_date"] if !ok { - diags.Append(attrWriteMissingDiag{"AccessList.spec.audit.frequency"}) + diags.Append(attrWriteMissingDiag{"AccessList.spec.audit.next_audit_date"}) } else { - v := CopyToDuration(diags, obj.Frequency, t, tf.Attrs["frequency"]) - tf.Attrs["frequency"] = v + v := CopyToTimestamp(diags, obj.NextAuditDate, t, tf.Attrs["next_audit_date"]) + tf.Attrs["next_audit_date"] = v } } { - t, ok := tf.AttrTypes["next_audit_date"] + a, ok := tf.AttrTypes["recurrence"] if !ok { - diags.Append(attrWriteMissingDiag{"AccessList.spec.audit.next_audit_date"}) + diags.Append(attrWriteMissingDiag{"AccessList.spec.audit.recurrence"}) } else { - v := CopyToTimestamp(diags, obj.NextAuditDate, t, tf.Attrs["next_audit_date"]) - tf.Attrs["next_audit_date"] = v + o, ok := a.(github_com_hashicorp_terraform_plugin_framework_types.ObjectType) + if !ok { + diags.Append(attrWriteConversionFailureDiag{"AccessList.spec.audit.recurrence", "github.com/hashicorp/terraform-plugin-framework/types.ObjectType"}) + } else { + v, ok := tf.Attrs["recurrence"].(github_com_hashicorp_terraform_plugin_framework_types.Object) + if !ok { + v = github_com_hashicorp_terraform_plugin_framework_types.Object{ + + AttrTypes: o.AttrTypes, + Attrs: make(map[string]github_com_hashicorp_terraform_plugin_framework_attr.Value, len(o.AttrTypes)), + } + } else { + if v.Attrs == nil { + v.Attrs = make(map[string]github_com_hashicorp_terraform_plugin_framework_attr.Value, len(tf.AttrTypes)) + } + } + if obj.Recurrence == nil { + v.Null = true + } else { + obj := obj.Recurrence + tf := &v + { + t, ok := tf.AttrTypes["frequency"] + if !ok { + diags.Append(attrWriteMissingDiag{"AccessList.spec.audit.recurrence.frequency"}) + } else { + v, ok := tf.Attrs["frequency"].(github_com_hashicorp_terraform_plugin_framework_types.Int64) + 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.audit.recurrence.frequency", err}) + } + v, ok = i.(github_com_hashicorp_terraform_plugin_framework_types.Int64) + if !ok { + diags.Append(attrWriteConversionFailureDiag{"AccessList.spec.audit.recurrence.frequency", "github.com/hashicorp/terraform-plugin-framework/types.Int64"}) + } + v.Null = int64(obj.Frequency) == 0 + } + v.Value = int64(obj.Frequency) + v.Unknown = false + tf.Attrs["frequency"] = v + } + } + { + t, ok := tf.AttrTypes["day_of_month"] + if !ok { + diags.Append(attrWriteMissingDiag{"AccessList.spec.audit.recurrence.day_of_month"}) + } else { + v, ok := tf.Attrs["day_of_month"].(github_com_hashicorp_terraform_plugin_framework_types.Int64) + 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.audit.recurrence.day_of_month", err}) + } + v, ok = i.(github_com_hashicorp_terraform_plugin_framework_types.Int64) + if !ok { + diags.Append(attrWriteConversionFailureDiag{"AccessList.spec.audit.recurrence.day_of_month", "github.com/hashicorp/terraform-plugin-framework/types.Int64"}) + } + v.Null = int64(obj.DayOfMonth) == 0 + } + v.Value = int64(obj.DayOfMonth) + v.Unknown = false + tf.Attrs["day_of_month"] = v + } + } + } + v.Unknown = false + tf.Attrs["recurrence"] = v + } } } }