Skip to content
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.

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

feat(rdb): add encryption at rest for instance #2676

Merged
merged 4 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
11 changes: 11 additions & 0 deletions internal/services/rdb/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,11 @@ func ResourceInstance() *schema.Resource {
},
},
},
"encryption_at_rest": {
Type: schema.TypeBool,
Optional: true,
Description: "Enable or disable encryption at rest for the database instance",
},
// Common
"region": regional.Schema(),
"organization_id": account.OrganizationIDSchema(),
Expand All @@ -328,6 +333,9 @@ func ResourceRdbInstanceCreate(ctx context.Context, d *schema.ResourceData, m in
UserName: d.Get("user_name").(string),
Password: d.Get("password").(string),
VolumeType: rdb.VolumeType(d.Get("volume_type").(string)),
Encryption: &rdb.EncryptionAtRest{
Enabled: d.Get("encryption_at_rest").(bool),
},
}

if initSettings, ok := d.GetOk("init_settings"); ok {
Expand Down Expand Up @@ -463,6 +471,9 @@ func ResourceRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m inte
_ = d.Set("region", string(region))
_ = d.Set("organization_id", res.OrganizationID)
_ = d.Set("project_id", res.ProjectID)
if res.Encryption != nil {
_ = d.Set("encryption_at_rest", res.Encryption.Enabled)
}

// set user and password
if user, ok := d.GetOk("user_name"); ok {
Expand Down
88 changes: 88 additions & 0 deletions internal/services/rdb/instance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1216,6 +1216,94 @@ func TestAccInstance_Endpoints(t *testing.T) {
})
}

func TestAccInstance_EncryptionAtRest(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: rdbchecks.IsInstanceDestroyed(tt),
Steps: []resource.TestStep{
{
Config: fmt.Sprintf(`
resource scaleway_rdb_instance main {
name = "test-rdb-encryption"
node_type = "db-dev-s"
engine = %q
is_ha_cluster = false
disable_backup = true
user_name = "my_initial_user"
password = "thiZ_is_v&ry_s3cret"
encryption_at_rest = true
tags = [ "terraform-test", "scaleway_rdb_instance", "encryption" ]
}
`, latestEngineVersion),
Check: resource.ComposeTestCheckFunc(
isInstancePresent(tt, "scaleway_rdb_instance.main"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "name", "test-rdb-encryption"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "node_type", "db-dev-s"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "engine", latestEngineVersion),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "is_ha_cluster", "false"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "disable_backup", "true"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "user_name", "my_initial_user"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "password", "thiZ_is_v&ry_s3cret"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "encryption_at_rest", "true"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "tags.0", "terraform-test"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "tags.1", "scaleway_rdb_instance"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "tags.2", "encryption"),
),
},
},
})
}

func TestAccInstance_EncryptionAtRestFalse(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: rdbchecks.IsInstanceDestroyed(tt),
Steps: []resource.TestStep{
{
Config: fmt.Sprintf(`
resource scaleway_rdb_instance main {
name = "test-rdb-no-encryption"
node_type = "db-dev-s"
engine = %q
is_ha_cluster = false
disable_backup = true
user_name = "my_initial_user_no_enc"
password = "thiZ_is_v&ry_s3cret"
encryption_at_rest = false
tags = [ "terraform-test", "scaleway_rdb_instance", "no_encryption" ]
}
`, latestEngineVersion),
Check: resource.ComposeTestCheckFunc(
isInstancePresent(tt, "scaleway_rdb_instance.main"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "name", "test-rdb-no-encryption"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "node_type", "db-dev-s"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "engine", latestEngineVersion),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "is_ha_cluster", "false"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "disable_backup", "true"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "user_name", "my_initial_user_no_enc"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "password", "thiZ_is_v&ry_s3cret"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "encryption_at_rest", "false"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "tags.0", "terraform-test"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "tags.1", "scaleway_rdb_instance"),
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "tags.2", "no_encryption"),
),
},
},
})
}

func isInstancePresent(tt *acctest.TestTools, n string) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading