From ccf564697e3960eab1edb72a5bde8d44369099b7 Mon Sep 17 00:00:00 2001 From: Noah Stride Date: Thu, 25 Jul 2024 18:24:28 +0100 Subject: [PATCH] [v16] Update list of supported join methods in ProvisionTokenV2 (#44626) * Update list of supported join methods in ProvisionTokenV2 * Use comma seperated list * Update CRDs --- api/proto/teleport/legacy/types/types.proto | 2 +- api/types/types.pb.go | 2 +- .../terraform-provider/data-sources/provision_token.mdx | 2 +- .../terraform-provider/resources/provision_token.mdx | 2 +- .../resources.teleport.dev_provisiontokens.yaml | 6 +++--- .../crd/bases/resources.teleport.dev_provisiontokens.yaml | 6 +++--- integrations/terraform/tfschema/token/types_terraform.go | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/proto/teleport/legacy/types/types.proto b/api/proto/teleport/legacy/types/types.proto index 49adebe1ad605..3bec1805b8a6a 100644 --- a/api/proto/teleport/legacy/types/types.proto +++ b/api/proto/teleport/legacy/types/types.proto @@ -1235,7 +1235,7 @@ message ProvisionTokenSpecV2 { (gogoproto.casttype) = "Duration" ]; // JoinMethod is the joining method required in order to use this token. - // Supported joining methods include "token", "ec2", and "iam". + // Supported joining methods include: azure, circleci, ec2, gcp, github, gitlab, iam, kubernetes, spacelift, token, tpm string JoinMethod = 4 [ (gogoproto.jsontag) = "join_method", (gogoproto.casttype) = "JoinMethod" diff --git a/api/types/types.pb.go b/api/types/types.pb.go index 6273cb84eb194..3532d530b9cf5 100644 --- a/api/types/types.pb.go +++ b/api/types/types.pb.go @@ -3990,7 +3990,7 @@ type ProvisionTokenSpecV2 struct { // to join the cluster with this token. AWSIIDTTL Duration `protobuf:"varint,3,opt,name=AWSIIDTTL,proto3,casttype=Duration" json:"aws_iid_ttl,omitempty"` // JoinMethod is the joining method required in order to use this token. - // Supported joining methods include "token", "ec2", and "iam". + // Supported joining methods include: azure, circleci, ec2, gcp, github, gitlab, iam, kubernetes, spacelift, token, tpm JoinMethod JoinMethod `protobuf:"bytes,4,opt,name=JoinMethod,proto3,casttype=JoinMethod" json:"join_method"` // BotName is the name of the bot this token grants access to, if any BotName string `protobuf:"bytes,5,opt,name=BotName,proto3" json:"bot_name,omitempty"` diff --git a/docs/pages/reference/terraform-provider/data-sources/provision_token.mdx b/docs/pages/reference/terraform-provider/data-sources/provision_token.mdx index 79d77980ab8d6..1b4ddb061424b 100644 --- a/docs/pages/reference/terraform-provider/data-sources/provision_token.mdx +++ b/docs/pages/reference/terraform-provider/data-sources/provision_token.mdx @@ -36,7 +36,7 @@ Optional: - `gcp` (Attributes) GCP allows the configuration of options specific to the "gcp" join method. (see [below for nested schema](#nested-schema-for-specgcp)) - `github` (Attributes) GitHub allows the configuration of options specific to the "github" join method. (see [below for nested schema](#nested-schema-for-specgithub)) - `gitlab` (Attributes) GitLab allows the configuration of options specific to the "gitlab" join method. (see [below for nested schema](#nested-schema-for-specgitlab)) -- `join_method` (String) JoinMethod is the joining method required in order to use this token. Supported joining methods include "token", "ec2", and "iam". +- `join_method` (String) JoinMethod is the joining method required in order to use this token. Supported joining methods include: azure, circleci, ec2, gcp, github, gitlab, iam, kubernetes, spacelift, token, tpm - `kubernetes` (Attributes) Kubernetes allows the configuration of options specific to the "kubernetes" join method. (see [below for nested schema](#nested-schema-for-speckubernetes)) - `spacelift` (Attributes) Spacelift allows the configuration of options specific to the "spacelift" join method. (see [below for nested schema](#nested-schema-for-specspacelift)) - `suggested_agent_matcher_labels` (Map of List of String) diff --git a/docs/pages/reference/terraform-provider/resources/provision_token.mdx b/docs/pages/reference/terraform-provider/resources/provision_token.mdx index b10762a3f6f4b..c5386a81333d7 100644 --- a/docs/pages/reference/terraform-provider/resources/provision_token.mdx +++ b/docs/pages/reference/terraform-provider/resources/provision_token.mdx @@ -70,7 +70,7 @@ Optional: - `gcp` (Attributes) GCP allows the configuration of options specific to the "gcp" join method. (see [below for nested schema](#nested-schema-for-specgcp)) - `github` (Attributes) GitHub allows the configuration of options specific to the "github" join method. (see [below for nested schema](#nested-schema-for-specgithub)) - `gitlab` (Attributes) GitLab allows the configuration of options specific to the "gitlab" join method. (see [below for nested schema](#nested-schema-for-specgitlab)) -- `join_method` (String) JoinMethod is the joining method required in order to use this token. Supported joining methods include "token", "ec2", and "iam". +- `join_method` (String) JoinMethod is the joining method required in order to use this token. Supported joining methods include: azure, circleci, ec2, gcp, github, gitlab, iam, kubernetes, spacelift, token, tpm - `kubernetes` (Attributes) Kubernetes allows the configuration of options specific to the "kubernetes" join method. (see [below for nested schema](#nested-schema-for-speckubernetes)) - `spacelift` (Attributes) Spacelift allows the configuration of options specific to the "spacelift" join method. (see [below for nested schema](#nested-schema-for-specspacelift)) - `suggested_agent_matcher_labels` (Map of List of String) diff --git a/examples/chart/teleport-cluster/charts/teleport-operator/operator-crds/resources.teleport.dev_provisiontokens.yaml b/examples/chart/teleport-cluster/charts/teleport-operator/operator-crds/resources.teleport.dev_provisiontokens.yaml index edd501d22255c..1f733e28928ee 100644 --- a/examples/chart/teleport-cluster/charts/teleport-operator/operator-crds/resources.teleport.dev_provisiontokens.yaml +++ b/examples/chart/teleport-cluster/charts/teleport-operator/operator-crds/resources.teleport.dev_provisiontokens.yaml @@ -257,9 +257,9 @@ spec: type: string type: object join_method: - description: JoinMethod is the joining method required in order to - use this token. Supported joining methods include "token", "ec2", - and "iam". + description: 'JoinMethod is the joining method required in order to + use this token. Supported joining methods include: azure, circleci, + ec2, gcp, github, gitlab, iam, kubernetes, spacelift, token, tpm' type: string kubernetes: description: Kubernetes allows the configuration of options specific diff --git a/integrations/operator/config/crd/bases/resources.teleport.dev_provisiontokens.yaml b/integrations/operator/config/crd/bases/resources.teleport.dev_provisiontokens.yaml index edd501d22255c..1f733e28928ee 100644 --- a/integrations/operator/config/crd/bases/resources.teleport.dev_provisiontokens.yaml +++ b/integrations/operator/config/crd/bases/resources.teleport.dev_provisiontokens.yaml @@ -257,9 +257,9 @@ spec: type: string type: object join_method: - description: JoinMethod is the joining method required in order to - use this token. Supported joining methods include "token", "ec2", - and "iam". + description: 'JoinMethod is the joining method required in order to + use this token. Supported joining methods include: azure, circleci, + ec2, gcp, github, gitlab, iam, kubernetes, spacelift, token, tpm' type: string kubernetes: description: Kubernetes allows the configuration of options specific diff --git a/integrations/terraform/tfschema/token/types_terraform.go b/integrations/terraform/tfschema/token/types_terraform.go index 2309b9cc1a5c3..9dc6722211bc1 100644 --- a/integrations/terraform/tfschema/token/types_terraform.go +++ b/integrations/terraform/tfschema/token/types_terraform.go @@ -366,7 +366,7 @@ func GenSchemaProvisionTokenV2(ctx context.Context) (github_com_hashicorp_terraf Optional: true, }, "join_method": { - Description: "JoinMethod is the joining method required in order to use this token. Supported joining methods include \"token\", \"ec2\", and \"iam\".", + Description: "JoinMethod is the joining method required in order to use this token. Supported joining methods include: azure, circleci, ec2, gcp, github, gitlab, iam, kubernetes, spacelift, token, tpm", Optional: true, Type: github_com_hashicorp_terraform_plugin_framework_types.StringType, },