Release 14.2.1 (#976)

gravitational · Dec 4, 2023 · f3b30e7 · f3b30e7
1 parent 0037058
commit f3b30e7
Show file tree

Hide file tree

Showing 12 changed files with 83 additions and 35 deletions.
diff --git a/terraform/gen/main.go b/terraform/gen/main.go
@@ -62,8 +62,6 @@ type payload struct {
 	UpsertMethodArity int
 	// WithSecrets value for a withSecrets param of Get method (empty means no param used)
 	WithSecrets string
-	// GetWithoutContext indicates that get method has no context parameter (workaround for the User)
-	GetWithoutContext bool
 	// ID id value on create and import
 	ID string
 	// RandomMetadataName indicates that Metadata.Name must be generated (supported by plural resources only)
@@ -218,8 +216,9 @@ var (
 		TypeName:               "GithubConnectorV3",
 		VarName:                "githubConnector",
 		GetMethod:              "GetGithubConnector",
-		CreateMethod:           "UpsertGithubConnector",
+		CreateMethod:           "CreateGithubConnector",
 		UpdateMethod:           "UpsertGithubConnector",
+		UpsertMethodArity:      2,
 		DeleteMethod:           "DeleteGithubConnector",
 		WithSecrets:            "true",
 		ID:                     "githubConnector.Metadata.Name",
@@ -234,8 +233,9 @@ var (
 		TypeName:               "OIDCConnectorV3",
 		VarName:                "oidcConnector",
 		GetMethod:              "GetOIDCConnector",
-		CreateMethod:           "UpsertOIDCConnector",
+		CreateMethod:           "CreateOIDCConnector",
 		UpdateMethod:           "UpsertOIDCConnector",
+		UpsertMethodArity:      2,
 		DeleteMethod:           "DeleteOIDCConnector",
 		WithSecrets:            "true",
 		ID:                     "oidcConnector.Metadata.Name",
@@ -250,8 +250,9 @@ var (
 		TypeName:               "SAMLConnectorV2",
 		VarName:                "samlConnector",
 		GetMethod:              "GetSAMLConnector",
-		CreateMethod:           "UpsertSAMLConnector",
+		CreateMethod:           "CreateSAMLConnector",
 		UpdateMethod:           "UpsertSAMLConnector",
+		UpsertMethodArity:      2,
 		DeleteMethod:           "DeleteSAMLConnector",
 		WithSecrets:            "true",
 		ID:                     "samlConnector.Metadata.Name",
@@ -283,8 +284,9 @@ var (
 		TypeName:               "RoleV6",
 		VarName:                "role",
 		GetMethod:              "GetRole",
-		CreateMethod:           "UpsertRole",
+		CreateMethod:           "CreateRole",
 		UpdateMethod:           "UpsertRole",
+		UpsertMethodArity:      2,
 		DeleteMethod:           "DeleteRole",
 		ID:                     "role.Metadata.Name",
 		Kind:                   "role",
@@ -330,10 +332,10 @@ var (
 		VarName:                "user",
 		GetMethod:              "GetUser",
 		CreateMethod:           "CreateUser",
-		UpdateMethod:           "UpdateUser",
+		UpdateMethod:           "UpsertUser",
+		UpsertMethodArity:      2,
 		DeleteMethod:           "DeleteUser",
 		WithSecrets:            "false",
-		GetWithoutContext:      true,
 		ID:                     "user.Metadata.Name",
 		Kind:                   "user",
 		HasStaticID:            false,

diff --git a/terraform/gen/plural_data_source.go.tpl b/terraform/gen/plural_data_source.go.tpl
@@ -69,7 +69,7 @@ func (r dataSourceTeleport{{.Name}}) Read(ctx context.Context, req tfsdk.ReadDat
 		return
 	}
 
-	{{.VarName}}I, err := r.p.Client.{{.GetMethod}}({{if not .GetWithoutContext}}ctx, {{end}}id.Value{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
+	{{.VarName}}I, err := r.p.Client.{{.GetMethod}}(ctx, id.Value{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
 	if err != nil {
 		resp.Diagnostics.Append(diagFromWrappedErr("Error reading {{.Name}}", trace.Wrap(err), "{{.Kind}}"))
 		return

diff --git a/terraform/gen/plural_resource.go.tpl b/terraform/gen/plural_resource.go.tpl
@@ -119,7 +119,7 @@ func (r resourceTeleport{{.Name}}) Create(ctx context.Context, req tfsdk.CreateR
 {{end}}
 	id := {{.VarName}}Resource.Metadata.Name
 
-	_, err = r.p.Client.{{.GetMethod}}({{if not .GetWithoutContext}}ctx, {{end}}id{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
+	_, err = r.p.Client.{{.GetMethod}}(ctx, id{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
 	if !trace.IsNotFound(err) {
 		if err == nil {
 			existErr := fmt.Sprintf("{{.Name}} exists in Teleport. Either remove it (tctl rm {{.Kind}}/%v)"+
@@ -160,7 +160,7 @@ func (r resourceTeleport{{.Name}}) Create(ctx context.Context, req tfsdk.CreateR
 	backoff := backoff.NewDecorr(r.p.RetryConfig.Base, r.p.RetryConfig.Cap, clockwork.NewRealClock())
 	for {
 		tries = tries + 1
-		{{.VarName}}I, err = r.p.Client.{{.GetMethod}}({{if not .GetWithoutContext}}ctx, {{end}}id{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
+		{{.VarName}}I, err = r.p.Client.{{.GetMethod}}(ctx, id{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
 		if trace.IsNotFound(err) {
 			if bErr := backoff.Do(ctx); bErr != nil {
 				resp.Diagnostics.Append(diagFromWrappedErr("Error reading {{.Name}}", trace.Wrap(err), "{{.Kind}}"))
@@ -232,7 +232,7 @@ func (r resourceTeleport{{.Name}}) Read(ctx context.Context, req tfsdk.ReadResou
 		return
 	}
 
-	{{.VarName}}I, err := r.p.Client.{{.GetMethod}}({{if not .GetWithoutContext}}ctx, {{end}}id.Value{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
+	{{.VarName}}I, err := r.p.Client.{{.GetMethod}}(ctx, id.Value{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
 	if trace.IsNotFound(err) {
 		resp.State.RemoveResource(ctx)
 		return
@@ -301,7 +301,7 @@ func (r resourceTeleport{{.Name}}) Update(ctx context.Context, req tfsdk.UpdateR
 	{{- end}}
 	name := {{.VarName}}Resource.Metadata.Name
 
-	{{.VarName}}Before, err := r.p.Client.{{.GetMethod}}({{if not .GetWithoutContext}}ctx, {{end}}name{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
+	{{.VarName}}Before, err := r.p.Client.{{.GetMethod}}(ctx, name{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
 	if err != nil {
 		resp.Diagnostics.Append(diagFromWrappedErr("Error reading {{.Name}}", err, "{{.Kind}}"))
 		return
@@ -328,7 +328,7 @@ func (r resourceTeleport{{.Name}}) Update(ctx context.Context, req tfsdk.UpdateR
 	backoff := backoff.NewDecorr(r.p.RetryConfig.Base, r.p.RetryConfig.Cap, clockwork.NewRealClock())
 	for {
 		tries = tries + 1
-		{{.VarName}}I, err = r.p.Client.{{.GetMethod}}({{if not .GetWithoutContext}}ctx, {{end}}name{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
+		{{.VarName}}I, err = r.p.Client.{{.GetMethod}}(ctx, name{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
 		if err != nil {
 			resp.Diagnostics.Append(diagFromWrappedErr("Error reading {{.Name}}", err, "{{.Kind}}"))
 			return
@@ -394,7 +394,7 @@ func (r resourceTeleport{{.Name}}) Delete(ctx context.Context, req tfsdk.DeleteR
 
 // ImportState imports {{.Name}} state
 func (r resourceTeleport{{.Name}}) ImportState(ctx context.Context, req tfsdk.ImportResourceStateRequest, resp *tfsdk.ImportResourceStateResponse) {
-	{{.VarName}}, err := r.p.Client.{{.GetMethod}}({{if not .GetWithoutContext}}ctx, {{end}}req.ID{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
+	{{.VarName}}, err := r.p.Client.{{.GetMethod}}(ctx, req.ID{{if ne .WithSecrets ""}}, {{.WithSecrets}}{{end}})
 	if err != nil {
 		resp.Diagnostics.Append(diagFromWrappedErr("Error reading {{.Name}}", trace.Wrap(err), "{{.Kind}}"))
 		return

diff --git a/terraform/provider/data_source_teleport_user.go b/terraform/provider/data_source_teleport_user.go
diff --git a/terraform/provider/resource_teleport_bot.go b/terraform/provider/resource_teleport_bot.go
@@ -20,14 +20,15 @@ import (
 	"context"
 	"time"
 
-	"github.com/gravitational/teleport/api/client/proto"
-	"github.com/gravitational/teleport/api/types/wrappers"
 	"github.com/gravitational/trace"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 
+	"github.com/gravitational/teleport/api/client/proto"
+	"github.com/gravitational/teleport/api/types/wrappers"
+
 	"github.com/gravitational/teleport-plugins/terraform/tfschema"
 )
 
@@ -210,7 +211,7 @@ func (r resourceTeleportBot) Read(ctx context.Context, req tfsdk.ReadResourceReq
 		return
 	}
 
-	_, err := r.p.Client.GetUser(plan.UserName.Value, false)
+	_, err := r.p.Client.GetUser(ctx, plan.UserName.Value, false)
 	if trace.IsNotFound(err) {
 		resp.State.RemoveResource(ctx)
 		return

diff --git a/terraform/provider/resource_teleport_github_connector.go b/terraform/provider/resource_teleport_github_connector.go
diff --git a/terraform/provider/resource_teleport_oidc_connector.go b/terraform/provider/resource_teleport_oidc_connector.go
diff --git a/terraform/provider/resource_teleport_role.go b/terraform/provider/resource_teleport_role.go
diff --git a/terraform/provider/resource_teleport_saml_connector.go b/terraform/provider/resource_teleport_saml_connector.go
diff --git a/terraform/provider/resource_teleport_user.go b/terraform/provider/resource_teleport_user.go
diff --git a/terraform/reference.mdx b/terraform/reference.mdx
@@ -2290,6 +2290,7 @@ Specification of the device.
 | model_identifier      | string           |          |             |
 | os_build              | string           |          |             |
 | os_build_supplemental | string           |          |             |
+| os_id                 | string           |          |             |
 | os_usernames          | array of strings |          |             |
 | os_version            | string           |          |             |
 | update_time           | RFC3339 time     |          |             |

diff --git a/terraform/tfschema/devicetrust/v1/device_terraform.go b/terraform/tfschema/devicetrust/v1/device_terraform.go