Skip to content

feat(hosted): add BYOK argument for ec_deployment resource #911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(hosted): add BYOK argument for ec_deployment resource #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ec/ecresource/deploymentresource/deployment/v2/deployment_create_payload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package v2

import (
"context"

"github.com/elastic/cloud-sdk-go/pkg/api"
"github.com/elastic/cloud-sdk-go/pkg/api/deploymentapi/deptemplateapi"
"github.com/elastic/cloud-sdk-go/pkg/api/deploymentapi/esremoteclustersapi"
Expand All @@ -43,6 +44,7 @@ type DeploymentTF struct {
Version types.String `tfsdk:"version"`
Region types.String `tfsdk:"region"`
DeploymentTemplateId types.String `tfsdk:"deployment_template_id"`
ByokArn types.String `tfsdk:"byok_arn"`
Name types.String `tfsdk:"name"`
RequestId types.String `tfsdk:"request_id"`
ElasticsearchUsername types.String `tfsdk:"elasticsearch_username"`
Expand Down Expand Up @@ -173,6 +175,14 @@ func (dep DeploymentTF) CreateRequest(ctx context.Context, client *api.API) (*mo

result.Settings.Observability = observabilityPayload

if !dep.ByokArn.IsNull() && !dep.ByokArn.IsUnknown() {
if result.Settings.Byok == nil {
result.Settings.Byok = &models.ByokSettings{KeyResourcePath: ec.String(dep.ByokArn.ValueString())}
} else {
result.Settings.Byok.KeyResourcePath = ec.String(dep.ByokArn.ValueString())
}
}

result.Metadata.Tags, diags = converters.TypesMapToModelsTags(ctx, dep.Tags)

if diags.HasError() {
Expand Down
5 changes: 5 additions & 0 deletions ec/ecresource/deploymentresource/deployment/v2/deployment_read.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ type Deployment struct {
DeploymentTemplateId string `tfsdk:"deployment_template_id"`
Name string `tfsdk:"name"`
RequestId string `tfsdk:"request_id"`
ByokArn *string `tfsdk:"byok_arn"`
ElasticsearchUsername string `tfsdk:"elasticsearch_username"`
ElasticsearchPassword string `tfsdk:"elasticsearch_password"`
ApmSecretToken *string `tfsdk:"apm_secret_token"`
Expand Down Expand Up @@ -204,6 +205,10 @@ func ReadDeployment(res *models.DeploymentGetResponse, remotes *models.RemoteRes
dep.Tags = converters.ModelsTagsToMap(res.Metadata.Tags)
}

if res.Metadata != nil && *res.Metadata.ByokEnabled {
dep.ByokArn = res.Settings.Byok.KeyResourcePath
}

if res.Resources == nil {
return nil, nil
}
Expand Down
7 changes: 7 additions & 0 deletions ec/ecresource/deploymentresource/deployment/v2/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ func DeploymentSchema() schema.Schema {
Description: "Deployment template identifier to create the deployment from. See the [full list](https://www.elastic.co/guide/en/cloud/current/ec-regions-templates-instances.html) of regions and deployment templates available in ESS.",
Required: true,
},
"byok_arn": schema.StringAttribute{
Description: "Reference to a customer-managed key for data-at-rest encryption",
Optional: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.RequiresReplace(),
},
},
"name": schema.StringAttribute{
Description: "Name for the deployment",
Optional: true,
Expand Down