Skip to content

fix: Terraform encryption at rest error when upgrading to 1.12.2 #1617

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

Merged
merged 2 commits into from
Nov 10, 2023
Merged

fix: Terraform encryption at rest error when upgrading to 1.12.2 #1617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab8a66f
INTMDB-1277: Terraform encryption at rest error when upgrading to 1.12.2
andreaangiolillo Nov 10, 2023
bb254c1
Added acceptance test
andreaangiolillo Nov 10, 2023
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
5 changes: 4 additions & 1 deletion mongodbatlas/fw_resource_mongodbatlas_encryption_at_rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/mongodbatlas/framework/conversion"
retrystrategy "github.com/mongodb/terraform-provider-mongodbatlas/mongodbatlas/framework/retry"
validators "github.com/mongodb/terraform-provider-mongodbatlas/mongodbatlas/framework/validator"
"github.com/mongodb/terraform-provider-mongodbatlas/mongodbatlas/util"
matlas "go.mongodb.org/atlas/mongodbatlas"
)

Expand Down Expand Up @@ -445,7 +446,9 @@ func handleAwsKmsConfigDefaults(ctx context.Context, currentStateFile, newStateF
}

// Secret access key is not returned by the API response
newStateFile.AwsKmsConfig[0].SecretAccessKey = currentStateFile.AwsKmsConfig[0].SecretAccessKey
if len(currentStateFile.AwsKmsConfig) == 1 && util.IsStringPresent(currentStateFile.AwsKmsConfig[0].SecretAccessKey.ValueStringPointer()) {
newStateFile.AwsKmsConfig[0].SecretAccessKey = currentStateFile.AwsKmsConfig[0].SecretAccessKey
}
}

func handleAzureKeyVaultConfigDefaults(ctx context.Context, earRSCurrent, earRSNew, earRSConfig *tfEncryptionAtRestRSModel) {
Expand Down
55 changes: 55 additions & 0 deletions mongodbatlas/fw_resource_mongodbatlas_encryption_at_rest_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,3 +224,58 @@ func TestAccMigrationAdvRS_EncryptionAtRest_basicGCP(t *testing.T) {
},
})
}

func TestAccMigrationAdvRS_EncryptionAtRest_basicAWS_from_v1_11_0(t *testing.T) {
SkipTestExtCred(t)
var (
resourceName = "mongodbatlas_encryption_at_rest.test"
projectID = os.Getenv("MONGODB_ATLAS_PROJECT_ID")

awsKms = matlas.AwsKms{
Enabled: pointy.Bool(true),
AccessKeyID: os.Getenv("AWS_ACCESS_KEY_ID"),
SecretAccessKey: os.Getenv("AWS_SECRET_ACCESS_KEY"),
CustomerMasterKeyID: os.Getenv("AWS_CUSTOMER_MASTER_KEY_ID"),
Region: os.Getenv("AWS_REGION"),
RoleID: os.Getenv("AWS_ROLE_ID"),
}
)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccMigrationPreCheck(t); testCheckAwsEnv(t) },
CheckDestroy: testAccCheckMongoDBAtlasEncryptionAtRestDestroy,
Steps: []resource.TestStep{
{
ExternalProviders: map[string]resource.ExternalProvider{
"mongodbatlas": {
VersionConstraint: "1.11.0",
Source: "mongodb/mongodbatlas",
},
"aws": {
VersionConstraint: "5.1.0",
Source: "hashicorp/aws",
},
},

Config: testAccMongoDBAtlasEncryptionAtRestConfigAwsKms(projectID, &awsKms),
Check: resource.ComposeTestCheckFunc(
testAccCheckMongoDBAtlasEncryptionAtRestExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "project_id", projectID),
resource.TestCheckResourceAttr(resourceName, "aws_kms_config.0.enabled", "true"),
resource.TestCheckResourceAttr(resourceName, "aws_kms_config.0.region", awsKms.Region),
resource.TestCheckResourceAttr(resourceName, "aws_kms_config.0.role_id", awsKms.RoleID),
),
},
{
ProtoV6ProviderFactories: testAccProviderV6Factories,
Config: testAccMongoDBAtlasEncryptionAtRestConfigAwsKms(projectID, &awsKms),
ConfigPlanChecks: resource.ConfigPlanChecks{
PostApplyPreRefresh: []plancheck.PlanCheck{
DebugPlan(),
},
},
PlanOnly: true,
},
},
})
}