Merge branch 'main' into swgillespie/name-replace

docs/resources/namespace.md

@@ -25,6 +25,7 @@ description: |-
 ### Optional
 
 - `certificate_filters` (Attributes List) (see [below for nested schema](#nestedatt--certificate_filters))
+- `codec_server` (Attributes) (see [below for nested schema](#nestedatt--codec_server))
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 
 ### Read-Only
@@ -42,6 +43,19 @@ Optional:
 - `subject_alternative_name` (String)
 
 
+<a id="nestedatt--codec_server"></a>
+### Nested Schema for `codec_server`
+
+Required:
+
+- `endpoint` (String)
+
+Optional:
+
+- `include_cross_origin_credentials` (Boolean)
+- `pass_access_token` (Boolean)
+
+
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`
 

go.mod

@@ -75,4 +75,5 @@ require (
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )

go.sum

@@ -121,6 +121,7 @@ github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyX
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -265,8 +266,9 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/provider/namespace_resource.go

@@ -32,7 +32,11 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+<<<<<<< HEAD
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier"
+=======
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
+>>>>>>> main
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -59,6 +63,7 @@ type (
 		AcceptedClientCA   types.String `tfsdk:"accepted_client_ca"`
 		RetentionDays      types.Int64  `tfsdk:"retention_days"`
 		CertificateFilters types.List   `tfsdk:"certificate_filters"`
+		CodecServer        types.Object `tfsdk:"codec_server"`
 
 		Timeouts timeouts.Value `tfsdk:"timeouts"`
 	}
@@ -69,6 +74,12 @@ type (
 		OrganizationalUnit     types.String `tfsdk:"organizational_unit"`
 		SubjectAlternativeName types.String `tfsdk:"subject_alternative_name"`
 	}
+
+	codecServerModel struct {
+		Endpoint                      types.String `tfsdk:"endpoint"`
+		PassAccessToken               types.Bool   `tfsdk:"pass_access_token"`
+		IncludeCrossOriginCredentials types.Bool   `tfsdk:"include_cross_origin_credentials"`
+	}
 )
 
 var (
@@ -81,6 +92,12 @@ var (
 		"organizational_unit":      types.StringType,
 		"subject_alternative_name": types.StringType,
 	}
+
+	codecServerAttrs = map[string]attr.Type{
+		"endpoint":                         types.StringType,
+		"pass_access_token":                types.BoolType,
+		"include_cross_origin_credentials": types.BoolType,
+	}
 )
 
 func NewNamespaceResource() resource.Resource {
@@ -158,6 +175,24 @@ func (r *namespaceResource) Schema(ctx context.Context, _ resource.SchemaRequest
 					},
 				},
 			},
+			"codec_server": schema.SingleNestedAttribute{
+				Attributes: map[string]schema.Attribute{
+					"endpoint": schema.StringAttribute{
+						Required: true,
+					},
+					"pass_access_token": schema.BoolAttribute{
+						Computed: true,
+						Default:  booldefault.StaticBool(false),
+						Optional: true,
+					},
+					"include_cross_origin_credentials": schema.BoolAttribute{
+						Computed: true,
+						Default:  booldefault.StaticBool(false),
+						Optional: true,
+					},
+				},
+				Optional: true,
+			},
 		},
 		Blocks: map[string]schema.Block{
 			"timeouts": timeouts.Block(ctx, timeouts.Opts{
@@ -193,6 +228,13 @@ func (r *namespaceResource) Create(ctx context.Context, req resource.CreateReque
 	if resp.Diagnostics.HasError() {
 		return
 	}
+	var codecServer *namespacev1.CodecServerSpec
+	if !plan.CodecServer.IsNull() {
+		codecServer = getCodecServerFromModel(ctx, resp.Diagnostics, &plan)
+		if resp.Diagnostics.HasError() {
+			return
+		}
+	}
 	svcResp, err := r.client.CreateNamespace(ctx, &cloudservicev1.CreateNamespaceRequest{
 		Spec: &namespacev1.NamespaceSpec{
 			Name:          plan.Name.ValueString(),
@@ -202,6 +244,7 @@ func (r *namespaceResource) Create(ctx context.Context, req resource.CreateReque
 				AcceptedClientCa:   plan.AcceptedClientCA.ValueString(),
 				CertificateFilters: certFilters,
 			},
+			CodecServer: codecServer,
 		},
 	})
 	if err != nil {
@@ -267,6 +310,10 @@ func (r *namespaceResource) Update(ctx context.Context, req resource.UpdateReque
 		resp.Diagnostics.AddError("Failed to get current resource version", err.Error())
 		return
 	}
+	codecServer := getCodecServerFromModel(ctx, resp.Diagnostics, &plan)
+	if resp.Diagnostics.HasError() {
+		return
+	}
 	svcResp, err := r.client.UpdateNamespace(ctx, &cloudservicev1.UpdateNamespaceRequest{
 		Namespace: plan.ID.ValueString(),
 		Spec: &namespacev1.NamespaceSpec{
@@ -277,6 +324,7 @@ func (r *namespaceResource) Update(ctx context.Context, req resource.UpdateReque
 				AcceptedClientCa:   plan.AcceptedClientCA.ValueString(),
 				CertificateFilters: certFilters,
 			},
+			CodecServer: codecServer,
 		},
 		ResourceVersion: resourceVersion,
 	})
@@ -387,6 +435,25 @@ func updateModelFromSpec(ctx context.Context, diags diag.Diagnostics, state *nam
 		certificateFilter = filters
 	}
 
+	var codecServerState basetypes.ObjectValue
+	// The API always returns a non-empty CodecServerSpec, even if it wasn't specified on object creation. We explicitly
+	// map an endpoint whose value is the empty string to `null`, since an empty endpoint implies that the codec server
+	// was not set via config.
+	if ns.GetSpec().GetCodecServer().GetEndpoint() != "" {
+		codecServer := &codecServerModel{
+			Endpoint:                      stringOrNull(ns.GetSpec().GetCodecServer().GetEndpoint()),
+			PassAccessToken:               types.BoolValue(ns.GetSpec().GetCodecServer().GetPassAccessToken()),
+			IncludeCrossOriginCredentials: types.BoolValue(ns.GetSpec().GetCodecServer().GetIncludeCrossOriginCredentials()),
+		}
+
+		state, objectDiags := types.ObjectValueFrom(ctx, codecServerAttrs, codecServer)
+		diags.Append(objectDiags...)
+		codecServerState = state
+	} else {
+		codecServerState = types.ObjectNull(codecServerAttrs)
+	}
+
+	state.CodecServer = codecServerState
 	state.Regions = planRegions
 	state.CertificateFilters = certificateFilter
 	state.AcceptedClientCA = types.StringValue(ns.GetSpec().GetMtlsAuth().GetAcceptedClientCa())
@@ -434,6 +501,19 @@ func getCurrentResourceVersion(ctx context.Context, client cloudservicev1.CloudS
 	return ns.GetNamespace().GetResourceVersion(), nil
 }
 
+func getCodecServerFromModel(ctx context.Context, diags diag.Diagnostics, model *namespaceResourceModel) *namespacev1.CodecServerSpec {
+	var codecServer codecServerModel
+	diags.Append(model.CodecServer.As(ctx, &codecServer, basetypes.ObjectAsOptions{})...)
+	if diags.HasError() {
+		return nil
+	}
+	return &namespacev1.CodecServerSpec{
+		Endpoint:                      codecServer.Endpoint.ValueString(),
+		PassAccessToken:               codecServer.PassAccessToken.ValueBool(),
+		IncludeCrossOriginCredentials: codecServer.IncludeCrossOriginCredentials.ValueBool(),
+	}
+}
+
 func stringOrNull(s string) types.String {
 	if s == "" {
 		return types.StringNull()